dependent_restrict 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a13975da1f4b033d23035fbddb74120b616bd9a0
-  data.tar.gz: 00c61e7a441bdda8223791f3e4b775e4e7c6d467
+  metadata.gz: 419625dae9ead42079c955404a75b04bdff01f69
+  data.tar.gz: eee3360dd08cd3d2ed0d6723ceb9618e9b36b15f
 SHA512:
-  metadata.gz: cb667fb26ec0e0d53fba2921f11be61a7495a44f120bcafbeeb74f3fd6116bbff39ad9b65c8ff87f60add46e1e253150f6cd97042e9e3688184abe962ffcf2ae
-  data.tar.gz: 7e35405f820b9c6a0a90e58a915680e50a61074581e5eb82f43b61ec7dd3a54dddc67c74bd49587e8e19838fdce960f18ab51daf695388a6bd419896db7cb4fe
+  metadata.gz: db2746a76da5913fa2c93c0efa8c9f99c9cd5318a4e991dcb2d1be3f8246723389fbe7f231cc0a06eabe1b85626cc47682799b81e63d10ac8f6ab4548b374276
+  data.tar.gz: 7c82199bafdae295cc3015ce60bc437694b1617dc1332149719411664d484ca42b364a54ccf3da28f192611d2bbcfed36278ca2a06071182e1868a92b8a2fac5

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+All notable changes to this project will be documented in this file.  
+This project adheres to [Semantic Versioning](http://semver.org/).  
+This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).  
+
+## Unreleased
+
+## 0.2.4
+### Added
+- Support has and belongs to many in rails 4+
+- Enforce minimum coverage in tests
+- [TT-1392] Changelog file
+
+## 0.2.3
+### Added
+- Support rails 5
+- Improve testing of ruby/rails versions

data/dependent_restrict.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'

data/lib/dependent_restrict.rb

@@ -52,7 +52,6 @@ module DependentRestrict
       options = args.extract_options! || {}
       if VALID_DEPENDENTS.include?(options[:dependent].try(:to_sym))
         reflection = if active_record_4?
-          raise ArgumentError, "dependent_restrict doesn't work with has_and_belongs_to_many. Use equivalent rails 4.1 has_many :through" if ActiveRecord::Reflection.respond_to? :create
           association_id, scope = *args
           restrict_create_reflection(:has_and_belongs_to_many, association_id, scope || {}, options, self)
         else
@@ -101,6 +100,10 @@ module DependentRestrict
 
     def restrict_create_reflection(*args)
       if ActiveRecord::Reflection.respond_to? :create
+        if args[0] == :has_and_belongs_to_many
+          args[0] = :has_many
+          args[3][:through] = [self.table_name, args[1].to_s].sort.join('_')
+        end
         ActiveRecord::Reflection.create *args
       else
         create_reflection(*args)

data/lib/dependent_restrict/version.rb

@@ -1,3 +1,3 @@
 module DependentRestrict
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/dependent_restrict_spec.rb

@@ -18,33 +18,35 @@ describe DependentRestrict do
       end
 
       class Category < ActiveRecord::Base
+        has_and_belongs_to_many :products
+
         def to_s
           "Category #{id}"
         end
       end
 
-      class ProductsCategory < ActiveRecord::Base
+      class CategoriesProduct < ActiveRecord::Base
         belongs_to :product
         belongs_to :category
       end
 
       class Product < ActiveRecord::Base
-        if ActiveRecord::Reflection.respond_to? :create
-          has_many :categories, :through => :products_categories
-        else
-          has_and_belongs_to_many :categories
+        has_and_belongs_to_many :categories
+
+        def to_s
+          "Product #{id}"
         end
       end
 
     end
 
     after do
-      [OrderInvoice, Order, Category, ProductsCategory, Product].each(&:delete_all)
+      [OrderInvoice, Order, Category, CategoriesProduct, Product].each(&:delete_all)
       classes_to_remove = %w(
         OrderInvoice
         Order
         Category
-        ProductsCategory
+        CategoriesProduct
         Product
         CategoryOrdersAssociationExtension
       )
@@ -87,6 +89,12 @@ describe DependentRestrict do
           end
 
           has_many :order_invoices, :through => :orders, :dependent => :restrict_with_exception
+
+          has_and_belongs_to_many :products, dependent: :restrict_with_exception
+        end
+
+        class Product < ActiveRecord::Base
+          has_and_belongs_to_many :categories
         end
       end
 
@@ -95,7 +103,26 @@ describe DependentRestrict do
       end
 
       it 'should create the reflections on Category' do
-        expect(Category.reflect_on_all_associations.map(&:name)).to eq [:orders, :order_invoices]
+        expect(Category.reflect_on_all_associations.map(&:name)).to eq [:products, :orders, :order_invoices]
+      end
+
+      it 'should restrict has_and_belongs_to_many relationships' do
+        product = Product.create!
+        category = Category.create!
+        category.products = [product]
+
+        expect { category.reload.destroy }.to raise_error(
+                                                  ActiveRecord::DetailedDeleteRestrictionError,
+                                                  'Cannot delete record because dependent products exists'
+                                              )
+        begin
+          category.destroy
+        rescue ActiveRecord::DetailedDeleteRestrictionError => e
+          expect(e.detailed_message).to eq "Cannot delete record because dependent products exists\n\n\nThese include:\n1: Product 1"
+        end
+
+        Product.destroy_all
+        expect { category.reload.destroy }.to_not raise_error
       end
 
       it 'should restrict has_many relationships' do

data/spec/schema.rb

@@ -15,7 +15,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :products do |t|
   end
 
-  create_table :products_categories do |t|
+  create_table :categories_products do |t|
     t.integer :product_id, :category_id
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'active_record'
 require 'support/coverage_loader'
 
 require 'dependent_restrict'

data/spec/support/coverage_loader.rb

@@ -1,26 +1,5 @@
-MINIMUM_COVERAGE = 40
-
-unless ENV['COVERAGE'] == 'off'
-  require 'simplecov'
-  require 'simplecov-rcov'
-  require 'coveralls'
-  Coveralls.wear!
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::RcovFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start do
-    add_filter '/vendor/'
-    add_filter '/spec/'
-    add_group 'lib', 'lib'
-  end
-  SimpleCov.at_exit do
-    SimpleCov.result.format!
-    percent = SimpleCov.result.covered_percent
-    unless percent >= MINIMUM_COVERAGE
-      puts "Coverage must be above #{MINIMUM_COVERAGE}%. It is #{"%.2f" % percent}%"
-      Kernel.exit(1)
-    end
-  end
-end
+require 'simplecov-rcov'
+require 'coveralls'
+require 'coverage/kit'
+minimum_coverage = ActiveRecord::VERSION::MAJOR >= 4 ? 92.2 : 86.6
+Coverage::Kit.setup(minimum_coverage: minimum_coverage)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependent_restrict
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,6 +153,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Add dependent restrict and improves functionality to ActiveRecord 2/3/4.x.