state_of_the_nation 1.1.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a7482f3c135b954fe912e2bb6b8948f4ba14596e282a91687aec9cbcb06b3d
-  data.tar.gz: 4577435dca22e84ded9236bc52b94cc24d02681973697623d5bca3c884034d6b
+  metadata.gz: f9953a5747485077b6b886669e70f2e652ec75837f2fc3a18e9593f208953d47
+  data.tar.gz: 9ffe1c9d237754ce9c2bdfbd8385e95e0b5ccbaa7eb8169dc10e4313a69e4253
 SHA512:
-  metadata.gz: d00dd78d49cd44f1c79ad9c316d1e4843bb255f5b7728f0cb813bd656d8b3ff794c3d5dffa4013bf3d9e4805dda858f01bace09557c241e0b69d3869b06fd3f7
-  data.tar.gz: 11dbf26dbddd36bc93c408f6679c9980044c990c4ba4990298dd86ca1633687d5bfc0df9b13b38ad067d12645a3b001989e2356a175405ea3ed34a1cc354f5ed
+  metadata.gz: bcbf936777c4cca79342052f6092ac1722a1cc006017e1abc7b9cd16c70c462ea06d83b05d7fc6123b113c13bc68b670f0cdee9b63ab77c68b80b6f570b8f505
+  data.tar.gz: e3d8a957ae397887f048bc3f105564d2e29a301c150a0233c9116b36f256c4e2ec1e994c983cc506830f6d7c6a0a7bcb4b473d7c6adff0b753fc5a8d9799e1c6

data/lib/state_of_the_nation/query_string.rb

@@ -10,13 +10,13 @@ module StateOfTheNation
           active_scope: "(%{finish_key} IS NULL OR %{finish_key} > ?::timestamp) AND %{start_key} <= ?::timestamp",
           less_than: "(%{start_key} < ?::timestamp)",
           greater_than_or_null: "(%{finish_key} > ?::timestamp) OR (%{finish_key} IS NULL)",
-          start_and_finish_not_equal: "(%{start_key} != %{finish_key})",
+          start_and_finish_not_equal_or_are_null: "(%{start_key} != %{finish_key}) OR (%{start_key} IS NULL) OR (%{finish_key} IS NULL)",
         },
         mysql: {
           active_scope: "(%{finish_key} IS NULL OR %{finish_key} > ?) AND %{start_key} <= ?",
           less_than: "(%{start_key} < ?)",
           greater_than_or_null: "(%{finish_key} > ?) OR (%{finish_key} IS NULL)",
-          start_and_finish_not_equal: "(%{start_key} != %{finish_key})"
+          start_and_finish_not_equal_or_are_null: "(%{start_key} != %{finish_key}) OR (%{start_key} IS NULL) OR (%{finish_key} IS NULL)"
         }
       }[appropriate_db_type(klass)]
     end

data/lib/state_of_the_nation/version.rb

@@ -1,3 +1,3 @@
 module StateOfTheNation
-  VERSION = "1.1.4"
+  VERSION = "2.0.0"
 end

data/lib/state_of_the_nation.rb

@@ -27,32 +27,34 @@ module StateOfTheNation
         @finish_key = finish_key
 
         define_method "active?" do |time = Time.now.utc|
-          (finish.blank? || round_if_should(finish) > round_if_should(time)) && round_if_should(start) <= round_if_should(time)
+          (finish.blank? || finish > time) && start <= time
+        end
+
+        define_method "active_in_interval?" do |interval_start, interval_end|
+          record_start = start
+          record_end = finish
+          if ignore_empty && record_start == record_end
+            false
+          elsif interval_start.nil? && interval_end.nil?
+            true
+          elsif interval_start == interval_end
+            active?(interval_start)
+          elsif interval_start.nil?
+            record_start < interval_end
+          elsif interval_end.nil?
+            record_end.nil? || record_end > interval_start
+          elsif record_end.nil?
+            interval_end > record_start
+          else
+            record_start < interval_end && record_end > interval_start
+          end
         end
 
         scope :active, lambda { |time = Time.now.utc|
-          where(QueryString.query_for(:active_scope, self), round_if_should(time), round_if_should(time))
+          where(QueryString.query_for(:active_scope, self), time, time)
         }
       end
 
-      private def round_if_should(time)
-        return time if !should_round_timestamps?
-        time.respond_to?(:round) ? time.round : time
-      end
-
-      private def should_round_timestamps?
-        # MySQL datetime fields do not support millisecond resolution while
-        # PostgreSQL's do. To prevent issues with near identical timestamps not
-        # comparing as expected in .active? methods we'll choose the resolution
-        # appropriate for the database adapter backing the model.
-        case self.connection.adapter_name
-        when /PostgreSQL/
-          false
-        else
-          true
-        end
-      end
-
       self
     end
 
@@ -129,8 +131,9 @@ module StateOfTheNation
     # find competing records which *finish* being active AFTER this record *starts* being active
     # (or ones which are not set to finish being active)
 
-    records = records.where(QueryString.query_for(:start_and_finish_not_equal, self.class)) if ignore_empty
+    records = records.where(QueryString.query_for(:start_and_finish_not_equal_or_are_null, self.class)) if ignore_empty
     # exclude records where there is no difference between start and finish dates
+    # (we need to deliberately not filter out records with null value keys with this comparison as not equal comparisons to null are always deemed null/false)
 
     records
   end
@@ -142,12 +145,12 @@ module StateOfTheNation
 
   def start
     return unless start_key.present?
-    return round_if_should(self.send(start_key) || Time.now.utc)
+    return self.send(start_key) || Time.now.utc
   end
 
   def finish
     return unless finish_key.present?
-    round_if_should(self.send(finish_key))
+    self.send(finish_key)
   end
 
   def bad_configuration?
@@ -175,13 +178,4 @@ module StateOfTheNation
   def ignore_empty
     self.class.ignore_empty
   end
-
-  def should_round_timestamps?
-    self.class.send(:should_round_timestamps?)
-  end
-
-  def round_if_should(time)
-    return time if time.nil?
-    self.class.send(:round_if_should, time)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_of_the_nation
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Patrick O'Doherty
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler