timelines 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b596c9a86e1cb9a8773f9394a6d71ab6f2e4cd521f89eda1f6ac434cbf059e42
-  data.tar.gz: 57236b6ed3b91ebe95afabedf0d192c277dd5d6127d810504a2f4b9c6a0db487
+  metadata.gz: 24c65a5feb6df7817fe888742b8de6d6c7f81e532ccc41d7290fbd265ff54b1e
+  data.tar.gz: cb783db345463c6553cbcb3a689ad50effc5b1d83afb84e7492d66fd16e6b9b2
 SHA512:
-  metadata.gz: 8d02c52990e934303148e6ad8a2bbc021911d3fe21522ba8336ed481334a300e2c4419526dd516b1f1f986c14d5d6c6f6a4d92ece505354d2968d74c5a0b8628
-  data.tar.gz: 48248ca65e37a9aed7757f5c129385f25a2047845e252444f5a04394d701f435a439a8487ddf385c840501474287769791c345eba62f90270afc2f02347b516c
+  metadata.gz: 803e6084c141d0bdae68bb4d95062c56d7e2173b15fddc9c22c804c2019317def240954d765e8e82f506e4f48ac34c10124ef0c6290a6ddc531081bd19a34cfa
+  data.tar.gz: 03f429339c43f0372a58e24c9db90acec09e4f828f9ba74607166edd34a427ceebcf1b2cd699e5e460cfdb58ea0ee78f028ceadfe8d405fc54c03f6e4f9bb499

data/lib/timelines/models/concerns/ephemeral.rb

@@ -6,12 +6,12 @@ module Timelines
 
     included do
       scope :draft, -> { where(started_at: nil) }
-      scope :active, -> { where(ended_at: nil, started_at: [..Time.current]) }
-      scope :active_at, ->(date) { where("started_at <= ? AND (ended_at IS ? OR ended_at >= ?)", date, nil, date) }
+      scope :active, -> { active_at(Time.current) }
+      scope :active_at, ->(date) { where(started_at: [..date], ended_at: nil).or(where(started_at: [..date], ended_at: [date..])) }
       scope :with_deleted, -> { unscope(where: :ended_at) }
-      scope :ended, -> { where.not(ended_at: nil) }
+      scope :ended, -> { where(ended_at: [..Time.current]) }
       scope :deleted, -> { ended }
-      scope :not_deleted, -> { where(ended_at: nil) }
+      scope :not_deleted, -> { where(ended_at: nil).or(where(ended_at: [Time.current..])) }
 
       def active?
         started? && !ended?
@@ -32,7 +32,15 @@ module Timelines
       end
 
       def end!
-        destroy
+        return self if ended_at.present? && ended_at.past?
+
+        result = ActiveRecord::Base.transaction do
+          run_callbacks(:destroy) do
+            update(ended_at: Time.current)
+          end
+        end
+
+        result ? self : false
       end
 
       def ended?
@@ -44,13 +52,11 @@ module Timelines
       end
 
       def destroy
-        return if ended_at.present?
-
-        update(ended_at: Time.current)
+        end!
       end
 
-      def self.destroy_all
-        where(ended_at: nil).update_all(ended_at: Time.current)
+      def destroy!
+        end!
       end
     end
   end

data/lib/timelines/models/concerns/has_audit_trail.rb

@@ -4,8 +4,12 @@ module Timelines
   module HasAuditTrail
     extend ActiveSupport::Concern
 
-    def audit_trail(reverse: false)
-      ::Timelines::AuditTrail.new(resource: self, reverse: reverse)
+    included do
+      include ::Timelines::HasEvents
+
+      def audit_trail(reverse: false)
+        ::Timelines::AuditTrail.new(resource: self, reverse: reverse)
+      end
     end
   end
 end

data/lib/timelines/version.rb

@@ -1,3 +1,3 @@
 module Timelines
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timelines
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Craig Gilchrist
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails