tripleloop 0.0.1 → 0.0.5

data/lib/tripleloop/extractor.rb

@@ -24,34 +24,41 @@ class Tripleloop::Extractor
   end
 
   def extract
-    self.class.fragment_map.reduce([]) do |memo, (path, block)|
-      fragment = Tripleloop::Util.with_nested_fetch(context).get_in(*path)
-      returned = instance_exec(fragment, &block)
-
-      if nested_triples?(returned)
-        returned.each do |value|
-          ensure_triple_or_quad(value)
-        end
-        memo.concat(returned)
+    self.class.fragment_map.reduce([]) do |accu, (path, block)|
+      if fragment = Tripleloop::Util.with_nested_fetch(context).get_in(*path)
+        add_to_triples(accu, fragment, &block)
       else
-        ensure_triple_or_quad(returned)
-        memo << returned
+        accu
       end
     end
   end
 
 private
+  def add_to_triples(triples, fragment, &block)
+    returned = Array(instance_exec(fragment, &block))
+
+    if nested_triples?(returned)
+      returned.each do |value|
+        ensure_triple_or_quad(value)
+      end
+      triples.concat(returned)
+    else
+      ensure_triple_or_quad(returned)
+      triples << returned
+    end
+  end
+
   def nested_triples?(value)
     value.all? { |object| object.is_a?(Array) }
   end
 
   def ensure_triple_or_quad(value)
     message = "Cannot build a triple or a quad with #{value}."
-    raise BrokenMappingError, message unless is_triple_or_quad?(value)
+    raise BrokenMappingError, message if value.any?(&:nil?) || !is_triple_or_quad?(value)
   end
 
   def is_triple_or_quad?(value)
-    [3,4].include? value.length
+    [3,4].include?(value.length)
   end
 
   def bind_variables!

data/spec/tripleloop/extractor_spec.rb

@@ -11,6 +11,8 @@ describe Tripleloop::Extractor do
         [:subject, item, :object]
       }
     }
+
+    map(:path, :to, :missing, :key) { nil }
   end
 
   class BrokenExtractor < Tripleloop::Extractor
@@ -20,6 +22,12 @@ describe Tripleloop::Extractor do
     }
   end
 
+  class OtherBrokenExtractor < Tripleloop::Extractor
+    map(:path, :to, :key) { |value|
+      [:subject, :pred, nil] # <= nil value
+    }
+  end
+
   let(:document) {{
     :path => {
       :to => {
@@ -50,13 +58,44 @@ describe Tripleloop::Extractor do
       end
     end
 
-    context "when a block does not return a valid constructor argument for RDF::Statement" do
-      it "raises an ArgumentError" do
+    context "when a map block does not return a valid constructor argument for RDF::Statement" do
+      it "raises an error" do
         expect {
           BrokenExtractor.new(document).extract
         }.to raise_error(Tripleloop::Extractor::BrokenMappingError)
       end
     end
+
+    context "when a map block returns an array containing a nil value" do
+      it "raises an error" do
+        expect {
+          OtherBrokenExtractor.new(document).extract
+        }.to raise_error(Tripleloop::Extractor::BrokenMappingError)
+      end
+    end
+
+    context "when a map block returns a nil value" do
+      it "ignores the nil value" do
+        triples.should_not include(nil)
+      end
+    end
+
+    context "when map points to a nil document fragment" do
+      my_block = proc { raise "This should not be called" }
+
+      klass = Class.new(SampleExtractor) do
+        map(:path, :to, :nil, :key, &my_block)
+        map(:path, :to, :key) { |v| [:s, :p, v] }
+      end
+
+      it "ignores the mapped block" do
+        my_block.should_not_receive(:call)
+        extractor = klass.new(document)
+        extractor.extract.should eq([
+          [:s, :p, :test_key]
+        ])
+      end
+    end
   end
 
   describe ".define" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripleloop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &12159420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12159420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12277940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *12277940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &12276080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *12276080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12274760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12274760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &12221100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +85,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12221100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple tool for extracting RDF triples from Ruby hashes
-email: andrea.giulio.fiore@googlemail.com
+email: andrea.giulio.fiore@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -104,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tripleloop
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 2
 summary: Simple tool for extracting RDF triples from Ruby hashes