Skip to content

Commit ae7fdb9

Browse files
author
Thomas Johnson
authored
Merge pull request #4 from ruby-rdf/feature/rdf-rb-2.0
Feature/rdf rb 2.0
2 parents 550fec4 + d8aecb2 commit ae7fdb9

File tree

6 files changed

+45
-36
lines changed

6 files changed

+45
-36
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
*~
22
#*#
33

4+
*.sh
5+
*.jar
6+
*.jnl
7+
*.log
8+
49
*.gem
510
Gemfile.lock

‎Gemfile‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,8 @@ source "https://rubygems.org"
33
gemspec
44

55
group :develop do
6-
gem "rdf", git: "git://github.com/ruby-rdf/rdf.git", branch: "develop"
7-
gem "rdf-spec", git: "git://github.com/ruby-rdf/rdf-spec.git", branch: "develop"
8-
gem 'linkeddata', git: "git://github.com/ruby-rdf/linkeddata.git", branch: "develop"
9-
gem 'rdf-n3', git: "git://github.com/ruby-rdf/rdf-n3.git", branch: "develop"
10-
gem "rdf-rdfxml", git: "git://github.com/ruby-rdf/rdf-rdfxml.git", branch: "develop"
11-
gem 'rdf-rdfa', git: "git://github.com/ruby-rdf/rdf-rdfa.git", branch: "develop"
12-
gem 'rdf-turtle', git: "git://github.com/ruby-rdf/rdf-turtle.git", branch: "develop"
13-
gem 'rdf-microdata', git: "git://github.com/ruby-rdf/rdf-microdata.git", branch: "develop"
14-
gem "rdf-xsd", git: "git://github.com/ruby-rdf/rdf-xsd.git", branch: "develop"
15-
gem 'json-ld', git: "git://github.com/ruby-rdf/json-ld.git", branch: "develop"
16-
gem 'sparql', git: "git://github.com/ruby-rdf/sparql.git", branch: "develop"
17-
gem 'sparql-client', git: "git://github.com/ruby-rdf/sparql-client.git", branch: "develop"
18-
gem "rdf-vocab", git: "git://github.com/ruby-rdf/rdf-vocab.git", branch: "develop"
19-
gem 'sxp', git: "git://github.com/gkellogg/sxp-ruby.git"
20-
gem 'rest-client-components'
6+
gem "rdf", git: "git://github.com/ruby-rdf/rdf.git", branch: "develop"
7+
gem "rdf-spec", git: "git://github.com/ruby-rdf/rdf-spec.git", branch: "develop"
218
end
229

2310
group :debug do

‎lib/rdf/blazegraph/repository.rb‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ def count
1919
end
2020

2121
##
22-
# @see RDF::Mutable#delete_insert
23-
def delete_insert(deletes, inserts)
24-
rest_client.delete_insert(deletes, inserts)
22+
# @see RDF::Repository#each
23+
def each(&block)
24+
each_statement(&block)
2525
end
2626

2727
##
28-
# @see RDF::Repository#each
29-
# @todo this won't scale
30-
def each(&block)
31-
rest_client.get_statements.each_statement(&block)
28+
# @see RDF::Mutable#delete_insert
29+
def delete_insert(deletes, inserts)
30+
rest_client.delete_insert(deletes, inserts)
3231
end
3332

3433
##
@@ -118,6 +117,14 @@ def delete_statements(statements)
118117
rest_client.delete(statements)
119118
end
120119

120+
##
121+
# @see RDF::Repository#each_statement
122+
#
123+
# @todo this won't scale
124+
def each_statement(&block)
125+
rest_client.get_statements.each_statement(&block)
126+
end
127+
121128
##
122129
# Queries `self` for RDF statements matching the given `pattern`.
123130
#
@@ -135,9 +142,9 @@ def query_pattern(pattern, options = {}, &block)
135142
# Blazegraph objects to bnodes shared across the CONSTRUCT & WHERE scopes
136143
# so we dup the pattern with fresh bnodes
137144
where_pattern = pattern.dup
138-
where_pattern.subject = RDF::Node.new if where_pattern.subject.node?
145+
where_pattern.subject = RDF::Node.new if where_pattern.subject.node?
139146
where_pattern.predicate = RDF::Node.new if where_pattern.predicate.node?
140-
where_pattern.object = RDF::Node.new if where_pattern.object.node?
147+
where_pattern.object = RDF::Node.new if where_pattern.object.node?
141148
where_pattern.initialize!
142149

143150
query = client.construct(pattern).where(where_pattern)
@@ -156,6 +163,8 @@ def query_pattern(pattern, options = {}, &block)
156163
end
157164
end
158165

166+
##
167+
# @private
159168
def fast_pattern(pattern, &block)
160169
pattern = pattern.dup
161170
pattern.graph_name = NULL_GRAPH_URI if pattern.graph_name == false
@@ -170,14 +179,20 @@ def fast_pattern(pattern, &block)
170179
reader.each_statement
171180
end
172181

182+
##
183+
# @private
173184
def insert_statements(statements)
174185
rest_client.insert(statements)
175186
end
176187

188+
##
189+
# @private
177190
def insert_statement(statement)
178191
rest_client.insert([statement])
179192
end
180193

194+
##
195+
# @private
181196
def variable_to_nil(term)
182197
return nil unless term
183198
term.variable? ? nil : term

‎rdf-blazegraph.gemspec‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ Gem::Specification.new do |gem|
1919
gem.require_paths = %w(lib app)
2020
gem.has_rdoc = false
2121

22-
gem.required_ruby_version = '>= 1.9.2'
22+
gem.required_ruby_version = '>= 2.0.0'
2323
gem.requirements = []
2424

25-
gem.add_runtime_dependency 'rdf', '~> 1.99'
26-
gem.add_runtime_dependency 'sparql-client', '~>1.1'
25+
gem.add_runtime_dependency 'rdf', '~> 2.0'
26+
gem.add_runtime_dependency 'sparql-client', '~> 2.0'
2727

28-
gem.add_development_dependency 'rdf-spec', '~> 1.1', '>= 1.1.13'
29-
gem.add_development_dependency 'rspec', '~> 3.0'
30-
gem.add_development_dependency 'rspec-its', '~> 1.0'
31-
gem.add_development_dependency 'yard', '~> 0.8'
28+
gem.add_development_dependency 'linkeddata', '~> 2.0'
29+
gem.add_development_dependency 'rdf-spec', '~> 2.0'
30+
gem.add_development_dependency 'rdf-vocab', '~> 2.0'
31+
gem.add_development_dependency 'rspec', '~> 3.0'
32+
gem.add_development_dependency 'rspec-its', '~> 1.0'
33+
gem.add_development_dependency 'yard', '~> 0.8'
3234

3335
gem.post_install_message = nil
3436
end

‎spec/rdf/blazegraph/repository_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
require 'rdf/spec/repository'
33

44
describe RDF::Blazegraph::Repository do
5-
let(:endpoint) { 'http://localhost:9999/bigdata/sparql' }
5+
let(:endpoint) { 'http://127.0.0.1:9999/blazegraph/sparql' }
66

7-
before { RDF::Blazegraph::Repository.new('http://localhost:9999/bigdata/sparql').clear! }
7+
before { RDF::Blazegraph::Repository.new(uri: endpoint).clear! }
88

99
# @see lib/rdf/spec/repository.rb
10-
let(:repository) { RDF::Blazegraph::Repository.new(endpoint) }
10+
let(:repository) { RDF::Blazegraph::Repository.new(uri: endpoint) }
1111
it_behaves_like 'an RDF::Repository'
1212
end
1313

‎spec/rdf/blazegraph/rest_client_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
describe RDF::Blazegraph::RestClient do
55
subject { described_class.new(endpoint) }
6-
let(:endpoint) { 'http://localhost:9999/bigdata/sparql' }
7-
let(:repository) { RDF::Blazegraph::Repository.new(endpoint) }
6+
let(:endpoint) { 'http://127.0.0.1:9999/blazegraph/sparql' }
7+
let(:repository) { RDF::Blazegraph::Repository.new(uri: endpoint) }
88

99
let(:statements) do
1010
[ RDF::Statement(RDF::URI('http://ex.org/moomin'),

0 commit comments

Comments
 (0)