bbc_data_service 1.4 → 1.5

data/lib/bbc_data_service/feed_fixture.rb

@@ -4,7 +4,7 @@ module BBCDataService
     include ActiveModel::Conversion
     extend ActiveModel::Naming
   
-    attr_accessor :attributes
+    attr_accessor :attributes, :rdf_object
   
     def initialize(attributes = {})
       @attributes = attributes
@@ -17,7 +17,7 @@ module BBCDataService
     end
     
     def add_relationship(name, values)
-      FeedFixture.instance_eval <<-EOS
+      FeedFixture.class_eval <<-EOS
         attr_accessor :#{name}
       EOS
       send("#{name}=", values)

data/lib/bbc_data_service/rdf_parser.rb

@@ -27,7 +27,8 @@ 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)
+        current_fixture.rdf_object = fixture
+        current_fixture = self.process_relationships(graph, registered_fixture, current_fixture, fixture)
         results << current_fixture
       end
       results
@@ -40,22 +41,28 @@ module BBCDataService
           key = relationship.first
           values = relationship.last
           # Parse this set of RDF, then add to an array on the main object
-          query = RDF::Query.new({
-            :fixture => self.generate_query(values[:mappings], values[:rdf_type])
-          })
-          if values[:filter]
-            solutions = query.execute(graph)
-            fixtures = self.filter_graph(solutions, values[:filter])
+          if values[:foreign_key]
+            foreign_key = self.instance_eval("current_fixture.#{values[:foreign_key]}")
+            query = RDF::Query.new({
+              RDF::URI(foreign_key) => self.generate_query(values[:mappings], values[:rdf_type])
+            })
+            fixtures = query.execute(graph)
           else
+            query = RDF::Query.new({
+              :fixture => self.generate_query(values[:mappings], values[:rdf_type])
+            })
             fixtures = query.execute(graph)
           end
           results = []
           fixtures.each do |fixture|
-            results << BBCDataService::FeedFixture.new(self.instance_eval(self.execute_query(graph, query, values[:mappings])))
+            current_fixture = BBCDataService::FeedFixture.new(self.instance_eval(self.execute_query(graph, query, values[:mappings])))
+            current_fixture.rdf_object = fixture
+            results << current_fixture
           end
           current_fixture.add_relationship(key, results)
         end
       end
+      current_fixture
     end
     
     def self.filter_graph(solutions, filter)

data/lib/bbc_data_service/version.rb

@@ -1,3 +1,3 @@
 module BBCDataService
-  VERSION = "1.4"
+  VERSION = "1.5"
 end

data/spec/fixture_loader_spec.rb

@@ -71,4 +71,9 @@ describe BBCDataService::FixtureLoader do
     object.name.should == "Germany"
   end
   
+  it "should allow finding of other resources" do
+    object = BBCDataService::FixtureLoader.load_fixture(:relationship_with_foreign_key)
+    object.first.team.first.name.should == "Team GB"
+  end
+  
 end

data/spec/fixtures/athlete.json

@@ -0,0 +1 @@
+{"http:\/\/www.bbc.co.uk\/things\/7ef7ffdf-f101-4470-adc0-38a5abac9122#id":{"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/sport\/CompetitiveSportingOrganisation","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"Team GB","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/document":[{"value":"http:\/\/www.bbc.co.uk\/sport\/olympics\/2012\/countries\/great-britain","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/shortName":[{"value":"Great Britain & N. Ireland","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/2012olympics\/territory":[{"value":"http:\/\/www.bbc.co.uk\/things\/d28bb4f7-1446-4aa2-a33e-75cda54d1ee6#id","type":"uri"}]},"http:\/\/www.bbc.co.uk\/things\/d28bb4f7-1446-4aa2-a33e-75cda54d1ee6#id":{"http:\/\/www.bbc.co.uk\/ontologies\/geopolitical\/isInGroup":[{"value":"http:\/\/www.bbc.co.uk\/things\/81b14df8-f9d2-4dff-a676-43a1a9a5c0a5#id","type":"uri"}],"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/geopolitical\/Territory","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"the United Kingdom of Great Britain and Northern Ireland","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}]},"http:\/\/www.bbc.co.uk\/things\/81b14df8-f9d2-4dff-a676-43a1a9a5c0a5#id":{"http:\/\/www.bbc.co.uk\/ontologies\/geopolitical\/groupType":[{"value":"http:\/\/www.bbc.co.uk\/things\/group-types\/bbc-news-geo-regions","type":"uri"}],"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/geopolitical\/Group","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"Europe","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}]},"http:\/\/www.bbc.co.uk\/things\/4e40ce40-b632-4a42-98d7-cf97067f7bf9#id":{"http:\/\/www.bbc.co.uk\/ontologies\/2012olympics\/height":[{"value":"183.0","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#float","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/2012olympics\/gender":[{"value":"M","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"Ben Ainslie","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/sport\/competesIn":[{"value":"http:\/\/www.bbc.co.uk\/things\/8d6ae957-d338-442b-99d7-190f20b78dd4#id","type":"uri"}],"http:\/\/xmlns.com\/foaf\/0.1\/givenName":[{"value":"Ben","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.w3.org\/2000\/01\/rdf-schema#label":[{"value":"Ben Ainslie","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/xmlns.com\/foaf\/0.1\/name":[{"value":"Ben Ainslie","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/canonicalName":[{"value":"Ben Ainslie","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/purl.org\/vocab\/participation\/schema#role_at":[{"value":"http:\/\/www.bbc.co.uk\/things\/7ef7ffdf-f101-4470-adc0-38a5abac9122#id","type":"uri"}],"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/sport\/Person","type":"uri"}],"http:\/\/xmlns.com\/foaf\/0.1\/familyName":[{"value":"Ainslie","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/2012olympics\/weight":[{"value":"90.0","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#float","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/document":[{"value":"http:\/\/www.facebook.com\/pages\/Ben-Ainslie\/108182689201922","type":"uri"},{"value":"http:\/\/www.bbc.co.uk\/sport\/olympics\/2012\/athletes\/4e40ce40-b632-4a42-98d7-cf97067f7bf9","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/2012olympics\/dateOfBirth":[{"value":"1977-02-05","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#date","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/sport\/discipline":[{"value":"http:\/\/www.bbc.co.uk\/things\/d65c5dce-f5e4-4340-931b-16ca1848d092#id","type":"uri"}]},"http:\/\/www.bbc.co.uk\/things\/d65c5dce-f5e4-4340-931b-16ca1848d092#id":{"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/sport\/SportsDiscipline","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"Sailing","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/document":[{"value":"http:\/\/www.bbc.co.uk\/sport\/olympics\/2012\/sports\/sailing","type":"uri"}]},"http:\/\/www.bbc.co.uk\/things\/8d6ae957-d338-442b-99d7-190f20b78dd4#id":{"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/sport\/MedalCompetition","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/name":[{"value":"Men's Finn","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/document":[{"value":"http:\/\/www.bbc.co.uk\/sport\/olympics\/2012\/sports\/sailing\/events\/mens-finn","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/shortName":[{"value":"Men's Finn","datatype":"http:\/\/www.w3.org\/2001\/XMLSchema#string","type":"literal"}]},"http:\/\/www.facebook.com\/pages\/Ben-Ainslie\/108182689201922":{"http:\/\/www.bbc.co.uk\/ontologies\/domain\/documentType":[{"value":"http:\/\/www.bbc.co.uk\/things\/document-types\/external","type":"uri"},{"value":"http:\/\/www.bbc.co.uk\/things\/document-types\/facebook","type":"uri"}],"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/domain\/Document","type":"uri"},{"value":"http:\/\/xmlns.com\/foaf\/0.1\/Document","type":"uri"}]},"http:\/\/www.bbc.co.uk\/sport\/olympics\/2012\/athletes\/4e40ce40-b632-4a42-98d7-cf97067f7bf9":{"http:\/\/www.bbc.co.uk\/ontologies\/domain\/documentType":[{"value":"http:\/\/www.bbc.co.uk\/things\/document-types\/bbc-document","type":"uri"}],"http:\/\/www.bbc.co.uk\/ontologies\/domain\/domain":[{"value":"http:\/\/www.bbc.co.uk\/things\/domains\/olympics2012","type":"uri"}],"http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type":[{"value":"http:\/\/www.bbc.co.uk\/ontologies\/domain\/Document","type":"uri"},{"value":"http:\/\/xmlns.com\/foaf\/0.1\/Document","type":"uri"}]}}

data/spec/fixtures/test_config.rb

@@ -150,4 +150,42 @@ BBCDataService::AppFixture.register_fixture :multiple_items_with_filter, {
     :value => "Germany",
     :type => :string
   }
+}
+BBCDataService::AppFixture.register_fixture :relationship_with_foreign_key, {
+  :endpoint => "/dsp/sport/olympics/2012/athletes/4e40ce40-b632-4a42-98d7-cf97067f7bf9",
+  :type => :rdf,
+  :feed_url => File.expand_path("../athlete.json", __FILE__),
+  :rdf_type => "sport:Person",
+  :mappings => {
+    :foaf => {
+      :family_name => "familyName",
+      :given_name => "givenName"
+    },
+    :domain => {
+      :name => "name",
+      :canonical_name => "canonicalName",
+      :url => "document"
+    },
+    :oly => {
+      :date_of_birth => "dateOfBirth",
+      :height => "height",
+      :weight => "weight",
+      :gender => "gender"
+    },
+    :par => {
+      :role_at => "role_at"
+    } 
+  },
+  :relationships => {
+    :team => {
+      :foreign_key => :role_at,
+      :rdf_type => "sport:CompetitiveSportingOrganisation",
+      :mappings => {
+        :domain => {
+          :name => "name",
+          :short_name => "shortName"
+        }
+      }
+    }
+  }
 }

metadata

@@ -1,159 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bbc_data_service
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: '1.5'
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  version: "1.4"
 platform: ruby
-authors: 
+authors:
 - Matthew Crouch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164346900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 2
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164346900
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2164346320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164346320
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &2164345740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdf-json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164345740
+- !ruby/object:Gem::Dependency
+  name: rdf-json
+  requirement: &2164345240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2164345240
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2156478960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156478960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156478240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: turn
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2156478240
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &2156477560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2156477560
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156476840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *2156476840
 description: BBC Data Service for fixture management
-email: 
+email:
 - matthew.crouch@bbc.co.uk
-executables: 
+executables:
 - bbc_data_service
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -171,6 +124,7 @@ files:
 - lib/bbc_data_service/vocabulary.rb
 - lib/bbc_data_service/xml_parser.rb
 - spec/fixture_loader_spec.rb
+- spec/fixtures/athlete.json
 - spec/fixtures/countries.rdf.json
 - spec/fixtures/country.rdf.json
 - spec/fixtures/groups-individual.json
@@ -181,39 +135,31 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/mobzilla/bbc-data-service
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bbc-data-service
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: BBC Data Service
-test_files: 
+test_files:
 - spec/fixture_loader_spec.rb
+- spec/fixtures/athlete.json
 - spec/fixtures/countries.rdf.json
 - spec/fixtures/country.rdf.json
 - spec/fixtures/groups-individual.json