dependent_protect 0.0.4 → 0.0.5

data/Gemfile

@@ -8,5 +8,5 @@ group :development, :test do
   gem 'simplecov'
   gem 'simplecov-rcov'
   gem 'sqlite3'
-  gem 'activerecord', '2.3.14'
+  gem 'activerecord', '~> 3.0'
 end

data/dependent_protect.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'dependent_protect'
-  s.version           = '0.0.4'
-  s.date              = '2012-06-10'
+  s.version           = '0.0.5'
+  s.date              = '2012-07-15'
   s.rubyforge_project = 'dependent_protect'
 
   ## Make sure your summary is short. The description may be as long

data/lib/dependent_protect.rb

@@ -4,7 +4,7 @@ require 'active_record'
 require 'dependent_protect/delete_restriction_error'
 
 module DependentProtect
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   def self.included(base)
     super
@@ -38,6 +38,7 @@ module DependentProtect
     def has_and_belongs_to_many_with_protect(association_id, options = {}, &extension)
       reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self)
       add_dependency_callback!(reflection, options)
+      options.delete(:dependent)
       has_and_belongs_to_many_without_protect(association_id, options, &extension)
     end
 
@@ -60,7 +61,7 @@ module DependentProtect
         define_method(method_name) do
           method = reflection.collection? ? :empty? : :nil?
           unless send(reflection.name).send(method)
-            raise ActiveRecord::DeleteRestrictionError.new(reflection, self)
+            raise ActiveRecord::DetailedDeleteRestrictionError.new(reflection.name, self)
           end
         end
         before_destroy method_name

data/lib/dependent_protect/delete_restriction_error.rb

@@ -1,29 +1,30 @@
+require 'active_record/associations'
+
 module ActiveRecord
   # This error is raised when trying to destroy a parent instance in N:1 or 1:1 associations
   # (has_many, has_one) when there is at least 1 child associated instance.
   # ex: if @project.tasks.size > 0, DeleteRestrictionError will be raised when trying to destroy @project
-  class DeleteRestrictionError < ActiveRecordError #:nodoc:
-    def initialize(reflection, record)
-      @reflection = reflection
+  class DetailedDeleteRestrictionError < ActiveRecordError #:nodoc:
+    def initialize(name, record)
+      @name = name
       @record = record
       super(basic_message)
     end
 
     def basic_message
-      single = @reflection.class_name.to_s.underscore.gsub('_', ' ')
-      if [:has_many, :has_and_belongs_to_many].include?(@reflection.macro)
-        count = @record.send(@reflection.name).count
-        type = count == 1 ? single : single.pluralize
-        exist = (count == 1 ? 'exists' : 'exist')
-        "Cannot delete record because #{count} dependent #{type} #{exist}"
+      name = @name.to_s.gsub('_', ' ')
+      assoc = @record.send(@name)
+      count = assoc.respond_to?(:count) ? assoc.count : (assoc ? 1 : 0)
+      if count == 1
+        "Cannot delete record because dependent #{name} exists"
       else
-        "Cannot delete record because dependent #{single} exists"
+        "Cannot delete record because #{count} dependent #{name.pluralize} exist"
       end
     end
 
     def detailed_message
-      count = @record.send(@reflection.name).count
-      examples = @record.send(@reflection.name).all(:limit => 5).map{|o| "#{o.id}: #{o.to_s}"}
+      count = @record.send(@name).count
+      examples = @record.send(@name).all(:limit => 5).map{|o| "#{o.id}: #{o.to_s}"}
       examples[4] = "...and #{count - 4} more" if count > 5
       basic_message + "\n\n\nThese include:\n#{examples.join("\n")}"
     end

data/spec/dependent_protect_spec.rb

@@ -31,30 +31,36 @@ describe DependentProtect do
   it 'should restrict has_many relationships' do
     category = Category.create!
     5.times { Order.create!(:category => category) }
-    lambda{category.reload.destroy}.should raise_error(ActiveRecord::DeleteRestrictionError, 'Cannot delete record because 5 dependent orders exist')
+    expect { category.reload.destroy }.to raise_error(
+      ActiveRecord::DetailedDeleteRestrictionError,
+      'Cannot delete record because 5 dependent orders exist'
+    )
     begin
       category.destroy
-    rescue ActiveRecord::DeleteRestrictionError => e
+    rescue ActiveRecord::DetailedDeleteRestrictionError => e
       e.detailed_message.should == "Cannot delete record because 5 dependent orders exist\n\n\nThese include:\n1: Order 1\n2: Order 2\n3: Order 3\n4: Order 4\n5: Order 5"
     end
     1.times { Order.create!(:category => category) }
     begin
       category.destroy
-    rescue ActiveRecord::DeleteRestrictionError => e
+    rescue ActiveRecord::DetailedDeleteRestrictionError => e
       e.detailed_message.should == "Cannot delete record because 6 dependent orders exist\n\n\nThese include:\n1: Order 1\n2: Order 2\n3: Order 3\n4: Order 4\n...and 2 more"
     end
 
     Order.destroy_all
-    lambda{category.reload.destroy}.should_not raise_error
+    expect{category.reload.destroy}.to_not raise_error
   end
 
   it 'should restrict has_one relationships' do
     order = Order.create!
     order_invoice = OrderInvoice.create!(:order => order)
-    lambda{order.reload.destroy}.should raise_error(ActiveRecord::DeleteRestrictionError, 'Cannot delete record because dependent order invoice exists')
+    expect{order.reload.destroy}.to raise_error(
+      ActiveRecord::DetailedDeleteRestrictionError,
+      'Cannot delete record because dependent order invoice exists'
+    )
 
     order_invoice.destroy
-    lambda{order.reload.destroy}.should_not raise_error
+    expect{order.reload.destroy}.to_not raise_error
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependent_protect
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,6 +67,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4507460947827537024
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dependent_protect
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Add dependent protect/restrict functionality to ActiveRecord 2.x.