find_or_create_on_scopes 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e21b0d1d5374b9b0a8083be5c6caf98e6f976c9e
-  data.tar.gz: dcdf412fc3ebf6d9d9ede925559a0d313465e81b
+SHA256:
+  metadata.gz: 5903bce9f66535b6bb3d2c1184fd342c70c369104b24c2748de807bc0e604d26
+  data.tar.gz: 5c6dd59fbf555f3c2042f3791e02465cc2e773b5e08cb704b4fc043e14f5a116
 SHA512:
-  metadata.gz: c55f6f6afeb8540e399b9ebb0a6ec3d4dc493e09c98474e9f0bc938ec2c6c195ce5d36dc13078221dffa119a0202d5be75dfff05e05c89ebf335f0a1fd79db33
-  data.tar.gz: d3cf7432aa4b9f85cc090ca4dcee951b5b0f63323844a66551273e8cee49640a4b2d393ae6cdff0220effb6e5de8bb47bb0196158f1b7fc1a27149e04743726d
+  metadata.gz: 50979875ff4c6d1498a39b0ff1fa2faad75dc79272ec1b187a77aa169dc7b4a456350f0073e57c5da3d5f514da993efcabbc19639bd667ae70dd6a08e46ecb5a
+  data.tar.gz: 26e4919ab5b35f393f15dfb181e16d14126136f1126357325083a30bfcb0f97607c332cc7924ca9e714810b3a15e33e01f0556df0e2247fd54ccbef68cdd96a7

data/README.md

@@ -1,3 +1,7 @@
+> ⚠️ **DEPRECATED:** `find_or_create_on_scopes` is no longer maintained.
+> ActiveRecord's `find_or_create_by` plus relation scoping covers similar use
+> cases on modern Rails. The final release is v1.5.1.
+
 find_or_create_on_scopes
 ========================
 

data/find_or_create_on_scopes.gemspec

@@ -1,59 +1,69 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: find_or_create_on_scopes 1.4.1 ruby lib
+
+# stub: find_or_create_on_scopes 1.5.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "find_or_create_on_scopes"
-  s.version = "1.4.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Tim Morgan"]
-  s.date = "2016-01-22"
-  s.description = "Adds methods to ActiveRecord for conditionally finding, creating, or updating records."
-  s.email = "git@timothymorgan.info"
+  s.name = "find_or_create_on_scopes".freeze
+  s.version = "1.5.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Tim Morgan".freeze]
+  s.description = "Adds methods to ActiveRecord for conditionally finding, creating, or updating records.".freeze
+  s.email = "git@timothymorgan.info".freeze
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
+      "LICENSE",
+      "README.md"
   ]
   s.files = [
-    "LICENSE",
-    "README.md",
-    "find_or_create_on_scopes.gemspec",
-    "lib/find_or_create_on_scopes.rb"
+      "LICENSE",
+      "README.md",
+      "find_or_create_on_scopes.gemspec",
+      "lib/find_or_create_on_scopes.rb"
   ]
-  s.homepage = "http://github.com/riscfuture/find_or_create_on_scopes"
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "2.5.1"
-  s.summary = "find_or_create-type methods on ActiveRecord scopes"
+  s.homepage = "http://github.com/riscfuture/find_or_create_on_scopes".freeze
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9".freeze)
+  s.rubygems_version = "2.6.3".freeze
+  s.summary = "[DEPRECATED] find_or_create-type methods on ActiveRecord scopes".freeze
+  s.post_install_message = <<~MSG
+
+    ⚠️  DEPRECATED: find_or_create_on_scopes is no longer maintained.
+
+    No longer maintained. ActiveRecord's `find_or_create_by` plus relation scoping covers similar use cases on modern Rails.
 
-  if s.respond_to? :specification_version then
+    This is the final release. No further updates are planned.
+
+  MSG
+
+  if s.respond_to? :specification_version
     s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      s.add_runtime_dependency('activerecord'.freeze, [">= 3.1"])
+      s.add_development_dependency('activerecord-jdbcsqlite3-adapter'.freeze, [">= 0"])
+      s.add_development_dependency('juwelier'.freeze, [">= 0"])
+      s.add_development_dependency('redcarpet'.freeze, [">= 0"])
+      s.add_development_dependency('rspec'.freeze, [">= 0"])
+      s.add_development_dependency('sqlite3'.freeze, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.1"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency('activerecord'.freeze, [">= 3.1"])
+      s.add_dependency('activerecord-jdbcsqlite3-adapter'.freeze, [">= 0"])
+      s.add_dependency('sqlite3'.freeze, [">= 0"])
+      s.add_dependency('sqlite3'.freeze, [">= 0"])
+      s.add_dependency('sqlite3'.freeze, [">= 0"])
+      s.add_dependency('sqlite3'.freeze, [">= 0"])
+      s.add_dependency('yard'.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.1"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency('juwelier'.freeze, [">= 0"])
+    s.add_dependency('juwelier'.freeze, [">= 0"])
+    s.add_dependency('redcarpet'.freeze, [">= 0"])
+    s.add_dependency('rspec'.freeze, [">= 0"])
+    s.add_dependency('yard'.freeze, [">= 0"])
+    s.add_dependency('yard'.freeze, [">= 0"])
+    s.add_development_dependency('yard'.freeze, [">= 0"])
   end
 end
-

data/lib/find_or_create_on_scopes.rb

@@ -2,6 +2,10 @@
 
 module FindOrCreateOnScopes
 
+  # Return this in a block from `find_or_create` or `create_or_update` to abort
+  # the creation/updating of a record.
+  ABORT_SAVE = Object.new
+
   # Locates a record according to the current scope. Returns the record if
   # found. If not found, creates a new record with the attributes of the current
   # scope and the provided attributes.
@@ -10,6 +14,7 @@ module FindOrCreateOnScopes
   # @yield [record] Yields the record before it is saved.
   # @yieldparam [ActiveRecord::Base] record The found or created record before
   #   it is saved.
+  # @yieldreturn [ABORT_SAVE, nil] If `ABORT_SAVE` the record is not saved.
   # @return [ActiveRecord::Base] The found or created record.
 
   def find_or_create(*args, &block)
@@ -42,6 +47,7 @@ module FindOrCreateOnScopes
   # @yield [record] Yields the record before it is saved.
   # @yieldparam [ActiveRecord::Base] record The found or created record before
   #   it is saved.
+  # @yieldreturn [ABORT_SAVE, nil] If `ABORT_SAVE` the record is not saved.
   # @return [ActiveRecord::Base] The found or created record.
 
   def create_or_update(*args, &block)
@@ -74,19 +80,19 @@ module FindOrCreateOnScopes
     transaction do
       record = first || new(*args)
       if record.new_record?
-        yield record if block_given?
-        record.send(meth) if meth
+        result = block_given? ? yield(record) : nil
+        record.send(meth) if meth && result != ABORT_SAVE
       end
     end
     return record
-  rescue => err
-    if (defined?(Mysql2::Error) && err.kind_of?(Mysql2::Error)) ||
-        (defined?(PG::Error) && err.kind_of?(PG::Error)) ||
-        (defined?(ActiveRecord::JDBCError) && err.kind_of?(ActiveRecord::JDBCError)) ||
-        err.kind_of?(ActiveRecord::ActiveRecordError)
-      if err.to_s.include?('duplicate key value violates unique constraint') ||
-          err.to_s.start_with?('Duplicate entry') ||
-          err.kind_of?(ActiveRecord::RecordNotUnique)
+  rescue StandardError => e
+    if (defined?(Mysql2::Error) && e.kind_of?(Mysql2::Error)) ||
+        (defined?(PG::Error) && e.kind_of?(PG::Error)) ||
+        (defined?(ActiveRecord::JDBCError) && e.kind_of?(ActiveRecord::JDBCError)) ||
+        e.kind_of?(ActiveRecord::ActiveRecordError)
+      if e.to_s.include?('duplicate key value violates unique constraint') ||
+          e.to_s.start_with?('Duplicate entry') ||
+          e.kind_of?(ActiveRecord::RecordNotUnique)
         retry
       else
         raise
@@ -101,18 +107,18 @@ module FindOrCreateOnScopes
     transaction do
       record = first || new
       record.assign_attributes(*args) unless args.empty?
-      yield record if block_given?
-      record.send(meth) if meth
+      result = block_given? ? yield(record) : nil
+      record.send(meth) if meth && result != ABORT_SAVE
     end
     return record
-  rescue => err
-    if (defined?(Mysql2::Error) && err.kind_of?(Mysql2::Error)) ||
-        (defined?(PG::Error) && err.kind_of?(PG::Error)) ||
-        (defined?(ActiveRecord::JDBCError) && err.kind_of?(ActiveRecord::JDBCError)) ||
-        err.kind_of?(ActiveRecord::ActiveRecordError)
-      if err.to_s.include?('duplicate key value violates unique constraint') ||
-          err.to_s.start_with?('Duplicate entry') ||
-          err.kind_of?(ActiveRecord::RecordNotUnique)
+  rescue StandardError => e
+    if (defined?(Mysql2::Error) && e.kind_of?(Mysql2::Error)) ||
+        (defined?(PG::Error) && e.kind_of?(PG::Error)) ||
+        (defined?(ActiveRecord::JDBCError) && e.kind_of?(ActiveRecord::JDBCError)) ||
+        e.kind_of?(ActiveRecord::ActiveRecordError)
+      if e.to_s.include?('duplicate key value violates unique constraint') ||
+          e.to_s.start_with?('Duplicate entry') ||
+          e.kind_of?(ActiveRecord::RecordNotUnique)
 
         # sadly there's no way to tell which keys are the duplicate ones from a
         # SQL error, so we just retry 3 times and then give up :/
@@ -128,12 +134,12 @@ module FindOrCreateOnScopes
           retry
         end
       else
-        raise err
+        raise e
       end
     else
-      raise err
+      raise e
     end
   end
 end
 
-ActiveRecord::Relation.send :include, FindOrCreateOnScopes
+ActiveRecord::Relation.include FindOrCreateOnScopes

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: find_or_create_on_scopes
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Tim Morgan
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +109,14 @@ files:
 homepage: http://github.com/riscfuture/find_or_create_on_scopes
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  ⚠️  DEPRECATED: find_or_create_on_scopes is no longer maintained.
+
+  No longer maintained. ActiveRecord's `find_or_create_by` plus relation scoping covers similar use cases on modern Rails.
+
+  This is the final release. No further updates are planned.
+
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 4.0.11
 specification_version: 4
-summary: find_or_create-type methods on ActiveRecord scopes
+summary: "[DEPRECATED] find_or_create-type methods on ActiveRecord scopes"
 test_files: []
+...