recordselect 3.8.3 → 3.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a314fc5f315d44bd180f8ad7012d4dea78aa340
-  data.tar.gz: 4ef4a5f928851ff3d0c932f54f55bc171195513c
+  metadata.gz: e3ac1254baf6c4a25347fbe76a7a4380769038a0
+  data.tar.gz: c45df6652c0984e1e32209bb75874f433e9d80a0
 SHA512:
-  metadata.gz: 70f9bf5371ded6366b81fc7493ea47769237625f013ba40fbb1385acba9b20eeb45baf2020a4e575a24f17921a3ea3fcaee1ecf6d2120a0eb25f915dec1fea0f
-  data.tar.gz: fc625d76a9060475b527a06ef1e320fb948be7a70366c0391ffebaaefcb96c8e0b57857a04cb685122569df2b065494b5e44eb4d4a6c489dd848ca8a79548d0f
+  metadata.gz: 194ace026298bd24c2b0340ad0f9a887427ef1f33958c1ce652f83a08b5bb8b8494aa23b6979a2dc9959484f6b4fb5036c4d3f6e544aed587fe82db91ea93a31
+  data.tar.gz: 02f1e8f4c554a844d5fd44099d1ab8afc778c3531814a74bfa0802d3f3de9c4808186f66c2da86a74350b153c28b421835337c3bf313bd9985bdf9fbc496c737

data/lib/record_select/actions.rb

@@ -5,12 +5,14 @@ module RecordSelect
     def browse
       conditions = record_select_conditions
       user_includes = record_select_includes
-      klass = record_select_model.where(conditions).includes(user_includes)
-      klass = klass.references(user_includes) if Rails::VERSION::MAJOR >= 4 && user_includes.present?
-      @count = klass.count if record_select_config.pagination?
+      query = conditions.inject(record_select_model.includes(user_includes)) do |query, cond|
+        query.where(cond)
+      end
+      query = query.references(user_includes) if Rails::VERSION::MAJOR >= 4 && user_includes.present?
+      @count = query.count if record_select_config.pagination?
       @count = @count.length if @count.is_a? Hash
       pager = ::Paginator.new(@count, record_select_config.per_page) do |offset, per_page|
-        search = record_select_select ? klass.select(record_select_select) : klass
+        search = record_select_select ? query.select(record_select_select) : query
         search = search.limit(per_page).offset(offset) if record_select_config.pagination?
         search.includes(record_select_config.include).order(record_select_config.order_by).to_a
       end

data/lib/record_select/conditions.rb

@@ -9,11 +9,11 @@ module RecordSelect
     def record_select_conditions
       conditions = []
 
-      merge_conditions(
+      [
         record_select_conditions_from_search,
-        record_select_conditions_from_params,
+        *record_select_conditions_from_params,
         record_select_conditions_from_controller
-      )
+      ].compact
     end
 
     # an override method.
@@ -59,13 +59,10 @@ module RecordSelect
 
     # generate conditions from the url parameters (e.g. users/browse?group_id=5)
     def record_select_conditions_from_params
-      conditions = nil
+      conditions = []
       params.each do |field, value|
         next unless column = record_select_config.model.columns_hash[field]
-        conditions = merge_conditions(
-          conditions,
-          record_select_condition_for_column(column, value)
-        )
+        conditions << record_select_condition_for_column(column, value)
       end
       conditions
     end
@@ -86,21 +83,16 @@ module RecordSelect
     # generates an SQL condition for the given column/value
     def record_select_condition_for_column(column, value)
       model = record_select_config.model
-      column_name = model.quoted_table_name + '.' + model.connection.quote_column_name(column.name)
       if value.is_a? Array
         {column.name => value}
       elsif value.blank? and column.null
-        "#{column_name} IS NULL"
+        {column.name => nil}
       elsif [:string, :text].include? column.type
+        column_name = model.quoted_table_name + '.' + model.connection.quote_column_name(column.name)
         ["LOWER(#{column_name}) LIKE ?", value]
       else
-        ["#{column_name} = ?", record_select_type_cast(column, value)]
+        {column.name => record_select_type_cast(column, value)}
       end
     end
-
-    def merge_conditions(*conditions) #:nodoc:
-      c = conditions.find_all {|c| not c.nil? and not c.empty? }
-      c.empty? ? nil : c.collect{|c| record_select_config.model.send(:sanitize_sql, c)}.join(' AND ')
-    end
   end
 end

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 3
     MINOR = 8
-    PATCH = 3
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.6
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler