ensurance 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213c97b8eac33db98c540e1a0246a6e6f7bed4fd24c5f2e612ef7b6d99cdefcf
-  data.tar.gz: 820a45e1e7ae286072eca822062a3ebb7ac9ad3218f7450b814cde996c48c07f
+  metadata.gz: d6b9215002c70ca7691296be27ad819cee6da1793db1fe8042296a9cce75aa51
+  data.tar.gz: 43558c3ab86ee99eb6d3d427bebe4458e865b29e77b9d2c0e2feb41d308b3a88
 SHA512:
-  metadata.gz: 5ad24f5a10abfe820e7896dc88feacc1b6bd592b5f05c30142471594d1170f6d0a4a2db632039436ee0f383878cf00ccb7c717ee28122896b7e59d96e15e315b
-  data.tar.gz: af6e3aa358afe08f58476d06c8847c6079222864c647e9092c5a840684b100b75ed700e0962e4488a524b121037242331743d2420311a216f4e0b7bc557ac8cd
+  metadata.gz: a8eb8c8fe99768cbd5f9739d9e56f777f62d151af12a50dbf74e3888f0398a73f4af55b79308375f6b480f5d3775936c1f47751b6ad4150e0e8c00982cd31234
+  data.tar.gz: 942f536bcfb7e3a563732616dee9dd48091ef4f3ffac951ea87688658d1d4090cb27fbd79d7db80ab1a1fe912eaca6c5e078f48bccadb9973a58227f0f003d97

data/README.md

@@ -88,7 +88,8 @@ User.ensure(<globalid>) == GlobalID::Locator.locate(<globalid>)
 User.ensure(<globalid string>) == GlobalID::Locator.locate(<globalid string>)
 User.ensure(<some token>) == User.where(token: <some token>).first
 User.ensure(nil) -> nil
-User.ensuer!(nil) -> ActiveRecord::RecordNotFound
+User.ensure!(nil) -> nil
+User.ensure!(<unknown_id>) -> ActiveRecord::RecordNotFound
 ```
 
 ## Contributing

data/lib/ensurance.rb

@@ -16,37 +16,42 @@ 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']))
         return found
-      elsif thing.is_a?(String) && found = GlobalID::Locator.locate(thing)
+      elsif thing.is_a?(String) && (found = GlobalID::Locator.locate(thing))
         return found
       end
 
       @_ensure_by ||= [@_additional_ensure_by || self.primary_key].flatten.compact.uniq
-      @_ensure_by.each do |ensure_field|
-        value = thing
-        if thing.is_a?(Hash)
-          value = thing.fetch(ensure_field.to_sym, nil) || thing.fetch(ensure_field.to_s, nil)
+
+      found = []
+      things = Array(thing)
+      things.each do |thing|
+        record = nil
+        @_ensure_by.each do |ensure_field|
+          value = thing
+          if thing.is_a?(Hash)
+            value = thing.fetch(ensure_field.to_sym, nil) || thing.fetch(ensure_field.to_s, nil)
+          end
+          record = find_by(ensure_field => value) if value.present? && !value.is_a?(Hash)
+          break if record.is_a?(self)
         end
-        found = self.find_by(ensure_field => value) if value.present? && !value.is_a?(Hash)
-        break if found.is_a?(self)
+        found << record
       end
+      found.compact!
 
-      found
+      thing.is_a?(Array) ? found : found.first
     end
 
     def ensure!(thing = nil)
       return nil unless thing.present?
       result = self.ensure(thing)
-      raise ::ActiveRecord::RecordNotFound.new("#{self}[#{thing ? thing : 'nil'}]") unless result
+      raise ::ActiveRecord::RecordNotFound.new("#{self} not found") unless result
       result
     end
 

data/lib/ensurance/version.rb

@@ -1,3 +1,3 @@
 module Ensurance
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ben Sharpe