tripod 0.7.9 → 0.7.11

data/lib/tripod/criteria/execution.rb

@@ -10,13 +10,11 @@ module Tripod
     # +ResourceCollection+ is an +Enumerable+, Array-like object.
     #
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
     def resources(opts={})
       Tripod::ResourceCollection.new(
-        self.resource_class._resources_from_sparql(build_select_query(opts), :only_set_fields => opts[:only_set_fields]),
+        self.resource_class._resources_from_sparql(build_select_query(opts)),
          # pass in the criteria that was used to generate this collection, as well as whether the user specified return graph
         :return_graph => (opts.has_key?(:return_graph) ? opts[:return_graph] : true),
-        :only_set_fields => opts[:only_set_fields],
         :criteria => self
       )
     end
@@ -33,7 +31,6 @@ module Tripod
     # Execute the query and return the first result as a hydrated resource
     #
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
     def first(opts={})
       sq = Tripod::SparqlQuery.new(build_select_query(opts))
       first_sparql = sq.as_first_query_str

data/lib/tripod/finders.rb

@@ -59,7 +59,6 @@ module Tripod::Finders
     #
     # @option options [ String ] uri_variable The name of the uri variable in thh query, if not 'uri'
     # @option options [ String ] graph_variable The name of the uri variable in thh query, if not 'graph'
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
     #
     # @return [ Array ] An array of hydrated resources of this class's type.
     def find_by_sparql(sparql_query, opts={})
@@ -116,8 +115,7 @@ module Tripod::Finders
     # given a sparql select query, create and hydrate some resources
     #
     # @option options [ String ] uri_variable The name of the uri variable in the query, if not 'uri'
-    # @option options [ String ] graph_variable The name of the uri variable in the query, if not 'graph'
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
+    # @option options [ String ] graph_variable The name of the uri variable in thh query, if not 'graph'
     def _resources_from_sparql(select_sparql, opts={})
       _create_and_hydrate_resources_from_sparql(select_sparql, opts)
     end
@@ -145,13 +143,12 @@ module Tripod::Finders
     #
     # @option options [ String ] uri_variable The name of the uri variable in the query, if not 'uri'
     # @option options [ String ] graph_variable The name of the uri variable in the query, if not 'graph'
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
     def _create_and_hydrate_resources_from_sparql(select_sparql, opts={})
       # TODO: Optimization?: if return_graph option is false, then don't do this next line?
       uris_and_graphs = _select_uris_and_graphs(select_sparql, :uri_variable => opts[:uri_variable], :graph_variable => opts[:graph_variable])
       ntriples_string = _raw_describe_select_results(select_sparql, :uri_variable => opts[:uri_variable]) # this defaults to ntriples
       graph = _rdf_graph_from_ntriples_string(ntriples_string, graph=nil)
-      _resources_from_graph(graph, uris_and_graphs, :only_set_fields => opts[:only_set_fields])
+      _resources_from_graph(graph, uris_and_graphs)
     end
 
     # For a select query, generate a query which DESCRIBES all the results
@@ -172,12 +169,10 @@ module Tripod::Finders
       Tripod::SparqlClient::Query.query(query, accept_header)
     end
 
-    # Given a graph of data, and a hash of uris=>graphs, create and hydrate some resources.
+    # given a graph of data, and a hash of uris=>graphs, create and hydrate some resources.
     # Note: if any of the graphs are not set in the hash,
     # those resources can still be constructed, but not persisted back to DB.
-    #
-    # @option options [ Boolean ] only_set_fields Indicates whether to set only the declared fields on the resources. (default false).
-    def _resources_from_graph(graph, uris_and_graphs, opts={})
+    def _resources_from_graph(graph, uris_and_graphs)
       repo = add_data_to_repository(graph)
       resources = []
 
@@ -192,11 +187,8 @@ module Tripod::Finders
 
         # make a graph of data for this resource's uri
         data_graph = RDF::Graph.new
-
         repo.query( [RDF::URI.new(u), :predicate, :object] ) do |statement|
-          if !opts[:only_set_fields] || self.fields.values.map{ |v| v.predicate.to_s }.include?(statement.predicate.to_s)
-            data_graph << statement
-          end
+          data_graph << statement
         end
 
         # use it to hydrate this resource

data/lib/tripod/predicates.rb

@@ -69,11 +69,11 @@ module Tripod::Predicates
   def append_to_predicate(predicate_uri, object )
     raise Tripod::Errors::UriNotSet.new() unless @uri
 
-    @repository << RDF::Statement.new(@uri, RDF::URI.new(predicate_uri.to_s), object)
+    @repository << RDF::Statement.new(self.uri, RDF::URI.new(predicate_uri.to_s), object)
   end
 
   def remove_predicate(predicate_uri)
-    @repository.query( [:subject, RDF::URI.new(predicate_uri.to_s), :object] ) do |statement|
+    @repository.query( [self.uri, RDF::URI.new(predicate_uri.to_s), :object] ) do |statement|
       @repository.delete( statement )
     end
   end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.9"
+  VERSION = "0.7.11"
 end

data/spec/tripod/criteria_execution_spec.rb

@@ -12,7 +12,6 @@ describe Tripod::Criteria do
 
   let!(:john) do
     p = Person.new('http://example.com/id/john')
-    p.write_predicate('http://example.com/this-is-not-declared-as-a-field', 'blah')
     p.name = "John"
     p.save!
     p
@@ -97,8 +96,8 @@ describe Tripod::Criteria do
 
     context "with options passed" do
       it "should pass the options to build_select_query" do
-        person_criteria.should_receive(:build_select_query).with(:return_graph => false, :only_set_fields => true).and_call_original
-        person_criteria.resources(:return_graph => false, :only_set_fields => true)
+        person_criteria.should_receive(:build_select_query).with(:return_graph => false).and_call_original
+        person_criteria.resources(:return_graph => false)
       end
     end
 
@@ -132,18 +131,6 @@ describe Tripod::Criteria do
 
     end
 
-    context "with the only_set_fields option set to true" do
-      it "should only populate predicates for fields that have been declared at class level" do
-        person_criteria.resources(:only_set_fields => true).first.read_predicate('http://example.com/this-is-not-declared-as-a-field').should be_empty
-      end
-    end
-
-    context "without setting the only_set_fields option (i.e. false)" do
-      it "should only populate all preciates that have been declared at class level" do
-        person_criteria.resources.first.read_predicate('http://example.com/this-is-not-declared-as-a-field').should_not be_empty
-      end
-    end
-
   end
 
   describe "#first" do

data/spec/tripod/predicates_spec.rb

@@ -76,6 +76,19 @@ describe Tripod::Predicates do
       person.remove_predicate('http://example.com/blog')
       person.read_predicate('http://example.com/blog').should be_empty
     end
+
+    context 'when there are other triples in the repository that share the same predicate' do
+      let(:subject)   { RDF::URI.new('http://foo') }
+      let(:predicate) { RDF::URI.new('http://example.com/blog') }
+      before do
+        person.repository << [subject, predicate, RDF::URI.new('http://foo.tumblr.com')]
+      end
+
+      it "doesn't remove a value where the subject of the triple isn't the resource's URI" do
+        person.remove_predicate('http://example.com/blog')
+        person.repository.query( [subject, predicate, :object] ).should_not be_empty
+      end
+    end
   end
 
   describe "#append_to_predicate" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.11
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70100686885260 !ruby/object:Gem::Requirement
+  requirement: &70302396722560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686885260
+  version_requirements: *70302396722560
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70100686884720 !ruby/object:Gem::Requirement
+  requirement: &70302396722020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686884720
+  version_requirements: *70302396722020
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70100686884300 !ruby/object:Gem::Requirement
+  requirement: &70302396721600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686884300
+  version_requirements: *70302396721600
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70100686883760 !ruby/object:Gem::Requirement
+  requirement: &70302396737420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686883760
+  version_requirements: *70302396737420
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70100686883340 !ruby/object:Gem::Requirement
+  requirement: &70302396737000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686883340
+  version_requirements: *70302396737000
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70100686882880 !ruby/object:Gem::Requirement
+  requirement: &70302396736540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686882880
+  version_requirements: *70302396736540
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70100686882460 !ruby/object:Gem::Requirement
+  requirement: &70302396736120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686882460
+  version_requirements: *70302396736120
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70100686882040 !ruby/object:Gem::Requirement
+  requirement: &70302396735700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686882040
+  version_requirements: *70302396735700
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70100686881620 !ruby/object:Gem::Requirement
+  requirement: &70302396735280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686881620
+  version_requirements: *70302396735280
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70100686881120 !ruby/object:Gem::Requirement
+  requirement: &70302396734780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70100686881120
+  version_requirements: *70302396734780
 description: RDF ruby ORM
 email:
 - ric@swirrl.com