ensurance 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc0cb170529eaf783a26f087ee9a64c47403a7a881b098fed4417b6d289c78a
-  data.tar.gz: 5663a75b82064550e92d3c57ed89d508fb8c5186e78e27fa9ef73f25c3599282
+  metadata.gz: 7675cd410c9fa7bcb7dc42b2f5a133e87025b52afef3741eebae60cf071def52
+  data.tar.gz: bca8136a4278bbdd298cfd4e1de29594c5431ad79388b1a17ef89edf9b0a426d
 SHA512:
-  metadata.gz: b81c806ee2c6b15a527565f68d88bc2925f0548b023cd0bc9eaf7e7dacaf9510191a9ef2e7cd1797b8c3a62b5f35abd476abf19f37f67bd841969529bd82c6b3
-  data.tar.gz: 431dd8252c904e563cf7d69a31a42d095d4cd4576104e81e38c33d0d60502f4f03886065194a36c1dcef87d65ef9e2476ae98df310ee3653d7ce50995c568341
+  metadata.gz: 2092f81cb9d3dc738a6ac4c8ca99970a313a81a6c6dfe7262aafb00215a751932c66f3a815c21a638d995ddfaa07045c82b7373f0cb35989daec864818177056
+  data.tar.gz: 2ff2921bbb02f2c32aacabacde7febe85da921c177e1c3ede7a9835c7a198e979787f52ec9e1970eaa5e1380c4b5cc9e879ee0e8bd9ffe5810d125be17702a07

data/lib/ensurance.rb

@@ -10,9 +10,16 @@ module Ensurance
   extend ActiveSupport::Concern
 
   class_methods do
-    def ensure_by(*args)
+    @_additional_ensure_by = []
+    @_ensure_order = nil
+    @_ensure_by = []
+
+    def ensure_by(*args, order: nil)
       @_additional_ensure_by = args
-      @_ensure_by = nil
+      @_ensure_order = (order || primary_key).to_s
+      @_ensure_by = [@_additional_ensure_by || primary_key].flatten.compact.uniq
+      # ap "Ensure By: #{self}.#{@_ensure_by}   Order: #{self}.#{@_ensure_order}"
+      raise ArgumentError.new("#{self} does not have column[#{@_ensure_order}] to sort by") unless self.column_names.include?(@_ensure_order)
     end
 
     def ensure(thing = nil)
@@ -29,6 +36,7 @@ module Ensurance
       end
 
       @_ensure_by ||= [@_additional_ensure_by || primary_key].flatten.compact.uniq
+      @_ensure_order ||= primary_key
 
       found = []
       things = [thing].flatten
@@ -42,7 +50,9 @@ module Ensurance
           if ensure_field.to_sym == :id
             begin
               # Always return the most recent record that matches
-              record = where(ensure_field => value).order(created_at: :desc).first
+              query = where(ensure_field => value)
+              query = query.order("#{@_ensure_order}" => 'desc')
+              record = query.first
             rescue ActiveRecord::RecordNotFound
               nil
             end

data/lib/ensurance/hash_ensure.rb

@@ -12,12 +12,12 @@ module Ensurance
     module ClassMethods
       def ensure(thing)
         case thing.class.name
+        when 'NilClass'
+          nil
         when 'Hash', 'HashWithIndifferentAccess'
           thing
         when 'String'
           JSON.parse(thing)
-        when 'NilClass'
-          nil
         when 'ActionController::UnfilteredParameters', 'ActionController::Parameters'
           thing.permit!.to_h
         else

data/lib/ensurance/version.rb

@@ -1,3 +1,3 @@
 module Ensurance
-  VERSION = '0.1.15'.freeze
+  VERSION = '0.1.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ben Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport