find_or_create_on_scopes 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21b0d1d5374b9b0a8083be5c6caf98e6f976c9e
-  data.tar.gz: dcdf412fc3ebf6d9d9ede925559a0d313465e81b
+  metadata.gz: e02fbd2dde3e73f06a09a4537ef772333b7eb16a
+  data.tar.gz: 444d64b0f515a81f26c914f3819b3ba30ab7986d
 SHA512:
-  metadata.gz: c55f6f6afeb8540e399b9ebb0a6ec3d4dc493e09c98474e9f0bc938ec2c6c195ce5d36dc13078221dffa119a0202d5be75dfff05e05c89ebf335f0a1fd79db33
-  data.tar.gz: d3cf7432aa4b9f85cc090ca4dcee951b5b0f63323844a66551273e8cee49640a4b2d393ae6cdff0220effb6e5de8bb47bb0196158f1b7fc1a27149e04743726d
+  metadata.gz: 22727b20c04b72f74e880ada52e751286957f0b5b262908a0f02a5415c4c28184e9c5804e341656c83c4b8e90ae21a91045cbb347f5658b3f85ef070a49bb8ef
+  data.tar.gz: a0e59d1ddb21206af1d8c5ca98fa6d32ae6950a686e6956b22ef28c0103b0d322efe2255582970a926d82d73a3ed22361630177a948a86309a7cb03b937edb34

data/find_or_create_on_scopes.gemspec

@@ -1,19 +1,19 @@
-# 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.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "find_or_create_on_scopes"
-  s.version = "1.4.1"
+  s.name = "find_or_create_on_scopes".freeze
+  s.version = "1.5.0"
 
-  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.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.date = "2016-05-07"
+  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"
@@ -24,36 +24,39 @@ Gem::Specification.new do |s|
     "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 = "find_or_create-type methods on ActiveRecord scopes".freeze
 
   if s.respond_to? :specification_version then
     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"])
+      s.add_runtime_dependency(%q<activerecord>.freeze, [">= 3.1"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.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(%q<activerecord>.freeze, [">= 3.1"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.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(%q<activerecord>.freeze, [">= 3.1"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.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,8 +80,8 @@ 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
@@ -101,8 +107,8 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_or_create_on_scopes
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcsqlite3-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: find_or_create-type methods on ActiveRecord scopes