state_of_the_nation 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f860e2aab34bc7885c2de966a79665080b07179e
-  data.tar.gz: 349d751236999d5bc792d24a8f1ebc8b4cdace48
+  metadata.gz: c3a33b2524ff4366459b1b2acfa2d99bd64e4577
+  data.tar.gz: 3e2391951eeeffd3c09c6c2a5d22801df27454d3
 SHA512:
-  metadata.gz: 66d9caa5d36028657ef95c22e2eea1083d0f7750735c6763fca06e9fbd1143c2757a2dc30ae2950e89932d20e16f66b488ed787abc3fef1be028ca0c02689850
-  data.tar.gz: e68a543d34ee71d55167a9e1db1a7857a916194f9349fcbc21f5a7615d404458b48814cec0df528459b3ca11eb0dab15e89e3fed940af4409da077abdfc228c8
+  metadata.gz: 7fa8945c79a97b3b6a97191d3f8adeb19ced82cfe653d6088030e5ba2301fa84d8a887cfa49590e758ae02f7d4d920163f638196aa09858285578a6881c672d1
+  data.tar.gz: d36835a5772b71bbc12fdb713cd91944d0f786174c2b04b13ec76787a6219731c754331bd79c9e9f98b8b9cf502d9e8fba6e442e44aa08c679fe2d2e1c3bf48c

data/lib/state_of_the_nation/version.rb

@@ -1,3 +1,3 @@
 module StateOfTheNation
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/state_of_the_nation.rb

@@ -24,12 +24,11 @@ module StateOfTheNation
         @finish_key = finish_key
 
         define_method "active?" do |time = Time.now.utc|
-          time = should_round_timestamps? ? time.round : time
-          (finish.blank? || finish > time) && start <= time
+          (finish.blank? || round_if_should(finish) > round_if_should(time)) && round_if_should(start) <= round_if_should(time)
         end
 
-        scope :active, lambda { |t = Time.now.utc|
-          where(QueryString.query_for(:active_scope, self), t, t)
+        scope :active, lambda { |time = Time.now.utc|
+          where(QueryString.query_for(:active_scope, self), round_if_should(time), round_if_should(time))
         }
       end
 
@@ -71,13 +70,17 @@ module StateOfTheNation
       association = single ? plural.singularize : plural
 
       define_method "active_#{association}" do |time = Time.now.utc|
-        time = should_round_timestamps? ? time.round : time
         method_name = with_identity_cache ? "fetch_#{plural}" : plural.to_sym
         collection = send(method_name).select { |r| r.send("active?", time) }
         single ? collection.first : collection
       end
     end
 
+    def round_if_should(time)
+      return time.round if should_round_timestamps?
+      time
+    end
+
     def should_round_timestamps?
       # MySQL datetime fields do not support millisecond resolution while
       # PostgreSQL's do. To prevent issues with near identical timestamps not
@@ -133,12 +136,12 @@ module StateOfTheNation
 
   def start
     return unless start_key.present?
-    self.send(start_key) || Time.now.utc
+    return round_if_should(self.send(start_key) || Time.now.utc)
   end
 
   def finish
     return unless finish_key.present?
-    self.send(finish_key)
+    round_if_should(self.send(finish_key))
   end
 
   def bad_configuration?
@@ -166,4 +169,9 @@ module StateOfTheNation
   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.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Patrick O'Doherty