rails_devs_for_data_integrity 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rails_devs_for_data_integrity.rb

@@ -56,9 +56,14 @@ module ActiveRecord::RailsDevsForDataIntegrity
     #  class User < ActiveRecord::Base
     #    handle_unique_key_violation :user_name, :message => 'is taken"
     #  end
-    def handle_unique_key_violation(name, options={})
+    def handle_unique_key_violation(*args)
       alias_data_integrity_methods
-      self.unique_key_check_options = options.merge(:field_name => name)
+      options = args.extract_options! || {}
+      options.symbolize_keys!
+
+      args.each do |name|
+        self.unique_key_check_options[ name.to_sym ]= options.merge(:field_name => name)
+      end
     end
 
     # Handle a MySQL foreign key violation by placing an error message on violating
@@ -95,11 +100,16 @@ module ActiveRecord::RailsDevsForDataIntegrity
       alias_data_integrity_methods
     end
 
+    #enable uniqueness and foreign key checks for all ActiveRecord instances
+    def enable_all_database_violation_checks
+      ActiveRecord::Base.alias_data_integrity_methods
+    end
+
     protected
 
     #alias insert and update methods
     def alias_data_integrity_methods#:nodoc:
-      return if method_defined?(:create_or_update_without_data_integrity_check)
+      return if method_defined?( :save_without_data_integrity_check! )
       alias_method_chain :create_or_update, :data_integrity_check
       alias_method_chain :save!, :data_integrity_check
     end
@@ -107,9 +117,15 @@ module ActiveRecord::RailsDevsForDataIntegrity
 
   # Add a duplicate error message to errors based on the exception
   def add_unique_key_error(exception)
-    if unique_key_check_options[:field_name]
-      self.errors.add(unique_key_check_options[:field_name], unique_key_check_options[:message]||"is a duplicate.")
+    unless unique_key_check_options.blank?
+      # we are not sure which violation occurred if we have multiple entries
+      # since mysql does not return a good error message
+      # add them all
+      unique_key_check_options.each do |name, options|
+        self.errors.add(options[:field_name], options[:message]||"has already been taken.")
+      end
     else
+      unique_key_check_options.keys
       self.errors.add_to_base(unique_key_check_options[:message]||"Duplicate field.")
     end
   end
@@ -135,16 +151,6 @@ module ActiveRecord::RailsDevsForDataIntegrity
     end
   end
 
-  # The classes unique key check options
-  def unique_key_check_options
-    self.class.unique_key_check_options
-  end
-
-  # The classes foreign key check options
-  def foreign_key_check_options
-    self.class.foreign_key_check_options
-  end
-
   # If +exception+ is a unique key violation or a foreign key error,
   # excute the block if it exists. If not and a record exists, add the
   # appropriate error messages. Reraise any exceptions that are not data integrity violation errors
@@ -206,11 +212,10 @@ module ActiveRecord::RailsDevsForDataIntegrity
   # RecordNotSaved will be thrown by save! before converting to the standard
   # validation error ActiveRecord::RecordInvalid
   def save_with_data_integrity_check!(*args)
-    unless save(*args)
-      raise ActiveRecord::RecordInvalid.new(self) if @duplicate_exception||@foreign_key_exception
-      raise ActiveRecord::RecordNotSaved 
-    end
-    true
+    save_without_data_integrity_check!(*args)
+  rescue ActiveRecord::RecordNotSaved => e
+    raise ActiveRecord::RecordInvalid.new(self) if @duplicate_exception||@foreign_key_exception
+    raise e
   end
 end
 

data/rails_devs_for_data_integrity.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_devs_for_data_integrity}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blythe Dunham"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_devs_for_data_integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Blythe Dunham