effective_resources 2.8.1 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016f2e6e705dc75e0ea58ff2e95f9ce5553122d82a1dd0280ccc327a284b4e93
-  data.tar.gz: eedc423555203163a7c9d3674729c3ab56dd1d69d448d289fef0a0c06bbad3d0
+  metadata.gz: a3306eaeb2757f8d71427567e38353c13c2ff2b7ebc9bfd4fa59dbfe24af3ed9
+  data.tar.gz: 561544b09df06f7210d0dd07a48547ac3b2d8661654fb0129e92f7ad413a4a56
 SHA512:
-  metadata.gz: 296abe054bdc8e96495d75a2172187b89c093311a5819f7df89c13af90298611673285cec429d96c1a45da88b15e65f0c54e3f0108193f8fdff12117edbf611d
-  data.tar.gz: 6278969a0aefe37f56bae5c036e944ab0d22c7c8142a09127cbfa9b1448be49fd9568b1bb7185db7896f985e85d0594b4864aaa4994d50ba1e0ab2d5590f4326
+  metadata.gz: e7ca40c7ee7b3aa67659a45f62ecc86bd34e1ca3454f1baf0c601cd4437b960064ad9b58645dca6cfac931e327e86cbb39875dcda44eff32459caa7c94d6649c
+  data.tar.gz: 1489d7f93a9a8429f4cabe58c113864e7193f681feb6fc012ed2788d79b9be7f0ced3e12ae3622b30fd7beb122716249e987705f0b981f3f5df8b09e9c909a59

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_purchasable_wizard.rb

@@ -72,8 +72,10 @@ module ActsAsPurchasableWizard
     # From Billing Step
     order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
+    # This will update all order items to match the prices from their
+    order.try(:update_purchasable_attributes)
+
     # Important to add/remove anything
-    # This will update the prices, but the purchasables must be persisted
     order.save!
 
     order

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/app/validators/content_type_validator.rb

@@ -0,0 +1,50 @@
+#
+# Custom validator for attachments' content types
+#
+# @example
+#
+#   -> validates :image, content_type: :image
+#   -> validates :image, content_type: [:jpg, :webp]
+#   -> validates :image, content_type: [:image, :pdf]
+#   -> validates :image, content_type: { in: :image, message: 'must be a valid image' }
+#
+class ContentTypeValidator < ActiveModel::EachValidator
+  EXPANSIONS = {
+    image:        %i[png jpeg jpg jpe pjpeg gif bmp svg webp],
+    document:     %i[text txt docx doc xml pdf csv],
+    calendar:     %i[ics],
+    spreadsheet:  %i[xlsx xls],
+    video:        %i[mpeg mpg mp3 m4a mpg4 aac webm mp4 m4v],
+  }.freeze
+
+  def validate_each(record, attribute, value)
+    # Support for optional attachments
+    return unless value.present? && value.attached?
+
+    keys   = EXPANSIONS.keys
+    values = EXPANSIONS.values.flatten
+    options = instance_values["options"]
+    message = options.try(:[], :message) || "must have a valid content type"
+    types = options[:with] || options[:in]
+
+    # Ensure array and ensure symbols
+    types = [types].flatten.compact.map(&:to_sym)
+
+    allowed_types = []
+    types.each do |types|
+      if types.in?(keys)
+        allowed_types << EXPANSIONS[types]
+      elsif types.in?(values)
+        allowed_types << types
+      else
+        raise("unknown content_type types: #{types}")
+      end
+    end
+    allowed_types = allowed_types.flatten.map(&:to_sym).uniq
+
+    unless value.filename.extension.to_sym.in?(allowed_types)
+      record.errors.add(attribute, message)
+    end
+
+  end
+end

data/app/validators/size_validator.rb

@@ -0,0 +1,23 @@
+#
+# Custom validator for file sizes
+#
+# @example
+#
+#   -> validates :image, size: { less_than: 2.megabytes }
+#   -> validates :image, size: { less_than: 2.megabytes, message: 'is too large, please upload a file smaller than 2MB' }
+#
+class SizeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return unless value.present? && value.attached?
+
+    options = instance_values["options"]
+
+    max_size = options.try(:[], :less_than) || 2.megabytes
+    message = options.try(:[], :message) || "is too large, please upload a file smaller than #{max_size / 1.megabyte}MB"
+
+    if value.blob.byte_size > max_size
+      record.errors.add(attribute, message)
+    end
+
+  end
+end

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-26 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
@@ -195,6 +223,8 @@ files:
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
 - app/models/effective/resources/tenants.rb
+- app/validators/content_type_validator.rb
+- app/validators/size_validator.rb
 - app/views/application/_flash.html.haml
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb
@@ -244,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Make any controller an effective resource controller.