ensurance 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc1835e5b3de9739e9b9251e18bcb537147de9cdcba75b515f49c003081217c
-  data.tar.gz: a74ed354554f1178716eea0cbc5acab7045ef4bacc6fdd3a18c60b98799c3b75
+  metadata.gz: cb3462b1b10a12355e59ff4b7709e6a439d9114b3c35d056e72ff49449f1c30f
+  data.tar.gz: 3921e9484383934f097da4d9184162f66ecfef36da878ccf7b3b7fcf3f9589e3
 SHA512:
-  metadata.gz: db7c657713d8a5c1aa5358d680b9cee04e7794932d544166c24d24a1fd209d712328c386470612e37205ee44448ceee9d87d5bb7a48f10c992351502a0d6f209
-  data.tar.gz: bfcbd5b6ea5a048e935cc0b2770a025ecb29380fbe153ea417e8d525fba4ea0dd7338ce0c6ee0e05e1ed3eae918aca15e8a769348bf4891117124ca4672ab3d4
+  metadata.gz: 4d8d760fb541bb58e0d12271bd9cb14cea799c59d6e8b1c035453fedf65b353e819df0de9318cfb628f075db6da91e8149985737baec27ed286bd82ce4cbb7e4
+  data.tar.gz: 7ac86524e006719d7843ccaf559c96f810f2f150ff74db549a6ea5b02032299e194d21a12a10ec239ae23040f7aa90a4458f12a8fc24d7248c3c7ab62233da69

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.6

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
+## 1.0.27
+- cleanup Time.ensure
 
 ## 1.0.26
-- auto handle milli and microseconds integers sent to Time.ensure
+- add handling of milliseconds to Time.ensure
 
 ## 1.0.25
 - have to use a string comparison for final result `1 != "1"`

data/Gemfile.lock

@@ -1,47 +1,50 @@
 PATH
   remote: .
   specs:
-    ensurance (0.1.26)
+    ensurance (0.1.27)
       activesupport (>= 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activerecord (7.0.2.4)
-      activemodel (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activesupport (7.0.2.4)
+    activemodel (6.0.3)
+      activesupport (= 6.0.3)
+    activerecord (6.0.3)
+      activemodel (= 6.0.3)
+      activesupport (= 6.0.3)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    awesome_print (1.9.2)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.10.0)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    awesome_print (1.8.0)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.3)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
-    rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    minitest (5.14.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     sqlite3 (1.4.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/lib/ensurance/time_ensure.rb

@@ -14,25 +14,27 @@ module Ensurance
         ::Time.zone ||= "UTC"
 
         case thing.class.name
-        when 'NilClass'
+        when 'NilClass', 'Time'
           thing
-        when 'Time'
-          thing
-        when 'Date'
-          thing.beginning_of_day
-        when 'Integer', 'Float'
-          if thing.to_i.to_s == thing.to_s
-            dec = thing.to_s.size - 10
-            thing /= (10 ** dec).to_f if dec > 0
+        when "Integer"
+          if thing < 10 ** 10
+            ::Time.zone.at(thing)
+          else # assume millis
+            ::Time.zone.at(thing / 1000.0)
           end
+        when "Float"
           ::Time.zone.at(thing)
         when 'String'
-          if thing.to_i.to_s == thing
-            ::Time.ensure(thing.to_i)
-          elsif thing.to_f.to_s == thing
-            ::Time.zone.at(thing.to_f)
+          if thing.match?(/\d{2}:\d{2}/) || thing.match?(/^\d{4}-\d{2}-\d{2}$/)
+            ::Time.parse(thing)
+          elsif thing.match?(/^\d+\.\d+$/)
+            self.ensure(thing.to_f)
+          elsif thing.match?(/^\d+$/)
+            self.ensure(thing.to_i)
+          elsif thing.blank?
+            nil
           else
-            ::Time.zone.parse(thing)
+            raise ArgumentError, "Cannot convert #{thing.class}/\"#{thing}\" to Time"
           end
         else
           if thing.respond_to?(:to_time)
@@ -43,12 +45,10 @@ module Ensurance
         end
       end
 
-      def ensure!(_thing)
-        def ensure!(thing)
-          result = self.ensure(thing)
-          raise ArgumentError, "Cannot Time.ensure(#{thing})" unless result
-          result
-        end
+      def ensure!(thing)
+        result = self.ensure(thing)
+        raise ArgumentError, "Cannot Time.ensure(#{thing})" unless result
+        result
       end
     end
   end

data/lib/ensurance/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ensurance
-  VERSION = '0.1.26'.freeze
+  VERSION = '0.1.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Ben Sharpe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -170,7 +171,7 @@ homepage: https://github.com/bsharpe/ensurance
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Add ability to ensure ActiveRecord models
 test_files: []