effective_events 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd768661ad3e89bba50c413474a8694263ff5aa2262e9738ad78ac084089df38
-  data.tar.gz: 7eb9a1b2731464398a4fecc6a0435f94cd6718de3be594b07c88546be4e4ec9c
+  metadata.gz: ecc4eb59591259776d458e3fc0d6328ba9790249e07d1ad9409d95a4eb18871b
+  data.tar.gz: f85c9a53cfea60042cc37b81956186f6c2ad943ae3a2e2b001225176e9966ce4
 SHA512:
-  metadata.gz: a554cde3edc18545fda120d05dee465f2ceda1b9d1ceb6da2a8d7786a4b1850d77ebf4b468f355f353afb8a0bf14b4eb51eaf505af5ccb8381ccd49999091270
-  data.tar.gz: 63711c311814d5c9926be5651f14367f5c00e9adaeeaa7dcd8ce2542b8adc027c32dc27b77bc062dcc981e1901281fb9bd9205944f92755e5f177cf6827ca955
+  metadata.gz: 0c83eddb719ba7e8d32d91f4be0474d76a224ca6980bce71d12cbe60bfe737774eb3b20ac005c6a870777f96946bb6e212ddf9693e80ed152728c6a87e0cd5fe
+  data.tar.gz: 7d5809a96b668b4a2afd459e894216d6077a64e444dba188ec615030dda1a68d076f8759e017cb23424f38840c43be1833070fabc939b3330a5b43ade9475f14

data/app/datatables/admin/effective_events_datatable.rb

@@ -4,7 +4,7 @@ module Admin
       scope :all
       scope :registerable
       scope :published
-      scope :unpublished
+      scope :draft
       scope :upcoming
       scope :past
     end
@@ -19,7 +19,12 @@ module Admin
       end
 
       col :slug, visible: false
-      col :draft
+
+      col :draft?, as: :boolean, visible: false
+      col :published?, as: :boolean
+      col :published_start_at
+      col :published_end_at
+
       col :start_at, label: 'Start', visible: false
       col :end_at, label: 'End', visible: false
       col :excerpt, visible: false

data/app/models/effective/event.rb

@@ -41,10 +41,11 @@ module Effective
 
     has_one_attached :file
 
+    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
+    acts_as_published
     acts_as_slugged
-    log_changes if respond_to?(:log_changes)
     acts_as_tagged if respond_to?(:acts_as_tagged)
-    acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
+    log_changes if respond_to?(:log_changes)
 
     effective_resource do
       title                  :string
@@ -52,8 +53,9 @@ module Effective
       category               :string
       slug                   :string
 
-      draft                  :boolean
-      published_at           :datetime
+      published_start_at       :datetime
+      published_end_at         :datetime
+      legacy_draft             :boolean       # No longer used. To be removed.
 
       start_at               :datetime
       end_at                 :datetime
@@ -87,9 +89,6 @@ module Effective
       base
     }
 
-    scope :published, -> { where(draft: false).where(arel_table[:published_at].lt(Time.zone.now)) }
-    scope :unpublished, -> { where(draft: true).or(where(arel_table[:published_at].gteq(Time.zone.now))) }
-
     scope :upcoming, -> { where(arel_table[:end_at].gt(Time.zone.now)) }
     scope :past, -> { where(arel_table[:end_at].lteq(Time.zone.now)) }
 
@@ -136,7 +135,6 @@ module Effective
     scope :delayed_payment_date_upcoming, -> { delayed.where(arel_table[:delayed_payment_date].gt(Time.zone.today)) }
 
     validates :title, presence: true, length: { maximum: 255 }
-    validates :published_at, presence: true, unless: -> { draft? }
     validates :start_at, presence: true
     validates :end_at, presence: true
     validates :external_registration_url, url: true
@@ -196,13 +194,6 @@ module Effective
       event_tickets.any? { |et| et.waitlist? }
     end
 
-    def published?
-      return false if draft?
-      return false if published_at.blank?
-
-      published_at < Time.zone.now
-    end
-
     def registerable?
       return false unless published?
       return false if closed?
@@ -247,10 +238,11 @@ module Effective
       Event.new(attributes.except('id', 'updated_at', 'created_at')).tap do |event|
         event.title = event.title + ' (Copy)'
         event.slug = event.slug + '-copy'
-        event.draft = true
 
         event.rich_text_body = rich_text_body
         event.rich_text_excerpt = rich_text_excerpt
+
+        event.assign_attributes(published_start_at: nil, published_end_at: nil)
       end
     end
 

data/app/views/admin/events/_form_event.html.haml

@@ -1,6 +1,16 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
   = f.text_field :title, label: "Title"
 
+  -# acts_as_published
+  = f.hide_if(:save_as_draft, true) do
+    .row
+      .col-md-6
+        = f.datetime_field :published_start_at, hint: 'The event will be available starting on this date and time.'
+      .col-md-6
+        = f.datetime_field :published_end_at, hint: 'The event will no longer be available after this date and time. Leave blank for no end date.', date_linked: false
+
+  = f.check_box :save_as_draft, label: "Save as a draft. It will not appear on the website and can only be accessed by admin users."
+
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = (effective_events.event_url(f.object) rescue nil)
     = f.text_field :slug, hint: "The slug controls this event's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This event is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
@@ -14,10 +24,6 @@
       - if event.class.respond_to?(:acts_as_tagged?)
         = render 'effective/tags/fields', f: f
 
-  = f.check_box :draft, hint: 'Save this event as a draft. It will not be accessible on the website.'
-  .row
-    .col-md-6= f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
-
   .row
     .col-md-6= f.datetime_field :start_at, label: "Event Start"
     .col-md-6= f.datetime_field :end_at, label: "Event End"

data/db/migrate/101_create_effective_events.rb

@@ -6,8 +6,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.string :category
       t.string :slug
 
-      t.boolean :draft, default: false
-      t.datetime :published_at
+      t.datetime :published_start_at
+      t.datetime :published_end_at
+      t.boolean :legacy_draft, default: false
 
       t.datetime :start_at
       t.datetime :end_at

data/db/seeds.rb

@@ -13,7 +13,7 @@ event = Effective::Event.create!(
   rich_text_excerpt: '<p>This is a great event</p>',
   rich_text_body: '<p>This is a really great event!</p>',
 
-  published_at: Time.zone.now,
+  published_start_at: Time.zone.now,
   start_at: (now + 1.week),
   end_at: (now + 1.week + 1.hour),
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.15.1'.freeze
+  VERSION = '0.16.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 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