omnis 0.2.0 → 0.3.0

data/lib/omnis.rb

@@ -2,6 +2,7 @@ require "omnis/version"
 
 require 'active_support/core_ext/hash'
 require 'omnis/nested_hash_extractor'
+require 'omnis/monadic_nested_hash_extractor'
 require 'omnis/transformer'
 require 'omnis/operators'
 require 'omnis/query'

data/lib/omnis/monadic_nested_hash_extractor.rb

@@ -0,0 +1,11 @@
+require 'monadic'
+
+module Omnis
+  class MonadicNestedHashExtractor < NestedHashExtractor
+    def extractor(path)
+      raise ArgumentError("path to extract must be a string") unless String === path
+      expr = "source#{from_dot_path(path)} rescue Nothing"
+      ->source { Maybe(eval(expr)) }
+    end
+  end
+end

data/lib/omnis/nested_hash_extractor.rb

@@ -1,11 +1,9 @@
-require 'monadic'
-
 module Omnis
   class NestedHashExtractor
     # returns a lambda which extracts a value from a nested hash
     def extractor(path)
       raise ArgumentError("path to extract must be a string") unless String === path
-      expr = "source#{from_dot_path(path)} rescue Nothing"
+      expr = "source#{from_dot_path(path)} rescue nil"
       ->source { eval(expr) }
     end
 
@@ -18,7 +16,7 @@ module Omnis
 
     def field(f)
       return '['  << f << ']' if is_i?(f)
-      return '.fetch("' << f << '", Nothing)'
+      return '.fetch("' << f << '", nil)'
     end
 
     # checks if the string is a number

data/lib/omnis/version.rb

@@ -1,3 +1,3 @@
 module Omnis
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lib/omnis/monadic_nested_hash_extractor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'omnis/nested_hash_extractor'
+require 'omnis/monadic_nested_hash_extractor'
+
+describe Omnis::MonadicNestedHashExtractor do
+  let(:xtr) { Omnis::MonadicNestedHashExtractor.new }
+  let(:doc) {
+    { "ref_anixe" => "1abc",
+      "contract" => "test",
+      "agency"   => nil,
+      "services" => [ { "date_from" => "2012-10-10"}]}
+  }
+
+  it "extracts values using a path" do
+    xtr.extractor("ref_anixe").call(doc).should == Just("1abc")
+    xtr.extractor("services.0.date_from").call(doc).should == Just("2012-10-10")
+    xtr.extractor("agency").call(doc).should == Nothing
+  end
+
+  it "returns Nothing if an expression points to a non-existant key" do
+    xtr.extractor("ref_anixe").call({}).should == Nothing
+  end
+
+  it "returns Nothing for a nested path, if an exception would be raised" do
+    xtr.extractor("a.b.c").call({}).should == Nothing
+    xtr.extractor("a.(1]").call({}).should == Nothing
+  end
+
+  it "returns Nothing if the underlying value of a key is nil" do
+    xtr.extractor("agency").call(doc).should == Nothing
+  end
+
+end

data/spec/lib/omnis/nested_hash_extractor_spec.rb

@@ -16,13 +16,13 @@ describe Omnis::NestedHashExtractor do
     xtr.extractor("agency").call(doc).should be_nil
   end
 
-  it "returns Nothing if an expression points to a non-existant key" do
-    xtr.extractor("ref_anixe").call({}).should == Nothing
+  it "returns nil if an expression points to a non-existant key" do
+    xtr.extractor("ref_anixe").call({}).should == nil
   end
 
-  it "returns Nothing for a nested path, if an exception would be raised" do
-    xtr.extractor("a.b.c").call({}).should == Nothing
-    xtr.extractor("a.(1]").call({}).should == Nothing
+  it "returns nil for a nested path, if an exception would be raised" do
+    xtr.extractor("a.b.c").call({}).should == nil
+    xtr.extractor("a.(1]").call({}).should == nil
   end
 
   it "returns nil if the underlying value of a key is nil" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,6 +170,7 @@ files:
 - README.md
 - Rakefile
 - lib/omnis.rb
+- lib/omnis/monadic_nested_hash_extractor.rb
 - lib/omnis/mongo_query.rb
 - lib/omnis/mongo_report.rb
 - lib/omnis/nested_hash_extractor.rb
@@ -178,6 +179,7 @@ files:
 - lib/omnis/transformer.rb
 - lib/omnis/version.rb
 - omnis.gemspec
+- spec/lib/omnis/monadic_nested_hash_extractor_spec.rb
 - spec/lib/omnis/mongo_query_spec.rb
 - spec/lib/omnis/nested_hash_extractor_spec.rb
 - spec/lib/omnis/operators_spec.rb
@@ -197,12 +199,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4082639984471618075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4082639984471618075
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -210,6 +218,7 @@ signing_key:
 specification_version: 3
 summary: see above
 test_files:
+- spec/lib/omnis/monadic_nested_hash_extractor_spec.rb
 - spec/lib/omnis/mongo_query_spec.rb
 - spec/lib/omnis/nested_hash_extractor_spec.rb
 - spec/lib/omnis/operators_spec.rb