dependent_restrict 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8feb61d8673fb8d7c47c9bcd17bbe61549b9f5b
-  data.tar.gz: 5228752defef4573852096371587e648fbed6cb2
+  metadata.gz: 5209e19995822bf472777d6201448a094fb3d187
+  data.tar.gz: 6cc0a772cc00306ce70584dbc8c6c967158b5d12
 SHA512:
-  metadata.gz: 8c464b58a1cdeb06c7eb614398b90400bb7365059a8c8ff8ba9eabe243cd071176d8518d7ef15ac88c48e0c089401ae103ebf608b25f294a37bc12ac70a82630
-  data.tar.gz: e4b732f96aa87dad2ad12793d2726a5d854fefa8ba760e9aa073a115bc7663b2d6ddd3bb7d327c5757a5854be166bdfecbad887749b817ead5a8ebfdc296de20
+  metadata.gz: 449ec1f1875a8c6734074b6d460bbf59dc86d5f7081e3aad72c79ee948d1587ba98d41cc6224fd478d9318bce3c04d3a5b6e8e6222797b1e0f5fb59b92a8315f
+  data.tar.gz: 38f9409944640ab6c44742ca9e72dee85b1efdcb0ec4a203446461437fcf97abd157a6643fb9eb7c1770c8defd1a4c01585e0b00261a8cf5f99ac3c490c20423

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) Tom Preston-Werner
+Copyright (c) The Sealink Travel Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/dependent_restrict.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_restrict'
-  s.version           = '0.1.1'
-  s.date              = '2013-11-27'
+  s.version           = '0.2.0'
+  s.date              = '2014-05-08'
   s.rubyforge_project = 'dependent_restrict'
 
   ## Make sure your summary is short. The description may be as long
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('activerecord', [">= 2.3.0", "< 5.0.0"])
+  s.add_dependency('activerecord', [">= 3.0", "< 5.0.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/lib/dependent_restrict.rb

@@ -2,7 +2,7 @@ require 'active_record'
 require 'dependent_restrict/delete_restriction_error'
 
 module DependentRestrict
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 
   def self.included(base)
     super
@@ -24,7 +24,7 @@ module DependentRestrict
     def has_one_with_restrict(*args) #:nodoc:
       reflection = if active_record_4?
         association_id, options, scope, extension = *args
-        create_reflection(:has_one, association_id, options || {}, scope || {}, self)
+        restrict_create_reflection(:has_one, association_id, options || {}, scope || {}, self)
       else
         association_id, options, extension = *args
         create_reflection(:has_one, association_id, options || {}, self)
@@ -35,7 +35,7 @@ module DependentRestrict
 
     def has_many_with_restrict(association_id, options = {}, &extension) #:nodoc:
       reflection = if active_record_4?
-        create_reflection(:has_many, association_id, options, scope ||= {}, self)
+        restrict_create_reflection(:has_many, association_id, options, scope ||= {}, self)
       else
         create_reflection(:has_many, association_id, options, self)
       end
@@ -44,7 +44,11 @@ module DependentRestrict
     end
 
     def has_and_belongs_to_many_with_restrict(association_id, options = {}, &extension)
-      reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self)
+      reflection = if active_record_4?
+        restrict_create_reflection(:has_and_belongs_to_many, association_id, options, scope ||= {}, self)
+      else
+        create_reflection(:has_and_belongs_to_many, association_id, options, self)
+      end
       add_dependency_callback!(reflection, options)
       options.delete(:dependent)
       has_and_belongs_to_many_without_restrict(association_id, options, &extension)
@@ -81,6 +85,14 @@ module DependentRestrict
       ::ActiveRecord::VERSION::MAJOR == 4
     end
 
+    def restrict_create_reflection(*args)
+      if ActiveRecord::Reflection.respond_to? :create
+        ActiveRecord::Reflection.create *args
+      else
+        create_reflection(*args)
+      end
+    end
+
   end
 end
 

data/lib/dependent_restrict/delete_restriction_error.rb

@@ -10,21 +10,27 @@ module ActiveRecord
     end
 
     def basic_message
-      name = @name.to_s.gsub('_', ' ')
       assoc = @record.send(@name)
       count = assoc.respond_to?(:count) ? assoc.count : (assoc ? 1 : 0)
+      name = I18n.t(@name.to_s.singularize, {
+        :scope => [:activerecord, :models],
+        :count => count,
+        :default => count == 1 ? @name.to_s.gsub('_', ' ') : @name.to_s.gsub('_', ' ').pluralize
+      }).downcase
+
       if count == 1
-        "Cannot delete record because dependent #{name} exists"
+        I18n.t('dependent_restrict.basic_message.one', :name => name, :default => "Cannot delete record because dependent #{name} exists")
       else
-        "Cannot delete record because #{count} dependent #{name.pluralize} exist"
+        I18n.t('dependent_restrict.basic_message.others', :count => count, :name => name, :default => "Cannot delete record because #{count} dependent #{name.pluralize} exist")
       end
     end
 
     def detailed_message
       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")}"
+      examples = @record.send(@name).limit(5).map{|o| "#{o.id}: #{o.to_s}"}
+      examples[4] = "...#{I18n.t('dependent_restrict.detailed_message.and_more', :count => count - 4, :default => "and #{count-4} more")}" if count > 5
+
+      basic_message + "\n\n\n#{I18n.t('dependent_restrict.detailed_message.includes', :default => "These include")}:\n#{examples.join("\n")}"
     end
   end
 end

data/spec/dependent_restrict_spec.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'spec_helper'
 
 DB_FILE = 'tmp/test_db'
@@ -115,6 +116,76 @@ describe DependentRestrict do
         Category.delete_all
         Order.delete_all
       end
+
+      context "using i18n" do
+        before do
+          I18n.backend.store_translations(:br, {
+            :dependent_restrict => {
+              :basic_message => {
+                :one => 'Não pode ser excluído pois um(a) %{name} relacionado(a) foi encontrado(a)',
+                :others => 'Não pode ser excluído pois %{count} %{name} relacionados(as) foram encontrados(as)'
+              },
+              :detailed_message => {
+                :and_more => "e mais %{count}",
+                :includes => "Incluindo"
+              }
+            },
+            :activerecord => {
+              :models => {
+                :order => {
+                  :one => "Pedido",
+                  :other => "Pedidos"
+                },
+                :order_invoice => {
+                  :one => "Ordem de pedido"
+                }
+              }
+            }
+          })
+
+          I18n.locale = :br
+        end
+
+        after do
+          I18n.locale = :en
+        end
+
+        it 'should restrict has_many relationships' do
+
+          category = Category.create!
+          5.times { Order.create!(:category => category) }
+          expect { category.reload.destroy }.to raise_error(
+            ActiveRecord::DetailedDeleteRestrictionError,
+            'Não pode ser excluído pois 5 pedidos relacionados(as) foram encontrados(as)'
+          )
+          begin
+            category.destroy
+          rescue ActiveRecord::DetailedDeleteRestrictionError => e
+            e.detailed_message.should == "Não pode ser excluído pois 5 pedidos relacionados(as) foram encontrados(as)\n\n\nIncluindo:\n13: Order 13\n14: Order 14\n15: Order 15\n16: Order 16\n17: Order 17"
+          end
+          1.times { Order.create!(:category => category) }
+          begin
+            category.destroy
+          rescue ActiveRecord::DetailedDeleteRestrictionError => e
+            e.detailed_message.should == "Não pode ser excluído pois 6 pedidos relacionados(as) foram encontrados(as)\n\n\nIncluindo:\n13: Order 13\n14: Order 14\n15: Order 15\n16: Order 16\n...e mais 2"
+          end
+
+          Order.destroy_all
+          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)
+          expect { order.reload.destroy }.to raise_error(
+            ActiveRecord::DetailedDeleteRestrictionError,
+            'Não pode ser excluído pois um(a) ordem de pedido relacionado(a) foi encontrado(a)'
+          )
+
+          order_invoice.destroy
+          expect { order.reload.destroy }.to_not raise_error
+        end
+      end
     end
 
 

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: dependent_restrict
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - <
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - <
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 description: This gem is not needed in Rails 3 as dependent => :raise is included
@@ -58,22 +58,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dependent_restrict
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 2
 summary: Add dependent restrict and improves functionality to ActiveRecord 2/3/4.x.