unique_attributes 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70a00c890458b0211c83d2c03761dc25076d3eca
-  data.tar.gz: fe8105fe343e4eb9b88fe05b49e9d64cdf77526a
+SHA256:
+  metadata.gz: 05ae0b01e29ee3376746119561a42e507acf30c2e0e49ad00bb23202fad8dcb1
+  data.tar.gz: 4e898afbfe1a0668bfebc76b3dac718d9b9879663dc89dde6a4c2fc127dac4b9
 SHA512:
-  metadata.gz: f7ac7936da0e54159abd1ef4e92240b2cdbf449cbe960eb45b830e037e1798c64a14f287020958f78721991e68321bbe02198abb4fa8f054e3d1dae2ae91238a
-  data.tar.gz: 576ebc540a990b71865ecbbd9bc919802308efe216ae7f910c171b0f4c5f1b19fbebaf32042e10b87c1e028dfd214ae8f31311bc9d351506bbe66485eba302af
+  metadata.gz: 63b6d47cfba4c4d82cf704f31b38e8e4209342af24fd921a92ce09181845a3879a87b3dfb515150ec12519af56c50f615732c50c4a0638b9da70392af50a3eda
+  data.tar.gz: 0c26f90f0323aac83ad3ea09410039c5001bd131ba2b31f3ee258a7270f017a895c74154476496382fed8447fc2724b23d8824ce96d87ce287ba586ee2bb5bff

data/README.md

@@ -1,4 +1,4 @@
-[![Code Climate](https://codeclimate.com/github/panorama-ed/unique_attributes/badges/gpa.svg)](https://codeclimate.com/github/panorama-ed/unique_attributes) [![Test Coverage](https://codeclimate.com/github/panorama-ed/unique_attributes/badges/coverage.svg)](https://codeclimate.com/github/panorama-ed/unique_attributes) [![Inline docs](http://inch-ci.org/github/panorama-ed/unique_attributes.png)](http://inch-ci.org/github/panorama-ed/unique_attributes) [![Build Status](https://travis-ci.org/panorama-ed/unique_attributes.svg)](https://travis-ci.org/panorama-ed/unique_attributes)
+[![Code Climate](https://codeclimate.com/github/panorama-ed/unique_attributes/badges/gpa.svg)](https://codeclimate.com/github/panorama-ed/unique_attributes) [![Test Coverage](https://codeclimate.com/github/panorama-ed/unique_attributes/badges/coverage.svg)](https://codeclimate.com/github/panorama-ed/unique_attributes) [![Inline docs](http://inch-ci.org/github/panorama-ed/unique_attributes.png)](http://inch-ci.org/github/panorama-ed/unique_attributes) [![Build Status](https://travis-ci.org/panorama-ed/unique_attributes.svg)](https://travis-ci.org/panorama-ed/unique_attributes) [![Gem Version](https://badge.fury.io/rb/unique_attributes.svg)](http://badge.fury.io/rb/unique_attributes)
 
 # UniqueAttributes
 

data/lib/unique_attributes.rb

@@ -64,6 +64,8 @@ module UniqueAttributes
       # If we have blank unique attributes.
       if blank_attrs.size > 0
         attempts = 0
+        attr_group = "(?<attr>#{blank_attrs.keys.join('|')})"
+        other_fields = "(, [\\w`'\".]+)*"
 
         # Keep retrying until the save works.
         while !self.persisted?
@@ -77,25 +79,29 @@ module UniqueAttributes
               yield # Perform the save, and see if it works.
             end
           rescue ActiveRecord::RecordNotUnique => error
-            attr_group = "(?<attr>#{blank_attrs.keys.join('|')})"
-            other_fields = "(, [\\w`'\"]+)*"
-            sqlite3_regex = /column(s)? #{attr_group}#{other_fields} (is|are) not unique/
-            postgresql_regex = /Key \(#{attr_group}#{other_fields}\)=\([\w\s,]*\) already exists/
-
-            match = sqlite3_regex.match(error.message) ||
-                    postgresql_regex.match(error.message)
-
-            # If we've managed to hit the same unique attribute of a record
-            # already in the database, then we should wipe the attribute and try
-            # again, unless we've already done this many times in which case we
-            # should let the error bubble up.
-            if match && attempts <= SAVE_ATTEMPTS_LIMIT
-              attr = match[:attr].to_sym
-              blank_attrs = { attr => blank_attrs[attr] }
-              write_attribute(attr, nil)
-            else
-              raise error # If something else went wrong, let it propagate.
+            if attempts <= SAVE_ATTEMPTS_LIMIT
+              match = [
+                # Postgres
+                /Key \(#{attr_group}#{other_fields}\)=\([\w\s,]*\) already exists/,
+                # SQLite
+                /column(s)? #{attr_group}#{other_fields} (is|are) not unique/,
+                /UNIQUE constraint failed: #{self.class.table_name}\.#{attr_group}#{other_fields}:/
+              ].inject(nil) { |m, regex| m || regex.match(error.message) }
+
+              # If we've managed to hit the same unique attribute of a record
+              # already in the database, then we should wipe the attribute and
+              # try again
+              if match
+                attr = match[:attr].to_sym
+                blank_attrs = { attr => self.class.unique_attributes[attr] }
+                write_attribute(attr, nil)
+                next
+              end
             end
+
+            # If we're already at the attempts limit, or some other attribute
+            # was the problem, let the error propagate.
+            raise error
           end
         end
       else # If the unique values are already set, perform a regular save.

data/lib/unique_attributes/version.rb

@@ -1,3 +1,3 @@
 module UniqueAttributes
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/spec/config/test_setup_migration.rb

@@ -1,4 +1,11 @@
-class TestSetupMigration < ActiveRecord::Migration
+migration_class =
+  if ActiveRecord::VERSION::MAJOR >= 5
+    ActiveRecord::Migration[4.2]
+  else
+    ActiveRecord::Migration
+  end
+
+class TestSetupMigration < migration_class
   def up
     return if ActiveRecord::Base.connection.table_exists? :test_classes
 

data/spec/postgresql_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "shared/unique_attributes_examples"
+require "config/test_setup_migration"
 
 RSpec.describe "PostgreSQL" do
   before :all do

data/spec/shared/unique_attributes_examples.rb

@@ -109,5 +109,22 @@ RSpec.shared_examples ".unique_attribute" do
       MultiattributeTestClass.create!
       MultiattributeTestClass.create!
     end
+
+    context "when there's more than one conflict" do
+      it "retries all conflicting fields" do
+        # We stub the username/password generation such that the first time both
+        # username and password are generated, there are conflicts. We use
+        # expectations to ensure that both fields are re-generated as needed.
+        expect(MultiattributeTestClass).to receive(:generate_username).
+          exactly(3).times.
+          and_return("1", "1", "2")
+        expect(MultiattributeTestClass).to receive(:generate_password).
+          exactly(3).times.
+          and_return("A", "A", "B")
+
+        MultiattributeTestClass.create!
+        MultiattributeTestClass.create!
+      end
+    end
   end
 end

data/unique_attributes.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 4.0"
-  spec.add_dependency "activesupport", "~> 4.0"
+  spec.add_dependency "activerecord", ">= 4.0"
+  spec.add_dependency "activesupport", ">= 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unique_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Auto-assign unique attributes for ActiveRecord objects.