effective_resources 2.7.20 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a66ec32a1b5da770279f4f21a9ae8cf42f2bd5f96250510cd9894c36e7965b
-  data.tar.gz: b6ffacf0caef1d406988c4d51bf2a622bce4ff5cec1171e77a622c056b757bac
+  metadata.gz: 016f2e6e705dc75e0ea58ff2e95f9ce5553122d82a1dd0280ccc327a284b4e93
+  data.tar.gz: eedc423555203163a7c9d3674729c3ab56dd1d69d448d289fef0a0c06bbad3d0
 SHA512:
-  metadata.gz: 8334b1b3e37bfb79707a65529efed084d3f43d901b3c21cdb0cfc377a6eb152d759bb3a2168525d503a8cdfa2836e1205b23b29c39c6128df6efe4885c0cdee1
-  data.tar.gz: 11126e1402eadcad2f2bce9e6082075762f4b51034635a4ece7e4fb368784b93c69d834e877a95f1a55ac1a9714de4b5df0eefc5a38949e77c8e576b2fb8456d
+  metadata.gz: 296abe054bdc8e96495d75a2172187b89c093311a5819f7df89c13af90298611673285cec429d96c1a45da88b15e65f0c54e3f0108193f8fdff12117edbf611d
+  data.tar.gz: 6278969a0aefe37f56bae5c036e944ab0d22c7c8142a09127cbfa9b1448be49fd9568b1bb7185db7896f985e85d0594b4864aaa4994d50ba1e0ab2d5590f4326

data/app/models/concerns/acts_as_paginable.rb

@@ -0,0 +1,36 @@
+#
+# ActsAsPaginable
+#
+# Adds the a `paginate` scope to a model for `limit` and `offset` pagination.
+#
+module ActsAsPaginable
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_paginable(options = nil)
+      include ::ActsAsPaginable
+    end
+  end
+
+  module ClassMethods
+    def acts_as_paginable?; true; end
+  end
+
+  included do
+    def self.default_per_page=(per_page)
+      @default_per_page = per_page
+    end
+
+    def self.default_per_page
+      @default_per_page || 12 # because we often do 3 columns of 4 elements layouts
+    end
+
+    scope :paginate, -> (page: nil, per_page: nil) {
+      per_page = (per_page || default_per_page).to_i
+      page = (page || 1).to_i
+      offset = [(page - 1), 0].max * (per_page).to_i
+
+      all.limit(per_page).offset(offset)
+    }
+  end
+end

data/app/models/effective/resources/relation.rb

@@ -413,29 +413,25 @@ module Effective
           join = ' AND '
         else
           terms = value.split(' ')
-          join = ' OR '
+          join = ' AND '
         end
 
         terms = (terms - [nil, '', ' ']).map(&:strip)
         columns = Array(columns)
         fuzzy = true if fuzzy.nil?
 
-        # Do the search
-        searched = collection
-
-        terms.each do |term|
-          conditions = (
-            if fuzzy
-              columns.map { |name| "#{sql_column(name)} #{ilike} :fuzzy" }
-            else
-              columns.map { |name| "#{sql_column(name)} = :term" }
-            end
-          ).join(join)
-
-          searched = collection.where(conditions, fuzzy: "%#{term}%", term: term)
+        terms = terms.inject({}) do |hash, term|
+          hash["term_#{hash.length}".to_sym] = (fuzzy ? "%#{term}%" : term); hash
         end
 
-        searched
+        # Do any of these columns contain all the terms?
+        conditions = columns.map do |name|
+          keys = terms.keys.map { |key| (fuzzy ? "#{sql_column(name)} #{ilike} :#{key}" : "#{sql_column(name)} = :#{key}") }
+          '(' + keys.join(' AND ') + ')'
+        end.join(' OR ')
+
+        # Do the search
+       collection.where(conditions, terms)
       end
 
       def order_by_associated_conditions(association, sort: nil, direction: :asc, limit: nil)

data/lib/effective_resources/engine.rb

@@ -29,8 +29,10 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsTokened::Base)
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
+        ActiveRecord::Base.extend(ActsAsPaginable::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
         ActiveRecord::Base.extend(ActsAsPurchasableWizard::Base)
+
         ActiveRecord::Base.extend(HasManyPurgable::Base)
         ActiveRecord::Base.extend(HasManyRichTexts::Base)
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.20'.freeze
+  VERSION = '2.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.20
+  version: 2.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,6 +159,7 @@ files:
 - app/mailers/concerns/effective_mailer.rb
 - app/models/concerns/acts_as_archived.rb
 - app/models/concerns/acts_as_email_form.rb
+- app/models/concerns/acts_as_paginable.rb
 - app/models/concerns/acts_as_purchasable_wizard.rb
 - app/models/concerns/acts_as_slugged.rb
 - app/models/concerns/acts_as_statused.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.