rescue_unique_constraint 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea30803708b58175b2ea038bb6ebcb03b69d8db9
-  data.tar.gz: e28a19b92f52f1a71ec80e21b9a5f2ef5ca02e91
+SHA256:
+  metadata.gz: 5f12a5f4ccf1af041c90798ddde6b3f8f8b548cdbc2993b692dcf443d25d09ef
+  data.tar.gz: 6a7e89ed993cf44c928db9725018ded393744c0b77880228e6f53b40433ed614
 SHA512:
-  metadata.gz: e0d875de50c7fe791881a78812d1c3bd6521ecf0b794acf3dc16ba067b5229a6f0648f96c1ebfcfebe5077e8b565be414ef95e592cfe126a7c51e6b1b51ca6a0
-  data.tar.gz: 4e8118681c357af946e7fc0cae167a96e4e90d2faaa46ec285bdc45078dfb5a990d77580ffd77bace0570f8b8465cc96773b050e709b80363a680d4e06771604
+  metadata.gz: b84fb7fba8e0337d08ac29daaa4620ade43460ac004bedb4dba0ef8e492850c226dab1daa094f0ee4d2e3285b1e5ff040ed2c2b43251fcc0ffdf22e1e2dce7d9
+  data.tar.gz: f3afed3102872303e40808aa92a314e1831dffc3b77cc83506ce7a2c39b54293f9c86026634ca5413b030b250ae1565ce8b259eb74535b5e166582f550b1c6a0

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/lib/rescue_unique_constraint/adapter/sqlite_adapter.rb

@@ -1,8 +1,18 @@
 module RescueUniqueConstraint
   module Adapter
     class SqliteAdapter
+      def initialize(table_name)
+        @table_name = table_name
+      end
+
+      # Sample error message returned by ActiveRecord for Sqlite Unique exception:
+      # 'SQLite3::ConstraintException: UNIQUE constraint failed: things.code, things.score: INSERT INTO "things" ("name", "test", "code", "score") VALUES (?, ?, ?, ?)'
+      #
+      # Step1: extract column names from above message on which unique constraint failed.
+      # Step2: Check if this index's field is among those columns.
       def index_error?(index, error_message)
-        error_message[/UNIQUE.*#{index.field}/]
+        column_names = error_message.scan(%r{(?<=#{@table_name}\.)\w+})
+        column_names.include?(index.field)
       end
     end
   end

data/lib/rescue_unique_constraint/rescue_handler.rb

@@ -30,7 +30,7 @@ module RescueUniqueConstraint
         when :postgresql
           Adapter::PostgresqlAdapter.new
         when :sqlite
-          Adapter::SqliteAdapter.new
+          Adapter::SqliteAdapter.new(@model.table_name)
         else
           raise "Database (#{database_name}) not supported"
         end

data/lib/rescue_unique_constraint/version.rb

@@ -1,3 +1,3 @@
 module RescueUniqueConstraint
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/rescue_unique_constraint.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'gem-release'
 end

data/spec/rescue_unique_constraint_spec.rb

@@ -2,17 +2,20 @@ require 'active_record'
 require 'rescue_unique_constraint'
 
 describe RescueUniqueConstraint do
-  before do
+  before :all do
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
     ActiveRecord::Schema.verbose = false
     ActiveRecord::Schema.define(:version => 1) do
       create_table :things do |t|
         t.string :name
         t.string :test
+        t.integer :code
+        t.integer :score
       end
 
       add_index :things, :name, unique: true, name: "idx_things_on_name_unique"
       add_index :things, :test, unique: true, name: "idx_things_on_test_unique"
+      add_index :things, [:code, :score], unique: true, name: "idx_things_on_code_and_score_unique"
     end
   end
 
@@ -20,13 +23,36 @@ describe RescueUniqueConstraint do
     include RescueUniqueConstraint
     rescue_unique_constraint index: "idx_things_on_name_unique", field: "name"
     rescue_unique_constraint index: "idx_things_on_test_unique", field: "test"
+    rescue_unique_constraint index: "idx_things_on_code_and_score_unique", field: "score"
+  end
+
+  before :each do
+    Thing.destroy_all
   end
 
   it "rescues unique constraint violations as activerecord errors" do
-    thing = Thing.create(name: "foo", test: 'bar')
-    dupe = Thing.new(name: "foo", test: 'bar')
+    thing = Thing.create(name: "foo", test: 'bar', code: 123, score: 1000)
+    dupe = Thing.new(name: "foo", test: 'baz', code: 456, score: 2000)
+    expect(dupe.save).to eql false
+    expect(dupe.errors.messages.keys).to contain_exactly(:name)
+    expect(dupe.errors[:name].first).to match /has already been taken/
+  end
+
+  it "adds error message to atrribute which caused unique-voilation" do
+    thing = Thing.create(name: "foo", test: 'bar', code: 123, score: 1000)
+    dupe = Thing.new(name: "lorem", test: 'bar', code: 456, score: 2000)
     expect(dupe.save).to eql false
-    expect(dupe.errors[:name].first).to match /taken/
-    expect(dupe.errors[:test].first).to match /taken/
+    expect(dupe.errors.messages.keys).to contain_exactly(:test)
+    expect(dupe.errors[:test].first).to match /has already been taken/
+  end
+
+  context "When unique contraint is voilated by a composite index" do
+    it "adds error message to user defined atrribute" do
+      thing = Thing.create(name: "foo", test: 'bar', code: 123, score: 1000)
+      dupe = Thing.new(name: "lorem", test: 'ipsum', code: 123, score: 1000)
+      expect(dupe.save).to eql false
+      expect(dupe.errors.messages.keys).to contain_exactly(:score)
+      expect(dupe.errors[:score].first).to match /has already been taken/
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescue_unique_constraint
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Tam Dang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,6 +115,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  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'
 description: Rescues unique constraint violations and turns them into ActiveRecord
   errors
 email:
@@ -126,6 +140,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Turns ActiveRecord::RecordNotUnique errors into ActiveRecord errors