effective_resources 2.25.1 → 2.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8e2f232cb2846c02881e5a0eec15317bc98606f8b4ae465b6e9e963941c14b7
-  data.tar.gz: 5286d8fb1ef7a2341198fa035763a76698abc4b986cf600090adf9a5cb8a6910
+  metadata.gz: 109b49a58f8065098757d3ddcc03b01598cf088c05c635134f359aab00eaa2a3
+  data.tar.gz: 80dc0801db689a5abeebc2d1e2c7d08b726f20dc8b3731993a435e119b138cfa
 SHA512:
-  metadata.gz: 40880492e9a18d236c2e5befb9f10386adf4944975663fc995674f0171d68956daf6bd3e429ab6b709eff7b13fe5d1e1032ce06e62c5ce120f21a1a72850c98e
-  data.tar.gz: d45cc3fbc19991172f47bd08000ef455dfec65022eb8630fb907ecb013b64e031a6d1677f4d5323b057f1b399479842fc1c146a259a0abc3a4e9a7eaf083c3a4
+  metadata.gz: e2eb4ae03a4ee413ffe9ecae44679e1c12dc45167f1515a971cd20bdcfb773dac587cba1cbf31bfa38205b447b4fc8d00a9842b26aaf94cb58be4ce91cbf10a1
+  data.tar.gz: 99fdfe50066864c0618a460ab4c5e78fb97f66daf37ac7f46323781e2c7bc6a99f49e562002c71a0fd9749ea443b1f0effff1deb9142082c4f76ac5e87d6ad68

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -109,7 +109,6 @@ module Effective
           format.html { }
           format.js { render('show', formats: :js) }
         end
-
       end
 
       def edit
@@ -126,7 +125,6 @@ module Effective
           format.html { }
           format.js { render('edit', formats: :js) }
         end
-
       end
 
       def update

data/app/controllers/concerns/effective/crud_controller.rb

@@ -14,6 +14,11 @@ module Effective
     included do
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
       layout -> { resource_layout }
+
+      # For effective_logging acts_as_trackable
+      after_action(only: [:show], if: -> { resource.present? && resource.class.try(:acts_as_trackable?) }) do
+        resource.track!(user: try(:current_user), details: request.params)
+      end
     end
 
     module ClassMethods

data/app/models/concerns/acts_as_published.rb

@@ -0,0 +1,66 @@
+#
+# ActsAsPublished
+#
+# Adds published and draft scopes. Adds published? and draft? methods
+#
+# add_column :things, :published_start_at, :datetime
+# add_column :things, :published_end_at, :datetime
+#
+module ActsAsPublished
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_published(options = nil)
+      include ::ActsAsPublished
+    end
+  end
+
+  module ClassMethods
+    def acts_as_published?; true; end
+  end
+
+  included do
+    attr_writer :save_as_draft
+
+    before_validation do
+      assign_attributes(published_start_at: nil, published_end_at: nil) if EffectiveResources.truthy?(@save_as_draft)
+    end
+
+    validate(if: -> { published_start_at.present? && published_end_at.present? }) do
+      errors.add(:published_end_at, 'must be after the published start date') if published_end_at <= published_start_at
+    end
+
+    scope :draft, -> { 
+      where(published_start_at: nil)
+        .or(where(arel_table[:published_start_at].gt(Time.zone.now)))
+        .or(where(arel_table[:published_end_at].lteq(Time.zone.now)))
+    }
+
+    scope :published, -> {
+      (try(:unarchived) || all)
+      .where(arel_table[:published_start_at].lteq(Time.zone.now))
+      .where(published_end_at: nil).or(where(arel_table[:published_end_at].gteq(Time.zone.now)))
+     }
+  end
+
+  # Instance Methods
+  def published?
+    return false if published_start_at.blank? || published_start_at > Time.zone.now
+    return false if published_end_at.present? && published_end_at <= Time.zone.now
+    return false if try(:archived?)
+
+    true
+  end
+
+  def draft?
+    return true if published_start_at.blank? || published_start_at > Time.zone.now
+    return true if published_end_at.present? && published_end_at <= Time.zone.now
+    false
+  end
+
+  # For the form
+  def save_as_draft
+    persisted? && published_start_at.blank? && published_end_at.blank?
+  end
+
+end

data/lib/effective_resources/engine.rb

@@ -29,6 +29,7 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsPaginable::Base)
+        ActiveRecord::Base.extend(ActsAsPublished::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
         ActiveRecord::Base.extend(ActsAsPurchasableWizard::Base)
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.25.1'.freeze
+  VERSION = '2.25.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.1
+  version: 2.25.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -203,6 +203,7 @@ files:
 - app/models/concerns/acts_as_email_form.rb
 - app/models/concerns/acts_as_email_notification.rb
 - app/models/concerns/acts_as_paginable.rb
+- app/models/concerns/acts_as_published.rb
 - app/models/concerns/acts_as_purchasable_wizard.rb
 - app/models/concerns/acts_as_slugged.rb
 - app/models/concerns/acts_as_statused.rb