effective_resources 2.8.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750ef0ae89d5b6437e046369b0dc46811abfa26ace4559e9448b190c1e255430
-  data.tar.gz: 7ad14d23604419ba975ab11addf2912f7fbcefe40fdaa9764c7782a2c992cc3d
+  metadata.gz: '0140383360a1897a1b21a4a5897f5e61d9099210ab1fca6fe8e93159c7bdc999'
+  data.tar.gz: 33819637928fe7fdb8e75df61f79526228652142fc76ab09222bed6ed9f91e6a
 SHA512:
-  metadata.gz: 6b79973ce6e33a95e792921ecf6cc548fa144b9fb2aa5b550e531f1d7aa613d00e39aa301b71ab802c0e1506c7f31dba6344925e188f2efd3f78a0e071e24efa
-  data.tar.gz: 4bd4b421e3e74108cd95a84cb3283f0740aab2f890532901f5cf0e52b4d4680383c75351612e6d9b59b5cd6f546e844e5d8120ea13c34cc1960cabd503670d6b
+  metadata.gz: 490636b3efc23c0406833448528f2e8029d9d707a49db92309eda2d65fff6be90d7c31c9d835827866d953b9c18a13781aeb11b43f606c411b051037f0c6f1ed
+  data.tar.gz: 1dc0516ce102fac154bfc374deee17678f4d4f33906a2e90bf96e175d5af0573faff5800749c5fff3f198110a3ef142b3fdb1b341e21aef3656a1388e6c4352b

data/README.md

@@ -213,6 +213,19 @@ Just put another `app/views/posts/index.html.haml` in the posts directory to ove
 
 Sure why not. These don't really fit into my code base anywhere else.
 
+### acts_as_paginable
+
+Quickly adds a `paginate` scope to your model that can then be used in your views and also integrates well with `effective_bootstrap`. The pagination method is `Limit and Offset`.
+
+```ruby
+# Given any model you just need to call it like
+class Thing < ApplicationRecord
+  acts_as_paginable
+end
+
+# Now you can use it like:
+Thing.all.paginate(page: 1, per_page: 5)
+```
 ### acts_as_tokened
 
 Quickly adds rails 5 `has_secure_token` to your model, along with some `Post.find()` enhancements to work with tokens instead of IDs.

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

@@ -313,11 +313,10 @@ module Effective
               )
 
               if as == :date
-                term = term.to_date
-                end_at = end_at.to_date
+                relation.where("#{sql_column} >= ? AND #{sql_column} < ?", term.to_date, (end_at + 1.day).to_date)
+              else
+                relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
               end
-
-              relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
             elsif value.respond_to?(:strftime) && operation == :eq
               relation.where(attribute.matches(value))
             end
@@ -347,7 +346,7 @@ module Effective
 
         case operation
           when :eq then relation.where("#{sql_column} = ?", term)
-          when :matches then search_columns_by_ilike_term(relation, term, columns: name)
+          when :matches then search_columns_by_ilike_term(relation, term, columns: (sql_column.presence || name))
           when :not_eq then relation.where(attribute.not_eq(term))
           when :does_not_match then relation.where(attribute.does_not_match("%#{term}%"))
           when :starts_with then relation.where(attribute.matches("#{term}%"))
@@ -426,7 +425,10 @@ module Effective
 
         # 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}") }
+          column = (name.to_s.include?('.') ? name : sql_column(name))
+          raise("expected an sql column for #{name}") if column.blank?
+
+          keys = terms.keys.map { |key| (fuzzy ? "#{column} #{ilike} :#{key}" : "#{column} = :#{key}") }
           '(' + keys.join(' AND ') + ')'
         end.join(' OR ')
 

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.8.0'.freeze
+  VERSION = '2.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  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'
 description: Make any controller an effective resource controller.
 email:
 - info@codeandeffect.com
@@ -159,6 +187,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 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.