rdf-spec 2.0.0 → 2.2.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5923d4023275de0893d783a5837fce6caed4e437
-  data.tar.gz: 43e6dee9a84e1da0adc0a95d3bd335d84134e7aa
+  metadata.gz: 02763a4f5919a3620e632e6c5407a85ead6a31b6
+  data.tar.gz: e0b955d1548f7aac679dd228ef05e7b20bfa2e0c
 SHA512:
-  metadata.gz: a73e8d511c0f919213b0a242df581877edb0a067c8580d8377decbacc892e4bb01c20622cc1c2763f452da9fa9895781d463cb7f5218b81e1923635fb8ac3a44
-  data.tar.gz: 1f7e0ff4f0239a676c38288120e8f7440ccb5ea69e4b25856326ea5420125cd3da40121012535a8ebc3ddefc479d3a5a769564afc6533d1a278e511fe4c7285b
+  metadata.gz: e4093900bf924b487bea8e8d8412bec0be59343b9a6a5c9ede606e3cf79bee0a40befcd53f7b08631e73edb8dd18f9e2148fe5b98a627cc042b937f43b5dc21f
+  data.tar.gz: af748d60323daba596933ff153b4544f474a8778bd1b9232a34d2773c64b3ea04e2263a50c7772778448f3f6c794b2cfe08e27c141e3acf226d1818e022b6299

data/README.md

@@ -31,8 +31,8 @@ Note that in most cases, if the instance is empty and mutable, the appropriate s
 
 ## Dependencies
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.1)
-* [RSpec](http://rubygems.org/gems/rspec) (>= 2.1.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
+* [RSpec](http://rubygems.org/gems/rspec) (~> 3.0)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.2.0-rc1

data/lib/rdf/spec/enumerable.rb

@@ -391,11 +391,16 @@ RSpec.shared_examples 'an RDF::Enumerable' do
 
     its(:each_term) {is_expected.to be_an_enumerator}
     context "#each_term" do
-      specify {
-        expect(subject.each_term.reject(&:node?).size).to eq non_bnode_terms.length
-      }
-      specify {expect(subject.each_term).to all(be_a_term)}
-      specify {subject.each_term {|value| expect(non_bnode_terms).to include(value) unless value.node?}}
+      it 'has correct number of terms' do
+        expected_count = non_bnode_terms.length
+        expected_count = expected_count - 3 unless 
+          subject.supports?(:literal_equality)
+
+        expect(subject.each_term.reject(&:node?).size).to eq expected_count
+      end
+
+      specify { expect(subject.each_term).to all(be_a_term) }
+      specify { subject.each_term {|value| expect(non_bnode_terms).to include(value) unless value.node?} }
     end
 
     its(:enum_term) {is_expected.to be_an_enumerator}
@@ -507,11 +512,23 @@ RSpec.shared_examples 'an RDF::Enumerable' do
 
 
   context "when converting" do
-    it {is_expected.to respond_to(:to_hash)}
-    its(:to_hash) {is_expected.to be_instance_of(Hash)}
-    context "#to_hash" do
+    it {is_expected.to respond_to(:to_h)}
+    it {is_expected.not_to respond_to(:to_hash)}
+    its(:to_hash) {
+      expect {
+        is_expected.to be_instance_of(Hash)
+      }.to write("DEPRECATION").to(:error)
+    }
+    describe "#to_h" do
       it "should have as many keys as subjects" do
-        expect(subject.to_hash.keys.size).to eq enumerable.subjects.to_a.size
+        expect(subject.to_h.keys.size).to eq enumerable.subjects.to_a.size
+      end
+    end
+    describe "#to_h" do
+      it "should have as many keys as subjects (with deprecation)" do
+        expect {
+          expect(subject.to_hash.keys.size).to eq enumerable.subjects.to_a.size
+        }.to write("DEPRECATION").to(:error)
       end
     end
   end

data/lib/rdf/spec/mutable.rb

@@ -262,7 +262,7 @@ RSpec.shared_examples 'an RDF::Mutable' do
         it 'handles Graph names' do
           if @supports_named_graphs
             dels = non_bnode_statements.take(10).map do |st|
-              RDF::Statement.from(st.to_hash.merge(graph_name: RDF::URI('http://example.com/fake')))
+              RDF::Statement.from(st.to_h.merge(graph_name: RDF::URI('http://example.com/fake')))
             end
             dels.map! { |st| st.graph_name = RDF::URI('http://example.com/fake'); st }
             dels.extend(RDF::Enumerable)

data/lib/rdf/spec/queryable.rb

@@ -60,18 +60,31 @@ RSpec.shared_examples 'an RDF::Queryable' do
 
       context "with specific patterns" do
         # Note that "01" should not match 1, per data-r2/expr-equal/sameTerm
-        {
-          [RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
-          [RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), nil] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
-          [RDF::URI("http://example.org/xi1"), nil, 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
-          [nil, RDF::URI("http://example.org/p"), 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1]), RDF::Statement.from([RDF::URI("http://example.org/xi2"), RDF::URI("http://example.org/p"), 1])],
-          [nil, nil, 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1]), RDF::Statement.from([RDF::URI("http://example.org/xi2"), RDF::URI("http://example.org/p"), 1])],
-          [nil, RDF::URI("http://example.org/p"), RDF::Literal::Double.new("1.0e0")] => [RDF::Statement.from([RDF::URI("http://example.org/xd1"), RDF::URI("http://example.org/p"), RDF::Literal::Double.new("1.0e0")])],
-        }.each do |pattern, result|
-          pattern = RDF::Query::Pattern.from(pattern)
+        patterns =
+          { [RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
+            [RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), nil] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
+            [RDF::URI("http://example.org/xi1"), nil, 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1])],
+            [nil, RDF::URI("http://example.org/p"), 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1]), RDF::Statement.from([RDF::URI("http://example.org/xi2"), RDF::URI("http://example.org/p"), 1])],
+            [nil, nil, 1] => [RDF::Statement.from([RDF::URI("http://example.org/xi1"), RDF::URI("http://example.org/p"), 1]), RDF::Statement.from([RDF::URI("http://example.org/xi2"), RDF::URI("http://example.org/p"), 1])],
+            [nil, RDF::URI("http://example.org/p"), RDF::Literal::Double.new("1.0e0")] => [RDF::Statement.from([RDF::URI("http://example.org/xd1"), RDF::URI("http://example.org/p"), RDF::Literal::Double.new("1.0e0")])],
+          }
+
+        literal_eq_patterns = 
+          [[nil, RDF::URI("http://example.org/p"), 1], 
+           [nil, nil, 1], 
+           [nil, RDF::URI("http://example.org/p"), RDF::Literal::Double.new("1.0e0")]]
+        
+        patterns.each do |pattern, result|
           it "returns #{result.inspect} given #{pattern.inspect}" do
+            unless subject.supports?(:literal_equality)
+              next if literal_eq_patterns.include?(pattern)
+            end
+
+            pattern = RDF::Query::Pattern.from(pattern)
             solutions = []
+
             subject.send(method, pattern) {|s| solutions << s}
+
             expect(solutions).to contain_exactly(*result)
           end
         end
@@ -85,18 +98,6 @@ RSpec.shared_examples 'an RDF::Queryable' do
           expect(solutions.size).to eq @statements.size
         end
 
-        it "returns statements from unnamed graphs with false graph_name" do
-          pattern = RDF::Query::Pattern.new(nil, nil, nil, graph_name: false)
-          solutions = []
-          subject.send(method, pattern) {|s| solutions << s}
-
-          named_statements = subject.statements
-          named_statements.reject! {|st| st.has_name?} unless
-            subject.respond_to?(:graph_name) && !subject.graph_name.nil?
-
-          expect(solutions.size).to eq named_statements.size
-        end
-
         it "returns statements from named graphs with variable graph_name" do
           unless subject.graph_names.to_a.empty?
             pattern = RDF::Query::Pattern.new(nil, nil, nil, graph_name: :c)
@@ -276,7 +277,9 @@ RSpec.shared_examples 'an RDF::Queryable' do
               end
 
               it 'has two solutions' do
-                expect(result.count).to eq 2
+                if subject.supports?(:literal_equality)
+                  expect(result.count).to eq 2
+                end
               end
 
               it "has xi1 as a solution" do
@@ -296,7 +299,9 @@ RSpec.shared_examples 'an RDF::Queryable' do
               end
 
               it 'has one solution' do
-                expect(result.count).to eq 1
+                if subject.supports?(:literal_equality)
+                  expect(result.count).to eq 1
+                end
               end
 
               it "has xd1 as a solution" do
@@ -314,8 +319,7 @@ RSpec.shared_examples 'an RDF::Queryable' do
       before { skip unless subject.respond_to?(:query_execute, true ) }
 
       it "defines a protected #query_execute method" do
-        expect(subject.class.protected_method_defined?(:query_execute))
-          .to be_truthy
+        expect(subject.protected_methods).to include :query_execute
       end
 
       include_examples 'query execution', :query_execute
@@ -327,7 +331,7 @@ RSpec.shared_examples 'an RDF::Queryable' do
       before { skip unless subject.respond_to?(:query_pattern, true ) }
 
       it "defines a protected #query_pattern method" do
-        expect(subject.class.protected_method_defined?(:query_pattern)).to be_truthy
+        expect(subject.protected_methods).to include :query_pattern
       end
       
       include_examples 'query pattern', :query_pattern 

data/lib/rdf/spec/repository.rb

@@ -48,35 +48,6 @@ RSpec.shared_examples 'an RDF::Repository' do
     end
   end
 
-  describe "#transaction" do
-    it 'gives an immutable transaction' do
-      expect { subject.transaction { insert([]) } }.to raise_error TypeError
-    end
-
-    it 'commits a successful transaction' do
-      statement = RDF::Statement(:s, RDF.type, :o)
-      expect(subject).to receive(:commit_transaction).and_call_original
-      
-      expect do
-        subject.transaction(mutable: true) { insert(statement) }
-      end.to change { subject.statements }.to include(statement)
-    end
-
-    it 'rolls back a failed transaction' do
-      original_contents = subject.statements
-      expect(subject).to receive(:rollback_transaction).and_call_original
-
-      expect do
-        subject.transaction(mutable: true) do
-          delete(*@statements)
-          raise 'my error'
-        end
-      end.to raise_error RuntimeError
-
-      expect(subject.statements).to contain_exactly(*original_contents)
-    end
-  end
-
   context "with snapshot support" do
 
     describe '#snapshot' do

data/lib/rdf/spec/transactable.rb

@@ -18,7 +18,9 @@ RSpec.shared_examples 'an RDF::Transactable' do
     end
 
     it 'commits a successful transaction' do
-      statement = RDF::Statement(:s, RDF.type, :o)
+      statement = RDF::Statement(RDF::URI('http://example.com/s'), 
+                                 RDF.type, 
+                                 RDF::URI('http://example.com/o'))
       expect(subject).to receive(:commit_transaction).and_call_original
       
       expect do

data/lib/rdf/spec/transaction.rb

@@ -250,6 +250,26 @@ shared_examples "an RDF::Transaction" do |klass|
     end
   end
 
+  describe '#mutated?' do
+    let(:st) { RDF::Statement(:s, RDF::URI('http://example.com/p'), 'o') }
+
+    it 'returns true after a successful insert' do
+      begin 
+        expect { subject.insert(st) }
+          .to change { subject.mutated? }.from(false).to(true)
+      rescue NotImplementedError; end
+    end
+
+    it 'returns true after a successful delete' do
+      repository.insert(st)
+
+      begin 
+        expect { subject.delete(st) }
+          .to change { subject.mutated? }.from(false).to(true)
+      rescue NotImplementedError; end
+    end
+  end
+
   describe '#execute' do
     let(:st) { RDF::Statement(:s, RDF::URI('http://example.com/p'), 'o') }
       

data/lib/rdf/spec/writable.rb

@@ -126,9 +126,9 @@ RSpec.shared_examples 'an RDF::Writable' do
     end
 
     it "should not insert an incomplete statement" do
-      expect {subject.insert(RDF::Statement.from(statement.to_hash.merge(subject: nil)))}.to raise_error(ArgumentError)
-      expect {subject.insert(RDF::Statement.from(statement.to_hash.merge(predicate: nil)))}.to raise_error(ArgumentError)
-      expect {subject.insert(RDF::Statement.from(statement.to_hash.merge(object: nil)))}.to raise_error(ArgumentError)
+      expect {subject.insert(RDF::Statement.from(statement.to_h.merge(subject: nil)))}.to raise_error(ArgumentError)
+      expect {subject.insert(RDF::Statement.from(statement.to_h.merge(predicate: nil)))}.to raise_error(ArgumentError)
+      expect {subject.insert(RDF::Statement.from(statement.to_h.merge(object: nil)))}.to raise_error(ArgumentError)
       expect(subject.count).to eql 0
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-spec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0.pre.rc1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -167,17 +167,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: RSpec extensions for RDF.rb.
 test_files: []
-has_rdoc: false