proper_active_record_uniqueness_validations 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0812f2e67144280ab20dd446f5bd07018b59ca9
-  data.tar.gz: e71c43c92c1cd62774801f6d838a3c8596f19ba4
+  metadata.gz: fbca33d6b0e92edde3ab4db1a217a382e70cb4fd
+  data.tar.gz: 9f64286739ee114ce953d45b04f81ad6bdf33ba5
 SHA512:
-  metadata.gz: e68d3cabd0f850cab506af17fe72dfed9d0bf0cc4bcd33624b45a359c2e0b3bf65ac2122e8129843090d8ff25f7e5d06a6208337446f1537294f19ef50b2fede
-  data.tar.gz: edec40435139d336435431e5838c956032cfd638b2581a450ca29e6662eae6d6219e06fa207210d1f1d10328a83d643791b589d29b35792df177b03a9e3820a9
+  metadata.gz: bc03bc554b965bc73bbabae31068efc5ee27088aeda5fe75a8e1f5805c14175f3e8b6e263910b9f606a3f9600d682d55a096b58c6ef7c20fc43907161825bb6e
+  data.tar.gz: ea5132f6498f35677a60d5e86ce37bff1d4bfb304320d7db7ae7761ef9b8ee40b2e204d4078e41c6c201faada68f8b4aeae17cd841289811b63c883e0b26fc9c

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.1.3
+- Fix typo in error message
+- Try and be locale independent when determining the violated index' name
+- Clean up and restructure the exception processing code
+
 0.1.2
 - Drop pg version in gem dependencies
 - Add CHANGELOG

data/lib/proper_uniqueness_validation.rb

@@ -1,10 +1,22 @@
 module ProperUniquenessValidation
-  UNIQUE_INDEX_VIOLATION_RE = %r{duplicate key value violates unique constraint "([^"]+)"}
-
   def self.included( base )
     base.extend ClassMethods
   end
 
+  def self.extract_index_name_from_exception( connection, exception )
+    case connection
+      when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+        extract_index_name_from_postgres_exception( exception )
+
+      else raise exception
+    end
+  end
+
+  def self.extract_index_name_from_postgres_exception( exception )
+    match = exception.original_exception.result.error_field( PGresult::PG_DIAG_MESSAGE_PRIMARY ).match(/"([^"]+)"/ )
+    match[1]
+  end
+
   module ClassMethods
     def uniqueness_error_attribute_for( index_name, attribute_name ) 
       @_uniqueness_index_attribute_mapping ||= {}
@@ -20,18 +32,20 @@ module ProperUniquenessValidation
   def create_or_update
     super
   rescue ActiveRecord::RecordNotUnique => e
-    e.message.match( UNIQUE_INDEX_VIOLATION_RE ) do |match|
-      attribute = self.class._uniqueness_error_attribute_for( match[1] )
+    klass = self.class
+    raise unless klass.respond_to?( :connection )
 
-      if !attribute
-        #TODO: Test this
-        logger.warn "Caught uniqueness exceptions but index '#{match[1]}' was not registered\nAdd a \"uniquness_error_attribute_for 'index_name', :error_attribute_name\"\nclause to your model '#{self.class}'!"
-        raise
-      end
+    index_name = ProperUniquenessValidation.extract_index_name_from_exception( klass.connection, e )
+    attribute = klass._uniqueness_error_attribute_for( index_name )
 
-      self.errors.add( attribute, :taken, :value => self.send( attribute ) )
+    if !attribute
+      #TODO: Test this
+      logger.warn "Caught uniqueness exceptions but index '#{index_name}' was not registered\nAdd a \"uniqueness_error_attribute_for 'index_name', :error_attribute_name\"\nclause to your model '#{klass}'!"
+      raise
     end
 
+    self.errors.add( attribute, :taken, :value => self.send( attribute ) )
+
     return false
   end
 end

data/proper_active_record_uniqueness_validations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|                                                   
   s.name = "proper_active_record_uniqueness_validations"                                                                
-  s.version = "0.1.2"                                                           
+  s.version = "0.1.3"                                                           
                                                                                 
   s.required_ruby_version = ">= 1.9.3"                                       
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

data/test/Gemfile

@@ -9,6 +9,7 @@ gem 'pg'
 
 gem 'rspec-rails', :group => :test
 gem 'database_cleaner', :group => :test
+gem 'byebug', :group => :test
 
 
 

data/test/Gemfile.lock

@@ -30,7 +30,12 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
+    byebug (1.6.1)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    columnize (0.3.6)
     database_cleaner (0.9.1)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.3)
@@ -96,6 +101,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   database_cleaner
   pg
   rails (= 3.2.13)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proper_active_record_uniqueness_validations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sven Riedel
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Uses unique indexes on the database level to see and deal with uniqueness