bbc_data_service 1.2 → 1.3

data/lib/bbc_data_service/rdf_parser.rb

@@ -27,13 +27,13 @@ module BBCDataService
       end
       fixtures.each do |fixture|
         current_fixture = BBCDataService::FeedFixture.new(self.instance_eval(self.execute_query(graph, query, mappings)))
-        self.process_relationships(graph, registered_fixture, current_fixture, fixture)
+        self.process_relationships(graph, registered_fixture, current_fixture, fixture, options)
         results << current_fixture
       end
       results
     end
     
-    def self.process_relationships(graph, fixture_data, current_fixture, rdf_fixture)
+    def self.process_relationships(graph, fixture_data, current_fixture, rdf_fixture, options)
       relationships = fixture_data[:relationships]
       if relationships
         relationships.each do |relationship|
@@ -43,8 +43,17 @@ module BBCDataService
           query = RDF::Query.new({
             :fixture => self.generate_query(values[:mappings], values[:rdf_type])
           })
+          if options[:filter]
+            solutions = query.execute(graph)
+            fixtures = self.filter_graph(solutions, options[:filter])
+          elsif registered_fixture[:filter]
+            solutions = query.execute(graph)
+            fixtures = self.filter_graph(solutions, registered_fixture[:filter])
+          else
+            fixtures = query.execute(graph)
+          end
           results = []
-          query.execute(graph).each do |fixture|
+          fixtures.each do |fixture|
             results << BBCDataService::FeedFixture.new(self.instance_eval(self.execute_query(graph, query, values[:mappings])))
           end
           current_fixture.add_relationship(key, results)

data/lib/bbc_data_service/version.rb

@@ -1,3 +1,3 @@
 module BBCDataService
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bbc_data_service
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Matthew Crouch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra