bbc_data_service 1.0 → 1.1

data/lib/bbc_data_service/fixture_loader.rb

@@ -1,11 +1,11 @@
 module BBCDataService
   class FixtureLoader
-    def self.load_fixture(name)
+    def self.load_fixture(name, options = {})
       require ServiceConfig[:fixture_config].to_s
       app_fixture = AppFixture.fixtures[name]
       app_fixture = self.merge_fixtures(app_fixture) if app_fixture[:parent]
       if app_fixture
-        self.parse_data(app_fixture)
+        self.parse_data(app_fixture, options)
       end
     end
     
@@ -16,10 +16,10 @@ module BBCDataService
       parent_fixture.merge(app_fixture)
     end
     
-    def self.parse_data(app_fixture)
+    def self.parse_data(app_fixture, options)
       case app_fixture[:type]
       when :rdf
-        fixtures = BBCDataService::RDFParser.parse_feed(app_fixture)
+        fixtures = BBCDataService::RDFParser.parse_feed(app_fixture, options)
         if fixtures.size == 1
           return fixtures.first
         else

data/lib/bbc_data_service/rdf_parser.rb

@@ -6,7 +6,7 @@ module BBCDataService
   
     include BBCDataService::Vocabulary
   
-    def self.parse_feed(registered_fixture)
+    def self.parse_feed(registered_fixture, options)
       feed_url = registered_fixture[:feed_url]
       mappings = registered_fixture[:mappings]
       rdf_type = registered_fixture[:rdf_type]
@@ -16,7 +16,10 @@ module BBCDataService
       })
       results = []
       fixtures = []
-      if registered_fixture[:filter]
+      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

data/lib/bbc_data_service/version.rb

@@ -1,3 +1,3 @@
 module BBCDataService
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/spec/fixture_loader_spec.rb

@@ -61,4 +61,14 @@ describe BBCDataService::FixtureLoader do
     country.name.should == "Germany"
   end
   
+  it "should allow filtering of data on the fly" do
+    object = BBCDataService::FixtureLoader.load_fixture(:multiple_items,
+      :filter => {
+        :column => :name,
+        :value => "Germany",
+        :type => :string
+      })
+    object.name.should == "Germany"
+  end
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bbc_data_service
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Matthew Crouch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 Z
+date: 2011-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra