omnis 0.6.1 → 0.6.3

data/lib/omnis/mongo_query.rb

@@ -30,16 +30,19 @@ module Omnis
     module InstanceMethods
       include Omnis::Operators
 
+      attr_reader :extracted_operators
+
       def to_mongo
-        extracted_params = extract
-        OpenStruct.new({ :selector => mongo_selector(extracted_params),
-                         :opts     => mongo_opts(extracted_params)})
+        extracted_operators = extract
+        OpenStruct.new({ :selector    => mongo_selector(extracted_operators),
+                         :opts        => mongo_opts(extracted_operators),
+                         :param_names => extracted_param_names(extracted_operators)})
       end
 
       private
       def page
         return 0 unless @input_params.has_key? page_param_name
-        page_num = @input_params[page_param_name].to_i - 1
+        page_num = @input_params[page_param_name].to_i
         return 0 if page_num < 0
         return page_num
       end
@@ -65,16 +68,20 @@ module Omnis
         end
       end
 
-      def mongo_selector(extracted_params)
-        Hash[extracted_params.map { |operator| [operator.key, mongo_operator(operator)] }]
+      def mongo_selector(extracted_operators)
+        Hash[extracted_operators.map { |operator| [operator.key, mongo_operator(operator)] }]
       end
 
-      def mongo_opts(extracted_params)
-        params_with_extra_fields = extracted_params.collect(&:opts).select {|e| e.has_key? :field}
+      def mongo_opts(extracted_operators)
+        params_with_extra_fields = extracted_operators.collect(&:opts).select {|e| e.has_key? :field}
         extra_fields = params_with_extra_fields.map {|e| e[:field]}
         fields = self.class.field_list + extra_fields
         { :limit => items_per_page, :skip => skip, :fields => fields }
       end
+
+      def extracted_param_names(extracted_operators)
+        extracted_operators.map {|e| e.opts[:param_name] }
+      end
     end
   end
 end

data/lib/omnis/query.rb

@@ -66,6 +66,7 @@ module Omnis
       end
 
       # extracts operators from params
+      # add the name of the param to each extracted operators
       def extract
         self.class.params.map do |k,v|
           v.extract(@input_params).tap do |operator|

data/lib/omnis/version.rb

@@ -1,3 +1,3 @@
 module Omnis
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end

data/spec/lib/omnis/mongo_query_spec.rb

@@ -32,15 +32,16 @@ describe Omnis::MongoQuery do
   end
 
   it "works altogether" do
-    t = TestIntegrationQuery.new("ref_anixe" => "1abc", "contract" => "test", "product" => "HOT", "page" => "2", "date" => "2012-10-12")
-    t.to_mongo.selector.should == { :ref_anixe => "1abc",
-                                 :contract  => /test/i,
-                                 :product   => /^HOT/i,
-                                 :date      => { :'$gte' => Time.local(2012, 10, 12, 0, 0, 0), :'$lt' => Time.local(2012, 10, 12, 23, 59, 59, 999999.999)}
-                               }
+    m = TestIntegrationQuery.new("ref_anixe" => "1abc", "contract" => "test", "product" => "HOT", "page" => "2", "date" => "2012-10-12").to_mongo
+    m.selector.should == { :ref_anixe => "1abc",
+                           :contract  => /test/i,
+                            :product   => /^HOT/i,
+                            :date      => { :'$gte' => Time.local(2012, 10, 12, 0, 0, 0), :'$lt' => Time.local(2012, 10, 12, 23, 59, 59, 999999.999)}
+                          }
 
     fields = %w[ref_anixe contract description status product agency passengers date_status_modified services]
-    t.to_mongo.opts.should == { :limit => 20, :skip => 20, :fields => fields}
+    m.opts.should == { :limit => 20, :skip => 40, :fields => fields}
+    m.param_names.should == [:ref_anixe, :date, :contract, :product]
   end
 
   context 'fields' do
@@ -88,7 +89,7 @@ describe Omnis::MongoQuery do
     end
     it "page defaults and page given" do
       t = TestPageDefaultQuery.new({"page" => 2})
-      t.to_mongo.opts.should == { :limit => 20, :skip => 20, :fields => []}
+      t.to_mongo.opts.should == { :limit => 20, :skip => 40, :fields => []}
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnis
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors: