state_of_the_nation 1.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3cdbd88385c581951562d576585cc78ff3528de59b908b280ad331c4794bc4
-  data.tar.gz: 4a41b1f65f1d1e517568deb529e1fdfaaae033a561d5b2d8b660a49588590c64
+  metadata.gz: f9953a5747485077b6b886669e70f2e652ec75837f2fc3a18e9593f208953d47
+  data.tar.gz: 9ffe1c9d237754ce9c2bdfbd8385e95e0b5ccbaa7eb8169dc10e4313a69e4253
 SHA512:
-  metadata.gz: 35dba604ed379b09913369ac0f59b14593c5c6fd40f7fa999733235a71b8ab5da41e9fb6a03e635fc04ab83535eb7699303723c3036cadac9c206208e2873a0c
-  data.tar.gz: 5a44d3263e9cafec224645750ae87e7e78faa7d85e27a5dbcc4e6a318658a1bdfec3da2554003fe6de712582a282341b655d2cbb8096385babf82603a2cad123
+  metadata.gz: bcbf936777c4cca79342052f6092ac1722a1cc006017e1abc7b9cd16c70c462ea06d83b05d7fc6123b113c13bc68b670f0cdee9b63ab77c68b80b6f570b8f505
+  data.tar.gz: e3d8a957ae397887f048bc3f105564d2e29a301c150a0233c9116b36f256c4e2ec1e994c983cc506830f6d7c6a0a7bcb4b473d7c6adff0b753fc5a8d9799e1c6

data/lib/state_of_the_nation/version.rb

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

data/lib/state_of_the_nation.rb

@@ -27,12 +27,12 @@ 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 = round_if_should(start)
-          record_end = round_if_should(finish)
+          record_start = start
+          record_end = finish
           if ignore_empty && record_start == record_end
             false
           elsif interval_start.nil? && interval_end.nil?
@@ -51,28 +51,10 @@ module StateOfTheNation
         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
 
@@ -163,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?
@@ -196,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.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Patrick O'Doherty
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler