ensurance 0.1.23 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b8aa8bada56e100e91a9bdd1b6b2048977ba3fcc00f7cb241cde9684116467
-  data.tar.gz: 3ddf419730b1e6d7a4435448a246dc85c838770e8dff334623d11d890b069d5a
+  metadata.gz: abc1835e5b3de9739e9b9251e18bcb537147de9cdcba75b515f49c003081217c
+  data.tar.gz: a74ed354554f1178716eea0cbc5acab7045ef4bacc6fdd3a18c60b98799c3b75
 SHA512:
-  metadata.gz: '018d132796a0a7d630e58a089de12502e3594c802a066ad03aac00ff1a372df5129731ae5cacb2ac97a52173a9aaa05009f12e75f42bea0554356cbda3fd3456'
-  data.tar.gz: a49275fbc51f69828b33c157418f9060f0e6cd9ad841c35954e17ce69c17d656a42d48e3cce0b2b620ac51d82b2b04a39c5531e6720a9dd80ccc8e9125c98645
+  metadata.gz: db7c657713d8a5c1aa5358d680b9cee04e7794932d544166c24d24a1fd209d712328c386470612e37205ee44448ceee9d87d5bb7a48f10c992351502a0d6f209
+  data.tar.gz: bfcbd5b6ea5a048e935cc0b2770a025ecb29380fbe153ea417e8d525fba4ea0dd7338ce0c6ee0e05e1ed3eae918aca15e8a769348bf4891117124ca4672ab3d4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+
+## 1.0.26
+- auto handle milli and microseconds integers sent to Time.ensure
+
+## 1.0.25
+- have to use a string comparison for final result `1 != "1"`
+
+## 1.0.24
+- make sure that a string that starts with a number doesn't find an integer primary key record
+
 ## 1.0.23
 - forgot version boundry on ActiveSupport
 
@@ -7,7 +17,7 @@
 - support Rails 6+
 
 ## 1.0.21
-- properly handle empty strings 
+- properly handle empty strings
 
 ## 1.0.20
 - support Rails 6

data/Gemfile.lock

@@ -1,50 +1,47 @@
 PATH
   remote: .
   specs:
-    ensurance (0.1.22)
+    ensurance (0.1.26)
       activesupport (>= 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    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)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    awesome_print (1.8.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.7.0)
+      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)
       concurrent-ruby (~> 1.0)
-    minitest (5.13.0)
-    rake (13.0.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    sqlite3 (1.4.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby

data/lib/ensurance/time_ensure.rb

@@ -21,10 +21,14 @@ module Ensurance
         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
+          end
           ::Time.zone.at(thing)
         when 'String'
           if thing.to_i.to_s == thing
-            ::Time.zone.at(thing.to_i)
+            ::Time.ensure(thing.to_i)
           elsif thing.to_f.to_s == thing
             ::Time.zone.at(thing.to_f)
           else

data/lib/ensurance/version.rb

@@ -1,3 +1,3 @@
 module Ensurance
-  VERSION = '0.1.23'.freeze
+  VERSION = '0.1.26'.freeze
 end

data/lib/ensurance.rb

@@ -17,7 +17,7 @@ module Ensurance
     def ensure_by(*args, order: nil)
       @_additional_ensure_by = args
       if (::ActiveRecord::Base.connection rescue false)
-        @_ensure_order = (order || primary_key).to_s
+        @_ensure_order = (order || self.primary_key).to_s
         @_ensure_by = [@_additional_ensure_by || primary_key].flatten.compact.uniq
       end
       # ap "Ensure By: #{self}.#{@_ensure_by}   Order: #{self}.#{@_ensure_order}"
@@ -36,7 +36,7 @@ module Ensurance
         return found
       end
 
-      @_ensure_by ||= [@_additional_ensure_by || primary_key].flatten.compact.uniq
+      @_ensure_by ||= [@_additional_ensure_by || self.primary_key].flatten.compact.uniq
       @_ensure_order ||= primary_key
 
       found = []
@@ -60,7 +60,8 @@ module Ensurance
           else
             record = find_by(ensure_field => value) if value.present? && !value.is_a?(Hash)
           end
-          break if record.is_a?(self)
+          record = nil if record&.__send__(ensure_field).to_s != value.to_s
+          break if record
         end
         found << record
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.26
 platform: ruby
 authors:
 - Ben Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Add ability to ensure ActiveRecord models