ensurance 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f514ba5f0eef829157408e664c9e5156b2058e
-  data.tar.gz: 491475ddd8df0c8fe9f6044015ec4bb08953f47a
+  metadata.gz: 4f356dd97f450da7e5d90f5f2dd000ae500754f1
+  data.tar.gz: 96489236b803cc22158f1a9a51a68edb6a4e4262
 SHA512:
-  metadata.gz: 771842cca4e6ca4ffb2801d62bef28dc494278f580e52131051e93bab6e55675453986c81c6b2ad8419cdf3485f5c98fcb248ad28a8ff222e522ab623c7fdcc1
-  data.tar.gz: a7868bd6816f1719de2cf547bc0584ed5eff89137eb089359dff8dd54bc096f9952598920e60d48a02f2b43b18dbb606a754b2c24efd1d7c8ca50d008d711b98
+  metadata.gz: 269feab585502a890af303f69ff32f4e4623ab524318faa186ec8d81c032f7b3a39927d686be1d3af07a126a6975fc7aa25f641b40274fbee6c73cda552a934f
+  data.tar.gz: '093ec632805684e2134361e8643cb4e1c575d1e586cb79e3b97e2bf74cc34620a45134a1e8dba3853761fba6fd0258724d71668cb66b86e899a0d525bcba1b29'

data/.gitignore

@@ -9,4 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
-*.gem
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ensurance (0.1.2)
+    ensurance (0.1.3)
       activesupport (>= 3, < 6)
 
 GEM
@@ -19,6 +19,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (8.0.0)
+    awesome_print (1.8.0)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     globalid (0.4.1)
@@ -50,6 +51,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3, < 6)
+  awesome_print (>= 1.0, < 2)
   bundler (~> 1.16)
   ensurance!
   globalid (>= 0.3.6, < 2)

data/README.md

@@ -6,7 +6,7 @@ Allows you to ensure you have the class you expect... it's similar to
 result = value.is_a?(Person) ? value : Person.find(value)
 ```
 
-You can add fields to "ensure_by" (:id is included always)
+You can add fields to "ensure_by" (`self.primary_key` is the default)
 e.g.
 
  if you add `ensure_by :token` to the User class

data/ensurance.gemspec

@@ -38,5 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord", '>= 3', '< 6'
   spec.add_development_dependency "globalid", '>= 0.3.6', '< 2'
   spec.add_development_dependency "sqlite3", '>= 1.3.0', '< 4'
+  spec.add_development_dependency "awesome_print", '>= 1.0', '< 2'
 end
 

data/lib/ensurance.rb

@@ -16,9 +16,12 @@ module Ensurance
 
     def ensure(thing = nil)
       return nil unless thing.present?
+      found = nil
 
       if thing.is_a?(self)
         return thing
+      elsif thing.is_a?(Array)
+        raise ArgumentError.new("Cannot Ensure #{self.name} with an Array: #{thing.inspect}")
       elsif thing.is_a?(GlobalID)
         return GlobalID::Locator.locate(thing)
       elsif thing.is_a?(Hash) && thing['_aj_globalid'] && (found = GlobalID::Locator.locate(thing['_aj_globalid']))
@@ -26,12 +29,14 @@ module Ensurance
       elsif thing.is_a?(String) && found = GlobalID::Locator.locate(thing)
         return found
       end
-      found = nil
 
-      @_ensure_by ||= [self.primary_key, @_additional_ensure_by].flatten.compact.uniq
+      @_ensure_by ||= [@_additional_ensure_by || self.primary_key].flatten.compact.uniq
       @_ensure_by.each do |ensure_field|
-        value = thing.try(:fetch, ensure_field.to_sym, nil) || thing.try(:fetch, ensure_field.to_s, nil) || thing
-        found = self.find_by(ensure_field => value)
+        value = thing
+        if thing.is_a?(Hash)
+          value = thing.fetch(ensure_field.to_sym, nil) || thing.fetch(ensure_field.to_s, nil)
+        end
+        found = self.find_by(ensure_field => value) if value.present? && !value.is_a?(Hash)
         break if found.is_a?(self)
       end
 

data/lib/ensurance/version.rb

@@ -1,3 +1,3 @@
 module Ensurance
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: 'A handy shortcut for user = user.is_a?(User) ? user : User.find(user)'
 email:
 - bsharpe@gmail.com
@@ -149,7 +169,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- ensurance-0.1.0.gem
 - ensurance.gemspec
 - lib/ensurance.rb
 - lib/ensurance/date_ensure.rb