dino_utils 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4051bd9fc8ebdc4dcfc38cda484f058de45c87
-  data.tar.gz: 76087d0036a6e068ba939623605481016f9270eb
+  metadata.gz: 4fe82553f09d16773a01d4b2541dac1066447df4
+  data.tar.gz: 5c40e59e63341f818a9401fb16b5515ea918428e
 SHA512:
-  metadata.gz: c0fb37df0c07a8ebb543cdc5bfc1e32cacedcc3c3eb64ff3af09be5f1c10c5c0c810eac4353c995a4b97fc85d0f5de0c1b00fd2008e3f9c42d07424c2fb2fa0b
-  data.tar.gz: d2932bbe1bd8f7478f2c042c4b4a89c4f43a0150daa7116e081cfe30548d0e0b7003298111c95866ab8c161cddd0d6767281397c892a21389da26f5b77fafd78
+  metadata.gz: 976a2baff2e86bfc86cc85f272fd1ade2b69bd688bdbf1b5e595d17b324a2793bdef6524dda3b72aac8882889cadf9cf54aeed9581d8ef88c682959b0245eba3
+  data.tar.gz: 3a1ffceb478d8a018262d8039b197647469c58083137fe8037abcd45c7eaa150bcbf2a4e90ca89a70bcbb9c2494be708acb0e395f15973864f9e173aa6a0a831

data/lib/dino/upsert.rb

@@ -0,0 +1,42 @@
+require 'active_record'
+require 'pg'
+
+module Dino
+  # Provides a simple way to do an create or update of an ActiveRecord object.
+  module Upsert
+    extend ActiveSupport::Concern
+    # User.upsert
+    module ClassMethods
+      def upsert(*args)
+        Dino::Upsert.upsert(self, *args)
+      end
+    end
+
+    # klass: The ActiveRecord class we are upserting against.
+    # conditions: what should match the upsert
+    # options: what we are updating/inserting
+    # If provided, the block gets the object before it's saved, in case
+    #   there's special init options necessary for it.
+    # rubocop:disable MethodLength
+    def self.upsert(klass, conditions, options = {}, &block)
+      retry_count = 0
+      begin
+        klass.transaction(requires_new: true) do
+          klass.where(conditions).first_or_initialize(&block).tap { |t| t.update!(options) }
+        end
+      rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique
+        # If there's a unique violation, retry this. But only a certain amount
+        # of times or we'll get into an infinite loop if something's messed up.
+        # (like an incorrect unique index or something)
+        if retry_count < 10
+          retry_count += 1
+          retry
+        else
+          raise
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:include, Dino::Upsert)

data/lib/dino_utils/version.rb

@@ -1,3 +1,3 @@
 module DinoUtils
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/dino_utils.rb

@@ -1,41 +1,2 @@
 require "dino_utils/version"
-require 'active_record'
-
-module Dino
-  # Provides a simple way to do an create or update of an ActiveRecord object.
-  module Upsert
-    extend ActiveSupport::Concern
-    # User.upsert
-    module ClassMethods
-      def upsert(*args)
-        Dino::Upsert.upsert(self, *args)
-      end
-    end
-
-    # klass: The ActiveRecord class we are upserting against.
-    # conditions: what should match the upsert
-    # options: what we are updating/inserting
-    # If provided, the block gets the object before it's saved, in case
-    #   there's special init options necessary for it.
-    # rubocop:disable MethodLength
-    def self.upsert(klass, conditions, options = {}, &block)
-      retry_count = 0
-      begin
-        klass.transaction(requires_new: true) do
-          klass.where(conditions).first_or_initialize(&block).tap { |t| t.update!(options) }
-        end
-      rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique
-        # If there's a unique violation, retry this. But only a certain amount
-        # of times or we'll get into an infinite loop if something's messed up.
-        # (like an incorrect unique index or something)
-        if retry_count < 10
-          retry_count += 1 && retry
-        else
-          raise
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, Dino::Upsert)
+require_relative 'dino/upsert'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dino_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe Van Dyk
@@ -86,6 +86,7 @@ files:
 - bin/rake
 - bin/setup
 - dino_utils.gemspec
+- lib/dino/upsert.rb
 - lib/dino_utils.rb
 - lib/dino_utils/version.rb
 homepage: https://github.com/tanga/dino_utils
@@ -113,4 +114,3 @@ signing_key:
 specification_version: 4
 summary: Dino stuff
 test_files: []
-has_rdoc: