dino_utils 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948bf4e57da73b4b9a35b1b76be4b296c9f717b5
-  data.tar.gz: 0f00ace91325ea71362ed54bbe2345c7f5c73ff0
+  metadata.gz: 44177233d63e38c158e657fa371f0d76580a8b8d
+  data.tar.gz: c70e9cb4b081e3f62da40b34d28efb0828165d2a
 SHA512:
-  metadata.gz: 443bf67a090b842cc54b3565a0715a3971e73df18aa29d85349411212687af9b47a57ce9b89d9e92ef2749950fc55fcf23a9d0ec1b84a590c782004004690ba9
-  data.tar.gz: 7dcab4aab73e3ca734238ea49231ae7bc0b084a844a8a58c4269222bf924555690c6d1b1ca3ff23570c9783b942c4cb681800394cce36dd8b90fc6f622cdd7ef
+  metadata.gz: 5a23e557aab8b06e68d59175c3b9852b15a85e8d9eb7ed761fc182c07c40d7f9f9cb3222b06e74f8511007051d7bafd139b625a6b51c18425bb78bb3a64558e4
+  data.tar.gz: 264c63e5d3efae192c95c31f2871b1f78284c33f337f8e0ac8d7f9caa386c580816fc8973e619a18e311266bc3ba5a00f07a30230cbe05e9138868eec245978f

data/lib/dino/upsert.rb

@@ -7,8 +7,8 @@ module Dino
     extend ActiveSupport::Concern
     # User.upsert
     module ClassMethods
-      def upsert(*args)
-        Dino::Upsert.upsert(self, *args)
+      def upsert(*args, &block)
+        Dino::Upsert.upsert(self, *args, &block)
       end
     end
 
@@ -30,7 +30,12 @@ module Dino
       end
       begin
         klass.transaction(requires_new: true) do
-          klass.where(data_copy).first_or_initialize(&block).tap { |t| t.update!(options) }
+          object = klass.where(data_copy).first_or_initialize
+          block.call(object) if block
+          object.tap do |t|
+            t.assign_attributes(options)
+            t.save! if t.changed?
+          end
         end
       rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique
         # If there's a unique violation, retry this. But only a certain amount

data/lib/dino_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dino_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Joe Van Dyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler