state_of_the_nation 1.1.6 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3cdbd88385c581951562d576585cc78ff3528de59b908b280ad331c4794bc4
-  data.tar.gz: 4a41b1f65f1d1e517568deb529e1fdfaaae033a561d5b2d8b660a49588590c64
+  metadata.gz: 36525e79ab3fded0f8985975e73eaac75b0d535b530a1261bb8208d2e984b330
+  data.tar.gz: 2da7c70d311533899e611d3118f048763c753f4560880483b7bb4e27552e172f
 SHA512:
-  metadata.gz: 35dba604ed379b09913369ac0f59b14593c5c6fd40f7fa999733235a71b8ab5da41e9fb6a03e635fc04ab83535eb7699303723c3036cadac9c206208e2873a0c
-  data.tar.gz: 5a44d3263e9cafec224645750ae87e7e78faa7d85e27a5dbcc4e6a318658a1bdfec3da2554003fe6de712582a282341b655d2cbb8096385babf82603a2cad123
+  metadata.gz: 48703e6f70341a407ffd5d2804e09681b8ac841c48776aba500a6e0f32348300c4fdfa15d985be3a38b2dc22e41c8687d92dab0f0d94f7b244a5f23d80be335e
+  data.tar.gz: e3f1d4895d066f56ad5aa2d23aff060c71787e005c7c7609e8182af7b5cd3e2ba2840c986381fe68a5e9982c0ed88cf044f4b0522ef19b82974751ef48764a79

data/.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
       RAILS_ENV: test
 
     docker:
-    - image: circleci/ruby:2.5.5
+    - image: circleci/ruby:2.7.5
 
     steps:
     - checkout

data/.ruby-version

@@ -1 +1 @@
-2.5.5
+2.7.5

data/lib/state_of_the_nation/version.rb

@@ -1,3 +1,3 @@
 module StateOfTheNation
-  VERSION = "1.1.6"
+  VERSION = "2.0.1"
 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
 
@@ -103,8 +85,10 @@ module StateOfTheNation
     private
 
     def add_child_methods(plural:, single:, with_identity_cache:)
-      child_class = self.reflect_on_association(plural).klass
-      name = self.name.demodulize.underscore.to_sym
+      reflection = self.reflect_on_association(plural)
+      name = reflection.inverse_of&.name || self.name.demodulize.underscore.to_sym
+
+      child_class = reflection.klass
       child_class.instance_variable_set(:@parent_association, name)
       child_class.instance_variable_set(:@prevent_multiple_active, single)
 
@@ -163,12 +147,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 +180,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.1
 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: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An easy way to model state that changes over time with ActiveRecord