mongoid_query_string_interface 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid_query_string_interface (0.4.0)
+    mongoid_query_string_interface (0.4.1)
       json (>= 1.4.6)
       mongoid (~> 2.0.0.rc)
 

data/lib/mongoid/helpers.rb

@@ -9,6 +9,16 @@ module Mongoid
         hash = hash_with_indifferent_access(hash_with_attributes_to_replace)
         hash.has_key?(attribute) ? hash[attribute] : attribute
       end
+
+      def replaced_attribute_name(attribute, hash_with_attributes_to_replace)
+        attribute = replace_attribute(attribute, hash_with_attributes_to_replace)
+        attribute.is_a?(Hash) ? attribute[:to] : attribute
+      end
+
+      def replaced_attribute_value(attribute, value, hash_with_attributes_to_replace, raw_params)
+        attribute = replace_attribute(attribute, hash_with_attributes_to_replace)
+        attribute.is_a?(Hash) ? attribute[:convert_value_to].call(value, raw_params) : value
+      end
     end
   end
 end

data/lib/mongoid/parsers/filter_parser.rb

@@ -22,14 +22,15 @@ module Mongoid
           Mongoid::QueryStringInterface::Parsers::BooleanAndNilParser.new
         ]
 
-        def initialize(raw_attribute, raw_value, attributes_to_replace={})
+        def initialize(raw_attribute, raw_value, attributes_to_replace={}, raw_params={})
           @raw_attribute = raw_attribute
           @raw_value = raw_value
           @attributes_to_replace = attributes_to_replace
+          @raw_params = raw_params
         end
 
         def attribute
-          @attribute ||= replace_attribute(parsed_attribute, @attributes_to_replace).to_s
+          @attribute ||= replaced_attribute_name(parsed_attribute, @attributes_to_replace).to_s
         end
 
         def value
@@ -90,10 +91,10 @@ module Mongoid
               if or_attribute?
                 parsed_json_value
               else
-                { operator => parsed_value }
+                { operator => replaced_attribute_value(parsed_attribute, parsed_value, @attributes_to_replace, @raw_params) }
               end
             else
-              parsed_value
+              replaced_attribute_value(parsed_attribute, parsed_value, @attributes_to_replace, @raw_params)
             end
           end
 
@@ -123,7 +124,7 @@ module Mongoid
             raise "$or query filters must be given as an array of hashes" unless valid_or_filters?(raw_or_data)
 
             raw_or_data.map do |filters|
-              FiltersParser.new(filters, {}, @attributes_to_replace)
+              FiltersParser.new(filters, {}, @attributes_to_replace, @raw_params)
             end
           end
 
@@ -146,6 +147,7 @@ module Mongoid
               "$#{$1}"
             end
           end
+
       end
     end
   end

data/lib/mongoid/parsers/filters_parser.rb

@@ -2,21 +2,29 @@ module Mongoid
   module QueryStringInterface
     module Parsers
       class FiltersParser
+        include Mongoid::QueryStringInterface::Helpers
+
         attr_reader :filters, :default_filters
 
-        def initialize(filters, default_filters={}, attributes_to_replace={})
+        def initialize(filters, default_filters={}, attributes_to_replace={}, raw_filters=nil)
           @filters = filters.with_indifferent_access
           @default_filters = default_filters.with_indifferent_access
           @attributes_to_replace = attributes_to_replace.with_indifferent_access
+          @raw_filters = raw_filters.nil? ? @filters : raw_filters.with_indifferent_access
         end
 
         def parse
-          default_filters.merge(parsed_filters)
+          result = default_filters.inject({}) do |result, item|
+            raw_attribute, raw_value = item
+            result[replaced_attribute_name(raw_attribute, @attributes_to_replace).to_s] = replaced_attribute_value(raw_attribute, raw_value, @attributes_to_replace, @raw_filters)
+            result
+          end
+          result.merge(parsed_filters)
         end
 
         def filter_parsers
           @filter_parsers ||= filters.map do |raw_attribute, raw_value|
-            FilterParser.new(raw_attribute, raw_value, @attributes_to_replace)
+            FilterParser.new(raw_attribute, raw_value, @attributes_to_replace, @raw_filters)
           end
         end
 

data/lib/mongoid/query_string_interface.rb

@@ -89,7 +89,7 @@ module Mongoid
       end
 
       def sorting_options(options)
-        parse_order_by(options) || default_sorting_options
+        parse_order_by(options) || default_sorting_options.map { |field| sorting_operator_for(field) }
       end
 
       def only_filtering(options)
@@ -105,7 +105,9 @@ module Mongoid
       end
 
       def sorting_operator_for(field)
-        if match = field.match(/(.*)\.(#{SORTING_OPERATORS.join('|')})/)
+        if field.is_a?(Mongoid::Criterion::Complex)
+          replace_attribute(field.key, sorting_attributes_to_replace).to_sym.send(field.operator)
+        elsif match = field.match(/(.*)\.(#{SORTING_OPERATORS.join('|')})/)
           replace_attribute(match[1], sorting_attributes_to_replace).to_sym.send(match[2])
         else
           replace_attribute(field, sorting_attributes_to_replace).to_sym.asc

data/lib/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid #:nodoc
   module QueryStringInterface #:nodoc
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Vicente Mundim
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 -03:00
+date: 2011-06-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency