mongoid_query_string_interface 0.6.2 → 0.7.0

data/Gemfile.lock

@@ -1,38 +1,40 @@
 PATH
   remote: .
   specs:
-    mongoid_query_string_interface (0.6.2)
+    mongoid_query_string_interface (0.7.0)
       mongoid (>= 2.0.2)
-      query_string_interface (>= 0.1.0)
+      query_string_interface (>= 0.5.0)
       will_paginate (~> 3.0.pre2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     bson (1.3.1)
     bson_ext (1.3.1)
-    builder (2.1.2)
+    builder (3.0.0)
     columnize (0.3.4)
     database_cleaner (0.6.7)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
+    i18n (0.6.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.0.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+    mongoid (2.4.11)
+      activemodel (~> 3.1)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-    query_string_interface (0.1.0)
+    multi_json (1.3.6)
+    query_string_interface (0.5.0)
       activesupport (>= 3.0.0)
     rake (0.8.7)
     rbx-require-relative (0.0.5)
@@ -62,8 +64,8 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
-    tzinfo (0.3.29)
-    will_paginate (3.0.pre2)
+    tzinfo (0.3.33)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby

data/lib/mongoid/query_string_interface.rb

@@ -36,7 +36,8 @@ module Mongoid
     end
 
     def filter_only_by(params={})
-      where(filtering_options(hash_with_indifferent_access(params)))
+      params = hash_with_indifferent_access(params)
+      where(filtering_options(params)).filter_fields_by(params)
     end
 
     def paginated_collection_with_filter_by(params={})
@@ -48,6 +49,17 @@ module Mongoid
       build_pager_from(collection)
     end
 
+    def filter_fields_by(params)
+      params = field_filtering_options(hash_with_indifferent_access(params))
+      params.present? ? send(*params.first) : criteria
+    end
+
+    def field_filtering_options(params)
+      super.tap do |hash|
+        hash[:without] = hash.delete(:except) if hash.present?
+      end
+    end
+
     protected
       def sorting_options(options)
         super(options).map do |sort_option|

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_query_string_interface
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000Z
+date: 2012-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: query_string_interface
-  requirement: &2160890640 !ruby/object:Gem::Requirement
+  requirement: &2152719460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160890640
+  version_requirements: *2152719460
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2160890160 !ruby/object:Gem::Requirement
+  requirement: &2152718980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.pre2
   type: :runtime
   prerelease: false
-  version_requirements: *2160890160
+  version_requirements: *2152718980
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2160889680 !ruby/object:Gem::Requirement
+  requirement: &2152718500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160889680
+  version_requirements: *2152718500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160889200 !ruby/object:Gem::Requirement
+  requirement: &2152718020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2160889200
+  version_requirements: *2152718020
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2160918400 !ruby/object:Gem::Requirement
+  requirement: &2152717540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2160918400
+  version_requirements: *2152717540
 description: Gives a method that can parse query string parameters into a set of criterias
   that Mongoid can use to perform actual queries in MongoDB databases for a given
   model.