effective_resources 2.25.2 → 2.25.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c0b2966934b0403a5c4a15976201652884c57d6e5a32d5b33e063a19de9bc2
-  data.tar.gz: d939422e59047f0f710ccb58119e6bba750a4bdc8e9c2252a6f2474b624d5032
+  metadata.gz: 2967108f64775ddd3de0531e80509fe3f4c4b369fdb3b2b59a96103b2082e516
+  data.tar.gz: 1a53e6935d666e80676aed79910447929aad82d45dad2430a82093d85af70056
 SHA512:
-  metadata.gz: 80a671039f17f7d3f10908051fa1476b63b809c258e41ac3ccce2554ae047f3dc7a55432c18218203385b695981326e708500b990f5e6b6f3392bf314cdf162b
-  data.tar.gz: 918a532aa474e74c277390644f4179dccfdf607fee10157f057a2e56b5be9b15623bed8901be944c8fb862b6a69c9e71426b52970ef7f919c377fd0f81614eec
+  metadata.gz: f3e0d13115d6e1acdea84ee206a3bfc31fe3885b2f6384332a36f1bedeaf33f85f5066c8e364396998a627249df7d99ba3495c0d14117139ad9d6db0e09d76eb
+  data.tar.gz: e35ddd7ed8a8dcfce32a96a205a4aa9b8ca050b64d6accc3b7e4f134c9e7c04dd728a84426671f72afa3f2512d38f9f752b9e043a7c01efc7b19aa3c09a20e23

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/app/models/concerns/acts_as_wizard.rb

@@ -82,6 +82,11 @@ module ActsAsWizard
       wizard_step_keys
     end
 
+    # :submitted
+    def last_wizard_step
+      all_steps.last
+    end
+
     def completed_steps
       wizard_steps.keys
     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.2'.freeze
+  VERSION = '2.25.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.2
+  version: 2.25.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-02 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