bbc_data_service 1.5 → 1.6

data/lib/bbc_data_service/rdf_parser.rb

@@ -46,14 +46,13 @@ module BBCDataService
             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 = query.execute(graph)
           fixtures.each do |fixture|
             current_fixture = BBCDataService::FeedFixture.new(self.instance_eval(self.execute_query(graph, query, values[:mappings])))
             current_fixture.rdf_object = fixture

data/lib/bbc_data_service/version.rb

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

data/spec/fixture_loader_spec.rb

@@ -73,7 +73,8 @@ describe BBCDataService::FixtureLoader do
   
   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"
+    object.first.name == "Im Dong-Hyun"
+    object.first.team.first.team_name.should == "South Korea"
   end
   
 end

data/spec/fixtures/test_config.rb

@@ -152,25 +152,13 @@ BBCDataService::AppFixture.register_fixture :multiple_items_with_filter, {
   }
 }
 BBCDataService::AppFixture.register_fixture :relationship_with_foreign_key, {
-  :endpoint => "/dsp/sport/olympics/2012/athletes/4e40ce40-b632-4a42-98d7-cf97067f7bf9",
+  :endpoint => "/dsp/sport/olympics/2012/athletes",
   :type => :rdf,
-  :feed_url => File.expand_path("../athlete.json", __FILE__),
+  :feed_url => File.expand_path("../athletes.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"
+      :name => "name"
     },
     :par => {
       :role_at => "role_at"
@@ -182,8 +170,8 @@ BBCDataService::AppFixture.register_fixture :relationship_with_foreign_key, {
       :rdf_type => "sport:CompetitiveSportingOrganisation",
       :mappings => {
         :domain => {
-          :name => "name",
-          :short_name => "shortName"
+          :team_name => "name",
+          :team_short_name => "shortName"
         }
       }
     }

metadata

@@ -1,112 +1,159 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bbc_data_service
-version: !ruby/object:Gem::Version
-  version: '1.5'
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  version: "1.6"
 platform: ruby
-authors:
+authors: 
 - Matthew Crouch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &2164346900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
   type: :runtime
-  prerelease: false
-  version_requirements: *2164346900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2164346320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2164346320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &2164345740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2164345740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdf-json
-  requirement: &2164345240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2164345240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2156478960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156478960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156478240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *2156478240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: turn
-  requirement: &2156477560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
   type: :development
-  prerelease: false
-  version_requirements: *2156477560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2156476840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
-  prerelease: false
-  version_requirements: *2156476840
+  version_requirements: *id008
 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
@@ -135,29 +182,38 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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