ensurance 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc1399886201a771dd9b8ccb23d7171ce52a150507221c5b68c6ef9be9407a1
-  data.tar.gz: 96fd7d80dd6cd4bc77547fff44c4974cfe7a2374bc2a41b21e52d2c7ec4d18b4
+  metadata.gz: cb3462b1b10a12355e59ff4b7709e6a439d9114b3c35d056e72ff49449f1c30f
+  data.tar.gz: 3921e9484383934f097da4d9184162f66ecfef36da878ccf7b3b7fcf3f9589e3
 SHA512:
-  metadata.gz: ca52542260cfe20ce9683d8e6e33dfb81e043096b64e0340011fba85a7064a2dc3f34ec498050c98e6a82dd332eddefd9f813b5907db13d4f16333a9dd77e192
-  data.tar.gz: 878fb3d7b120d282c6fa4f94af2969d43d0459b1b370e3472da9bcfc5164a0f2e22ba5b6f5f312a613424eb17b1d94968ba6e31674d619d8fe209d9a0e21091f
+  metadata.gz: 4d8d760fb541bb58e0d12271bd9cb14cea799c59d6e8b1c035453fedf65b353e819df0de9318cfb628f075db6da91e8149985737baec27ed286bd82ce4cbb7e4
+  data.tar.gz: 7ac86524e006719d7843ccaf559c96f810f2f150ff74db549a6ea5b02032299e194d21a12a10ec239ae23040f7aa90a4458f12a8fc24d7248c3c7ab62233da69

data/.tool-versions

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

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.27
+- cleanup Time.ensure
+
+## 1.0.26
+- 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ensurance (0.1.25)
+    ensurance (0.1.27)
       activesupport (>= 3)
 
 GEM

data/lib/ensurance/time_ensure.rb

@@ -14,21 +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'
+        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.zone.at(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)
@@ -39,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.25'.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.25
+  version: 0.1.27
 platform: ruby
 authors:
 - Ben Sharpe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-10 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.0.6
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Add ability to ensure ActiveRecord models
 test_files: []