omnis 0.4.0 → 0.4.1

data/lib/omnis/query.rb

@@ -4,7 +4,7 @@ module Omnis
   module Query
 
     class Param
-      attr_reader :name, :operator
+      attr_reader :name, :operator, :opts
       def initialize(name, operator, opts={}, &extractor)
         # raise ArgumentError("operator must be a descendant of Omnis::Operators::NullOperator") unless operator.is_a? Omnis::Operators::NullOperator
         extractor ||= ->params { params[name] }
@@ -19,7 +19,8 @@ module Omnis
 
       # extracts the value for a param, using the extractor lamba or the default value
       def extract(params)
-        value = @extractor.(params) || default
+        value = @extractor.(params) if params.keys.include? name    # only run extractor if the param was in the request (params)
+        value ||= default                                           # if there is a default, apply it
         return value if value.is_a? Omnis::Operators::NullOperator
         return @operator.new(@name, value, @opts) unless value.nil?
       end

data/lib/omnis/version.rb

@@ -1,3 +1,3 @@
 module Omnis
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/lib/omnis/mongo_query_spec.rb

@@ -49,17 +49,26 @@ describe Omnis::MongoQuery do
 
       fields %w[ref_anixe status]
       # if this param is in the query, fetch the field "ref_customer"
-      param :ref_customer, Matches, :field => "ref_customer"
+      param :ref_customer, Matches, :field => 'ref_customer'
+      param(:date_booked,  Between, :field => 'date_booked') {|src| Between.new(:date_booked, Time.at(0)..Time.at(1), :field => 'date_booked') }
     end
 
     it 'extra field not requested when param not present' do
-      t = TestFieldsQuery.new({})
-      t.to_mongo.opts.should == { :limit => 20, :skip => 0, :fields => ['ref_anixe', 'status']}
+      m = TestFieldsQuery.new({}).to_mongo
+      m.selector.should == {}
+      m.opts.should == { :limit => 20, :skip => 0, :fields => ['ref_anixe', 'status']}
     end
 
     it 'extra field is requested when param is in request' do
-      t = TestFieldsQuery.new({"ref_customer" => "123"})
-      t.to_mongo.opts.should == { :limit => 20, :skip => 0, :fields => ['ref_anixe', 'status', 'ref_customer']}
+      m = TestFieldsQuery.new({"ref_customer" => "123"}).to_mongo
+      m.selector.should == {:ref_customer => /123/i}
+      m.opts.should == { :limit => 20, :skip => 0, :fields => ['ref_anixe', 'status', 'ref_customer']}
+    end
+
+    it 'works with lambdas, but the lambda must provide the opts!' do
+      m = TestFieldsQuery.new({"date_booked" => "1NOV"}).to_mongo
+      m.selector
+      m.opts.should == { :limit => 20, :skip => 0, :fields => ['ref_anixe', 'status', 'date_booked']}
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnis
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport