omnis 0.1.1 → 0.2.0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--order rand

data/lib/omnis/mongo_query.rb

@@ -70,7 +70,7 @@ module Omnis
       def mongo_opts(extracted_params)
         params_with_extra_fields = extracted_params.collect(&:opts).select {|e| e.has_key? :field}
         extra_fields = params_with_extra_fields.map {|e| e[:field]}
-        fields = self.class.field_list.concat(extra_fields)
+        fields = self.class.field_list + extra_fields
         { :limit => items_per_page, :skip => skip, :fields => fields }
       end
     end

data/lib/omnis/operators.rb

@@ -18,6 +18,8 @@ module Omnis
       end
     end
 
+    Any = NullOperator
+
     class Matches < NullOperator
     end
 

data/lib/omnis/transformer.rb

@@ -31,14 +31,15 @@ module Omnis
         @properties ||= {}
       end
 
-      # if an expr is provided it will be passed to the configured extractor,
-      # otherwise a block is required
+      # If an expr is provided it will be passed to the configured extractor,
+      # otherwise a block should be given. As last resort, it embeds a lambda to
+      # look for a class method with the name of the param (at runtime)
       def property(name, expr=nil, opts={}, &block)
-        raise ArgumentError if (expr.nil? && block.nil?)
-
-        xtr = case expr
-              when String; @extractor.extractor(expr)
-              when nil   ; block
+        xtr = case
+              when String === expr    ; @extractor.extractor(expr)
+              when block_given?       ; block
+              else
+                ->(source) { self.send(name, source) }
               end
 
         Omnis::Transformer::Property.new(name, expr, opts, xtr).tap do |prop|

data/lib/omnis/version.rb

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

data/spec/lib/omnis/mongo_query_spec.rb

@@ -96,7 +96,7 @@ describe Omnis::MongoQuery do
 
     it "should fill params with default" do
       t = TestHotelsWithDepartureTomorrowQuery.new({})
-      m = p t.to_mongo
+      m = t.to_mongo
       m.selector[:contract].should == /^wotra./i
       m.selector[:product].should  == "PACKAGE"
       m.selector[:status].should   == "book_confirmed"

data/spec/lib/omnis/query_spec.rb

@@ -62,4 +62,5 @@ describe Omnis::Query do
     t = TestDefaultsWithLambdaParams.new({})
     t.fetch(:contract).value.should == :angry_nerds
   end
+
 end

data/spec/lib/omnis/transformer_spec.rb

@@ -37,15 +37,6 @@ describe Omnis::Transformer do
     t.transform(doc).should == { :ref => "1abc" }
   end
 
-  it "should raise an ArgumentError if no block and no expression provided" do
-    expect {
-      class TestTransformerInvalid
-        include Omnis::Transformer
-        property :ref
-      end
-    }.to raise_error ArgumentError
-  end
-
   it "uses a #to_object method if provided to convert the resulting Hash into an Object" do
     class TestTransformerWithToObject
       include Omnis::Transformer
@@ -58,7 +49,7 @@ describe Omnis::Transformer do
     t.transform(doc).should == OpenStruct.new(ref: "1abc")
   end
 
-  it 'provides a tranformer lambda' do
+  it 'provides a transformer lambda' do
     class TestXformer
       include Omnis::Transformer
       property(:ref) {|src| src['ref_anixe']}
@@ -68,4 +59,18 @@ describe Omnis::Transformer do
     xformer.should be_a Proc
     xformer.({"ref_anixe" => "2two"}).should == {:ref => "2two"}
   end
+
+  it 'works with built in (class) methods' do
+    class TestBuiltInXformer
+      include Omnis::Transformer
+      property :ref
+
+      def self.ref(source)
+        "ref_value"
+      end
+    end
+
+    xformer = TestBuiltInXformer.new.to_proc
+    xformer.({}).should == {:ref => 'ref_value'}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,6 +163,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Guardfile
 - LICENSE.txt