omnis 0.6.0 → 0.6.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/lib/omnis/query.rb

@@ -20,16 +20,21 @@ module Omnis
       # extracts the value for a param, using the extractor lamba or the default value
       def extract(params)
         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
+        value ||= default_value                                     # if there is a default, apply it
+        return value if extracted_result_is_an_operator? value
         return @operator.new(@name, value, @opts) unless value.nil?
       end
 
-      def default
+      def default_value
         expr = @opts[:default]
         return expr.call if expr.is_a? Proc
         return expr
       end
+
+      private
+      def extracted_result_is_an_operator?(value)
+        value.is_a? Omnis::Operators::NullOperator
+      end
     end
 
     def self.included(base)
@@ -60,13 +65,13 @@ module Omnis
         self.class.params.fetch(name).extract(@input_params)
       end
 
+      # extracts operators from params
       def extract
-        self.class.params.map { |k,v| v.extract(@input_params) }.compact
-      end
-
-      # a list of keys that have been requested
-      def keys
-        extract.map(&:key)
+        self.class.params.map do |k,v|
+          v.extract(@input_params).tap do |operator|
+            operator.opts[:param_name] = k unless operator.nil?
+          end
+        end.compact
       end
     end
   end

data/lib/omnis/version.rb

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

data/spec/lib/omnis/query_spec.rb

@@ -31,10 +31,11 @@ describe Omnis::Query do
     t.fetch(:ref_anixe).should == Omnis::Operators::Matches.new(:ref_anixe, "1abc")
   end
 
-  it "returns a list of keys that are requested" do
+  it "extracted operators contain the parameter name in the options" do
     t = TestBookingParams.new({"ref_anixe" => "1abc"})
-    t.keys.should == [:ref_anixe]
+    t.extract.map { |e| e.opts[:param_name] }.should == [:ref_anixe]
   end
+
   it "allows to extract all at once" do
     t = TestBookingParams.new({"ref_anixe" => "1abc"})
     t.extract.should == [Omnis::Operators::Matches.new(:ref_anixe, "1abc")]

metadata

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