recordselect_vho 3.1.104 → 4.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDMzMTM3NjExYzc5Y2E1YjZmNGJhYWRkNjZjZGQyYjQ4YmNmY2ZjMA==
-  data.tar.gz: !binary |-
-    MWU0ZWIwMzhhMWQ1NWI3ZmI5N2M5ZTkxNDFhNjg5NGFjM2Y1M2Q4ZQ==
+SHA1:
+  metadata.gz: c95ec98968bc6a97a6b6e59bee3bbb66e15ae2c2
+  data.tar.gz: 6386c27b2d4720bea97f31ea58c587466cdf1cd7
 SHA512:
-  metadata.gz: !binary |-
-    YTA2ZWViZTgxNzA4MTYzM2ExOGM3YWYyNmU1MTVjNjFiZjdiZGNkMWZiYmNm
-    OWQxYmNlNWEwZGFjNjJmMThlOWJkNzI0N2JlYzNiMzY0MDljNzMyY2I3MzRk
-    M2QyZTI0ODgyZGZmODE1YWNkNmMzMzFjYmJmNDE3YTg4YTU1OWI=
-  data.tar.gz: !binary |-
-    MTM1ODNmNjE5MWNhOWU5ZWY0YjhmOTliZjU0MDRlMWFkNjAzY2QzY2U1NWVk
-    MTY0M2I1MjU4NjYzNWJjNTIwOTg5MjVjYzQ4ODc1ZDViMzIwMmZmYTJhZWYz
-    OTBhOTg4MjJjNWZjMzBiNzdjODJlZDVlNGQ2MDljZjBjMjdhNDA=
+  metadata.gz: c818a3155e5e4e1e2f5bfd2b7831b3bef65628d29e0db55337298b0bcefef311e2f5bed64dff18d0fec8d3e65e3d27b6387f0667a16aa10af043cb9ca9dd991c
+  data.tar.gz: 3409be184f36213d4e218062a5a19356eddb40825830a864b592c9c1dc4af0ca7ee397578303aac418e60c57381e9999dcb7cbed42ab333f2bfe7ad248a2b59f

data/lib/record_select/actions.rb

@@ -5,15 +5,15 @@ module RecordSelect
     def browse
       conditions = record_select_conditions
       klass = record_select_model
-      @count = klass.count(:conditions => conditions, :include => record_select_includes)
+      @count = append_to_query(klass, {:where => conditions, :includes => record_select_includes}).count
       @count = @count.length if @count.is_a? ActiveSupport::OrderedHash
       pager = ::Paginator.new(@count, record_select_config.per_page) do |offset, per_page|
-        klass.find(:all, :offset => offset,
+        append_to_query(klass, {:offset => offset,
                          :select => record_select_select||"*",
-                         :include => [record_select_includes, record_select_config.include].flatten.compact,
+                         :includes => [record_select_includes, record_select_config.include].flatten.compact,
                          :limit => per_page,
-                         :conditions => conditions,
-                         :order => record_select_config.order_by)
+                         :where => conditions,
+                         :reorder => record_select_config.order_by}).to_a
       end
       @page = pager.page(params[:page] || 1)
 
@@ -60,6 +60,13 @@ module RecordSelect
       if block_given? then yield options else render options end
     end
 
+    def append_to_query(query, options)
+      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from
+      options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
+        query.send((k.to_sym), v)
+      end
+    end
+
     private
 
     def record_select_views_path

data/lib/record_select/version.rb

@@ -1,8 +1,8 @@
 module RecordSelect
   module Version
-    MAJOR = 3
-    MINOR = 1
-    PATCH = 104
+    MAJOR = 4
+    MINOR = 0
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect_vho
 version: !ruby/object:Gem::Version
-  version: 3.1.104
+  version: 4.0.0
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,50 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
 description: RecordSelect is a Rails widget to help you pick one record out of many.
   I designed it as a more usable and performant alternative to generating a massive
   dropdown list
@@ -101,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RecordSelect widget as a replacement for massive drop down lists