active-triples 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024aea8eb521fecc89a76d764bb1dd856febbf9c
-  data.tar.gz: e0fc3915d0fe0faba66b65df1adc31233a976433
+  metadata.gz: 2021791a9a343f59c6ae24159333c8897cebf86c
+  data.tar.gz: 81c56b132c4d53f6740d9c226f021e4b65b14cd8
 SHA512:
-  metadata.gz: 20b0ff10a9833b835c4eae9957baa1712ced77bceebb362eff685a508475d2dc05ca587b2cfe30959ddcc31385696136f8d714c57997e30c4e1ffc809a4c967e
-  data.tar.gz: b61e998c602a8d860fef2614158ecebeb3acec51c83b4e8e1b264554a2dced2beb10c9a1cc20cc3b746f4029df2318ab3ae8dcc50a07802b1742a4f096854e42
+  metadata.gz: 650d818e6a155bf3cf33fc78f68dd1507254ed2d0afd71c0b1b7cb3c60a7e88aa46370d88d10d0801cce7dc08938e83b4ce65fb20d1e52611ecd7f240161014c
+  data.tar.gz: 679cf912b7e71b6ca6b15f16a51dc4f846ee0d0694719781cd30a9b6aef95bf78746cf8442ca856422f36b03d7a05cef63033031d594d3e01250f7a4fe89f1d3

data/CHANGES.md

@@ -1,10 +1,16 @@
+0.7.3
+----
+
+  - Optimize querying by using Graph#query instead of Queryable#query
+  - Improved error handling
+
 0.7.2
 ----
 
   - Allows interoperability between `ActiveModel::Validations` and
     `RDF::Graph#valid?`. This fixes a bug with validation callbacks. See:
     [#167](https://github.com/ActiveTriples/ActiveTriples/pull/167).
-    
+
 0.7.1
 ----
 

data/lib/active_triples/rdf_source.rb

@@ -73,7 +73,7 @@ module ActiveTriples
           graph.valid?
       end
 
-      delegate :each, :load!, :count, :has_statement?, :to => :@graph
+      delegate :query, :each, :load!, :count, :has_statement?, :to => :@graph
 
       define_model_callbacks :persist
 

data/lib/active_triples/relation.rb

@@ -133,7 +133,7 @@ module ActiveTriples
           return
         end
         val = val.to_uri if val.respond_to? :to_uri
-        raise "value must be an RDF URI, Node, Literal, or a valid datatype. See RDF::Literal.\n\tYou provided #{val.inspect}" unless
+        raise ValueError, val unless 
           val.kind_of? RDF::Value or val.kind_of? RDF::Literal
         parent.insert [rdf_subject, predicate, val]
       end
@@ -235,6 +235,28 @@ module ActiveTriples
           parent.rdf_subject
         end
       end
+
+    public
+
+    ##
+    # An error class for unallowable values in relations.
+    class ValueError < ArgumentError
+      # @!attribute [r] value
+      attr_reader :value
+
+      ##
+      # @param value [Object]
+      def initialize(value)
+        @value = value
+      end
+
+      ##
+      # @return [String]
+      def message
+        'value must be an RDF URI, Node, Literal, or a valid datatype. '\
+        "See RDF::Literal.\n\tYou provided #{value.inspect}"
+      end
+    end
   end
 
   class Term < Relation

data/lib/active_triples/repositories.rb

@@ -16,8 +16,15 @@ module ActiveTriples
   # @see Configurable
   module Repositories
 
+    ##
+    # @param name [Symbol] 
+    # @param repo [RDF::Repository] 
+    #
+    # @return [RDF::Repository]
+    # @raise [ArgumentError] if a non-repository is passed
     def add_repository(name, repo)
-      raise "Repositories must be an RDF::Repository" unless repo.kind_of? RDF::Repository
+      raise ArgumentError, "Repositories must be an RDF::Repository" unless 
+        repo.kind_of? RDF::Repository
       repositories[name] = repo
     end
     module_function :add_repository

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

data/spec/active_triples/relation_spec.rb

@@ -11,7 +11,7 @@ describe ActiveTriples::Relation do
     context "when relation has 0 value arguments" do
       before { subject.value_arguments = double(length: 0) }
       it "should raise an error" do
-        expect { subject.send(:rdf_subject) }.to raise_error
+        expect { subject.send(:rdf_subject) }.to raise_error ArgumentError
       end
     end
     context "when term has 1 value argument" do
@@ -35,7 +35,7 @@ describe ActiveTriples::Relation do
     context "when relation has 3 value arguments" do
       before { subject.value_arguments = double(length: 3) }
       it "should raise an error" do
-        expect { subject.send(:rdf_subject)  }.to raise_error
+        expect { subject.send(:rdf_subject)  }.to raise_error ArgumentError
       end
     end
   end

data/spec/active_triples/repositories_spec.rb

@@ -14,7 +14,8 @@ describe ActiveTriples::Repositories do
       expect(subject.repositories).to include :name
     end
     it 'should throw an error if passed something that is not a repository' do
-      expect{subject.add_repository :name, :not_a_repo}.to raise_error
+      expect{subject.add_repository :name, :not_a_repo}
+        .to raise_error ArgumentError
     end
   end
 

data/spec/active_triples/resource_spec.rb

@@ -22,7 +22,9 @@ describe ActiveTriples::Resource do
 
   describe '#property' do
     it 'raises error when set directly on Resource' do
-      expect { ActiveTriples::Resource.property :blah, :predicate => RDF::DC.title }.to raise_error
+      expect { ActiveTriples::Resource.property :blah, predicate: RDF::DC.title }
+        .to raise_error 'Properties not definable directly on ' \
+                        'ActiveTriples::Resource, use a subclass'
     end
   end
 
@@ -67,7 +69,8 @@ describe ActiveTriples::Resource do
       end
 
       it 'should not be settable' do
-        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }.to raise_error
+        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }
+          .to raise_error "Refusing update URI when one is already assigned!" 
       end
     end
 
@@ -474,7 +477,8 @@ describe ActiveTriples::Resource do
       end
 
       it 'raises error when trying to set nil value' do
-        expect { subject.aggregates[1] = nil }.to raise_error /value must be an RDF URI, Node, Literal, or a valid datatype/
+        expect { subject.aggregates[1] = nil }
+          .to raise_error ActiveTriples::Relation::ValueError
       end
 
       it "should be changeable for multiple values" do
@@ -560,7 +564,8 @@ describe ActiveTriples::Resource do
     end
 
     it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect{subject.set_value(RDF::DC.title, Object.new)}.to raise_error
+      expect{subject.set_value(RDF::DC.title, Object.new)}
+        .to raise_error ActiveTriples::Relation::ValueError
     end
 
     it "should be able to accept a subject" do
@@ -583,7 +588,8 @@ describe ActiveTriples::Resource do
     end
 
     it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect { subject[RDF::DC.title] = Object.new }.to raise_error
+      expect { subject[RDF::DC.title] = Object.new }
+        .to raise_error ActiveTriples::Relation::ValueError
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -258,9 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.
 test_files: []
-has_rdoc: