dependent_restrict 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDhiYjQwNjJiNGM4OTFkNmU2MWFiMzM2OTE2N2ZmZmNkZGY5NWQ4ZA==
-  data.tar.gz: !binary |-
-    MDA1NmZhODg4NzUxOThjNjg5MjlkZDIzYjlkNTczM2RiODI4NmFjOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZmUyZDMzNDc0YTcwYjUyYzY0NWI5ZDAyODRlNGY2MDZiNDdlNDM1M2Y2Njhk
-    YTMxYTM2MjMxYTQ2NjMyMDI1MjQzMjA3OGM1MDBlMGFjNzk4ODM4NzUwMzFh
-    N2Y4ZGVkMDNkODdmNzAwOTZmY2Y0ZjFhYzdhMDIyYjI0NGJkY2M=
-  data.tar.gz: !binary |-
-    ODJmMDViYmFkMWM1NzkwZDIzYzFhMWY4ZDUwZmNhMDdlN2ExMzc0ZDQ5YzNj
-    NDQ2OTEyNTFiMWVmOWNlN2M5NzFhYjFlMTA4MWM1NDA4MTg1NzVmZjE0MmU1
-    M2M4NGJmZDRmZjE3ZDFkMjQ5Y2M4M2MzYmFjOWNjM2IyMTFiMmI=
+SHA1:
+  metadata.gz: e8feb61d8673fb8d7c47c9bcd17bbe61549b9f5b
+  data.tar.gz: 5228752defef4573852096371587e648fbed6cb2
+SHA512:
+  metadata.gz: 8c464b58a1cdeb06c7eb614398b90400bb7365059a8c8ff8ba9eabe243cd071176d8518d7ef15ac88c48e0c089401ae103ebf608b25f294a37bc12ac70a82630
+  data.tar.gz: e4b732f96aa87dad2ad12793d2726a5d854fefa8ba760e9aa073a115bc7663b2d6ddd3bb7d327c5757a5854be166bdfecbad887749b817ead5a8ebfdc296de20

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 group :development, :test do

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.0'
-  s.date              = '2013-09-14'
+  s.version           = '0.1.1'
+  s.date              = '2013-11-27'
   s.rubyforge_project = 'dependent_restrict'
 
   ## Make sure your summary is short. The description may be as long
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.authors  = ["Michael Noack"]
   s.email    = 'development@travellink.com.au'
   s.homepage = 'http://github.com/sealink/dependent_restrict'
+  s.license  = 'MIT'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
@@ -68,7 +69,7 @@ Gem::Specification.new do |s|
     gemfiles/rails4.gemfile
     lib/dependent_restrict.rb
     lib/dependent_restrict/delete_restriction_error.rb
-    spec/dependent_protect_spec.rb
+    spec/dependent_restrict_spec.rb
     spec/schema.rb
     spec/spec_helper.rb
   ]

data/lib/dependent_restrict.rb

@@ -2,7 +2,7 @@ require 'active_record'
 require 'dependent_restrict/delete_restriction_error'
 
 module DependentRestrict
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   def self.included(base)
     super
@@ -24,12 +24,12 @@ 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)
+        create_reflection(:has_one, association_id, options || {}, scope || {}, self)
       else
         association_id, options, extension = *args
-        create_reflection(:has_one, association_id, options, self)
+        create_reflection(:has_one, association_id, options || {}, self)
       end
-      add_dependency_callback!(reflection, options)
+      add_dependency_callback!(reflection, options || {})
       has_one_without_restrict(*args) #association_id, options, &extension)
     end
 

data/spec/dependent_restrict_spec.rb

@@ -0,0 +1,163 @@
+require 'spec_helper'
+
+DB_FILE = 'tmp/test_db'
+FileUtils.mkdir_p File.dirname(DB_FILE)
+FileUtils.rm_f DB_FILE
+
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_FILE
+
+load 'spec/schema.rb'
+
+
+describe DependentRestrict do
+
+  context 'when associations are defined' do
+    before do
+      class OrderInvoice < ActiveRecord::Base
+        belongs_to :order
+      end
+
+      class Order < ActiveRecord::Base
+        belongs_to :category
+
+        def to_s
+          "Order #{id}"
+        end
+      end
+
+      class Category < ActiveRecord::Base
+        def to_s
+          "Category #{id}"
+        end
+      end
+    end
+
+    after do
+      %w(OrderInvoice Order Category).each { |klass| Object.send(:remove_const, klass) }
+    end
+
+
+    context 'when not restricting' do
+      it 'should allow creating reflections' do
+        expect {
+          class Order < ActiveRecord::Base
+            has_one :order_invoice
+          end
+
+          class Category < ActiveRecord::Base
+            has_many :orders do
+              def active
+                self.select(&:active?)
+              end
+            end
+          end
+        }.to_not raise_error
+      end
+    end
+
+
+    context 'when restricting with exception' do
+      before do
+        class Order < ActiveRecord::Base
+          has_one :order_invoice, :dependent => :restrict_with_exception
+        end
+
+        class Category < ActiveRecord::Base
+          has_many :orders, :dependent => :restrict_with_exception do
+            def active
+              self.select(&:active?)
+            end
+          end
+        end
+      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,
+                                                  'Cannot delete record because 5 dependent orders exist'
+                                              )
+        begin
+          category.destroy
+        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::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
+        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,
+                                               'Cannot delete record because dependent order invoice exists'
+                                           )
+
+        order_invoice.destroy
+        expect { order.reload.destroy }.to_not raise_error
+      end
+
+      it 'should still filter active' do
+        category = Category.create!
+        3.times { Order.create!(:category => category, :active => true) }
+        2.times { Order.create!(:category => category, :active => false) }
+        category.orders.active.count.should == 3
+
+        Category.delete_all
+        Order.delete_all
+      end
+    end
+
+
+    context 'when restricting with error' do
+      before do
+        class Order < ActiveRecord::Base
+          has_one :order_invoice, :dependent => :restrict_with_error
+        end
+
+        class Category < ActiveRecord::Base
+          has_many :orders, :dependent => :restrict_with_error do
+            def active
+              self.select(&:active?)
+            end
+          end
+        end
+      end
+
+      it 'should restrict has_many relationships' do
+        category = Category.create!
+        Category.count.should == 1
+        5.times { Order.create!(:category => category) }
+        category.destroy
+        Category.count.should == 1
+        Order.destroy_all
+        category.reload.destroy
+        Category.count.should == 0
+      end
+
+      it 'should restrict has_one relationships' do
+        order = Order.create!
+        Order.count.should == 1
+        order_invoice = OrderInvoice.create!(:order => order)
+        order.reload.destroy
+        Order.count.should == 1
+
+        order_invoice.destroy
+        order.reload.destroy
+        Order.count.should == 0
+      end
+    end
+  end
+
+
+end
+

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dependent_restrict
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-11-27 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
     - - <
@@ -24,7 +24,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
     - - <
@@ -49,11 +49,12 @@ files:
 - gemfiles/rails4.gemfile
 - lib/dependent_restrict.rb
 - lib/dependent_restrict/delete_restriction_error.rb
-- spec/dependent_protect_spec.rb
+- spec/dependent_restrict_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 homepage: http://github.com/sealink/dependent_restrict
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -62,17 +63,17 @@ 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.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 2
 summary: Add dependent restrict and improves functionality to ActiveRecord 2/3/4.x.

data/spec/dependent_protect_spec.rb

@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-DB_FILE = 'tmp/test_db'
-FileUtils.mkdir_p File.dirname(DB_FILE)
-FileUtils.rm_f DB_FILE
-
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_FILE
-
-load 'spec/schema.rb'
-
-
-describe DependentRestrict do
-  context 'should restrict' do
-    before do
-      class OrderInvoice < ActiveRecord::Base
-        belongs_to :order
-      end
-
-      class Order < ActiveRecord::Base
-        belongs_to :category
-        has_one :order_invoice, :dependent => :restrict_with_exception
-        def to_s
-          "Order #{id}"
-        end
-      end
-
-      class Category < ActiveRecord::Base
-        has_many :orders, :dependent => :restrict_with_exception do
-          def active
-            self.select(&:active?)
-          end
-        end
-        def to_s
-          "Category #{id}"
-        end
-      end
-    end
-
-    after do
-      %w(OrderInvoice Order Category).each { |klass| Object.send(:remove_const, klass) }
-    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,
-        'Cannot delete record because 5 dependent orders exist'
-      )
-      begin
-        category.destroy
-      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::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
-      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,
-        'Cannot delete record because dependent order invoice exists'
-      )
-
-      order_invoice.destroy
-      expect{order.reload.destroy}.to_not raise_error
-    end
-
-    it 'should still filter active' do
-      category = Category.create!
-      3.times { Order.create!(:category => category, :active => true) }
-      2.times { Order.create!(:category => category, :active => false) }
-      category.orders.active.count.should == 3
-
-      Category.delete_all
-      Order.delete_all
-    end
-  end
-
-  context 'should restrict_with_error' do
-    before do
-      class OrderInvoice < ActiveRecord::Base
-        belongs_to :order
-      end
-
-      class Order < ActiveRecord::Base
-        belongs_to :category
-        has_one :order_invoice, :dependent => :restrict_with_error
-        def to_s
-          "Order #{id}"
-        end
-      end
-
-      class Category < ActiveRecord::Base
-        has_many :orders, :dependent => :restrict_with_error
-        def to_s
-          "Category #{id}"
-        end
-      end
-    end
-
-    after do
-      %w(OrderInvoice Order Category).each { |klass| Object.send(:remove_const, klass) }
-    end
-
-    it 'should restrict has_many relationships' do
-      category = Category.create!
-      Category.count.should == 1
-      5.times { Order.create!(:category => category) }
-      category.destroy
-      Category.count.should == 1
-      Order.destroy_all
-      category.reload.destroy
-      Category.count.should == 0
-    end
-
-    it 'should restrict has_one relationships' do
-      order = Order.create!
-      Order.count.should == 1
-      order_invoice = OrderInvoice.create!(:order => order)
-      order.reload.destroy
-      Order.count.should == 1
-
-      order_invoice.destroy
-      order.reload.destroy
-      Order.count.should == 0
-    end
-  end
-end
-