dependent_restrict 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a13975da1f4b033d23035fbddb74120b616bd9a0
+  data.tar.gz: 00c61e7a441bdda8223791f3e4b775e4e7c6d467
+SHA512:
+  metadata.gz: cb667fb26ec0e0d53fba2921f11be61a7495a44f120bcafbeeb74f3fd6116bbff39ad9b65c8ff87f60add46e1e253150f6cd97042e9e3688184abe962ffcf2ae
+  data.tar.gz: 7e35405f820b9c6a0a90e58a915680e50a61074581e5eb82f43b61ec7dd3a54dddc67c74bd49587e8e19838fdce960f18ab51daf695388a6bd419896db7cb4fe

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-script: "bundle exec rake coverage"
+  - 2.2.2
+  - 2.3.0
+script: "bundle exec rake spec"
 gemfile:
   - gemfiles/rails3.gemfile
-  - gemfiles/rails4_0.gemfile
-  - gemfiles/rails4_1.gemfile
+  - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 notifications:
   email:
     - support@travellink.com.au
-  flowdock: e69dcafad1fea15c6b8c76e9ced965af
+  flowdock:
+    secure: YaSDa7UIM2IN5iSrWDQAXly2VjA6AJ9/821oPjhF8w+tqeSJabCJAFTipOQoHr+5KD1yEGJsvbXYHQv9JBdAXUeXyitPG0sPyXBvLsnygxisrvahEFL7/G7rCWfW0QEL7qe6A5Zx5Zl6CfDCo/lXfRSzKasBoFvgbrrCjpTFEbg=
+sudo: false
+cache: bundler

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 group :development, :test do
   gem 'activerecord', '~> 4.0.0'
   gem 'mime-types', '< 2.0', :platforms => :ruby_18 # coveralls
-end
+end

data/README.md

@@ -1,6 +1,7 @@
 Dependent Restrict
 ==================
 
+[![Gem Version](https://badge.fury.io/rb/dependent_restrict.png)](http://badge.fury.io/rb/dependent_restrict)
 [![Build Status](https://travis-ci.org/sealink/dependent_restrict.png?branch=master)](https://travis-ci.org/sealink/dependent_restrict)
 [![Coverage Status](https://coveralls.io/repos/sealink/dependent_restrict/badge.png)](https://coveralls.io/r/sealink/dependent_restrict)
 [![Dependency Status](https://gemnasium.com/sealink/dependent_restrict.png?travis)](https://gemnasium.com/sealink/dependent_restrict)

data/Rakefile

@@ -9,10 +9,4 @@ desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
   t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
   # Put spec opts in a file named .rspec in root
-end
-
-desc "Generate SimpleCov test coverage and open in your browser"
-task :coverage do
-  ENV['COVERAGE'] = 'true'
-  Rake::Task['spec'].invoke
-end
+end

data/dependent_restrict.gemspec

@@ -1,12 +1,15 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'dependent_restrict/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "dependent_restrict"
-  spec.version       = "0.2.2"
-  spec.authors       = ["Michael Noack"]
-  spec.email         = ["support@travellink.com.au"]
+  spec.version       = DependentRestrict::VERSION
   spec.description   = %q{This gem is not needed in Rails 3 as dependent => :raise is included in 3.0.}
   spec.summary       = %q{Add dependent restrict and improves functionality to ActiveRecord 2/3/4.x.}
+  spec.authors       = ["Michael Noack"]
+  spec.email         = ['support@travellink.com.au']
   spec.homepage      = 'http://github.com/sealink/dependent_restrict'
 
   spec.license       = "MIT"
@@ -16,12 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", ">= 3.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-rcov"
-  spec.add_development_dependency "coveralls"
+  spec.add_dependency 'activerecord', '>= 3.0', '< 6.0.0'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-rcov'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'travis'
 end

data/gemfiles/rails3.gemfile

@@ -2,12 +2,6 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'rake', '~> 0.9.2'
-  gem 'rdoc', '~> 3.12'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'sqlite3'
   gem 'activerecord', '~> 3.2.0'
   gem 'mime-types', '< 2.0', :platforms => :ruby_18 # coveralls
 end

data/gemfiles/rails4.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 4.0'
+end

data/gemfiles/rails5.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 5.0'
+end

data/lib/dependent_restrict.rb

@@ -2,18 +2,11 @@ require 'active_record'
 require 'dependent_restrict/delete_restriction_error'
 
 module DependentRestrict
-  VERSION = '0.2.2'
-
   def self.included(base)
     super
     base.extend(ClassMethods)
 
     base.class_eval do
-      class << self
-        alias_method_chain :has_one, :restrict
-        alias_method_chain :has_many, :restrict
-        alias_method_chain :has_and_belongs_to_many, :restrict
-      end
     end
   end
 
@@ -23,7 +16,7 @@ module DependentRestrict
     # We should be aliasing configure_dependency_for_has_many but that method
     # is private so we can't. We alias has_many instead trying to be as fair
     # as we can to the original behaviour.
-    def has_one_with_restrict(*args, &extension)
+    def has_one(*args, &extension)
       options = args.extract_options! || {}
       if VALID_DEPENDENTS.include?(options[:dependent].try(:to_sym))
         reflection = if active_record_4?
@@ -36,10 +29,10 @@ module DependentRestrict
         add_dependency_callback!(reflection, options)
       end
       args << options
-      has_one_without_restrict(*args, &extension)
+      super(*args, &extension)
     end
 
-    def has_many_with_restrict(*args, &extension)
+    def has_many(*args, &extension)
       options = args.extract_options! || {}
       if VALID_DEPENDENTS.include?(options[:dependent].try(:to_sym))
         reflection = if active_record_4?
@@ -52,10 +45,10 @@ module DependentRestrict
         add_dependency_callback!(reflection, options)
       end
       args << options
-      has_many_without_restrict(*args, &extension)
+      super(*args, &extension)
     end
 
-    def has_and_belongs_to_many_with_restrict(*args, &extension)
+    def has_and_belongs_to_many(*args, &extension)
       options = args.extract_options! || {}
       if VALID_DEPENDENTS.include?(options[:dependent].try(:to_sym))
         reflection = if active_record_4?
@@ -70,7 +63,7 @@ module DependentRestrict
         options.delete(:dependent)
       end
       args << options
-      has_and_belongs_to_many_without_restrict(*args, &extension)
+      super(*args, &extension)
     end
 
     private
@@ -89,7 +82,7 @@ module DependentRestrict
             raise ActiveRecord::Rollback
           end
         end
-        before_destroy method_name
+        before_destroy method_name.to_sym
       when :restrict, :restrict_with_exception
         options.delete(:dependent)
         define_method(method_name) do
@@ -98,12 +91,12 @@ module DependentRestrict
             raise ActiveRecord::DetailedDeleteRestrictionError.new(name, self)
           end
         end
-        before_destroy method_name
+        before_destroy method_name.to_sym
       end
     end
 
     def active_record_4?
-      ::ActiveRecord::VERSION::MAJOR == 4
+      ::ActiveRecord::VERSION::MAJOR >= 4
     end
 
     def restrict_create_reflection(*args)

data/lib/dependent_restrict/version.rb

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

data/spec/dependent_restrict_spec.rb

@@ -40,7 +40,15 @@ describe DependentRestrict do
 
     after do
       [OrderInvoice, Order, Category, ProductsCategory, Product].each(&:delete_all)
-      %w(OrderInvoice Order Category ProductsCategory Product).each { |klass| Object.send(:remove_const, klass) }
+      classes_to_remove = %w(
+        OrderInvoice
+        Order
+        Category
+        ProductsCategory
+        Product
+        CategoryOrdersAssociationExtension
+      )
+      classes_to_remove.each { |klass| Object.send(:remove_const, klass) }
     end
 
 
@@ -137,6 +145,7 @@ describe DependentRestrict do
 
       context "using i18n" do
         before do
+          I18n.available_locales = [:en, :br]
           I18n.backend.store_translations(:br, {
             :dependent_restrict => {
               :basic_message => {

data/spec/spec_helper.rb

@@ -8,28 +8,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
-MINIMUM_COVERAGE = 81
-
-if ENV['COVERAGE']
-  require 'simplecov'
-  require 'coveralls'
-  Coveralls.wear!
-
-  SimpleCov.formatter = 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 'support/coverage_loader'
 
 require 'dependent_restrict'
 

data/spec/support/coverage_loader.rb

@@ -0,0 +1,26 @@
+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

metadata

@@ -1,142 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: dependent_restrict
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is not needed in Rails 3 as dependent => :raise is included
@@ -147,54 +150,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - dependent_restrict.gemspec
 - gemfiles/rails3.gemfile
-- gemfiles/rails4_0.gemfile
-- gemfiles/rails4_1.gemfile
+- gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - lib/dependent_restrict.rb
 - lib/dependent_restrict/delete_restriction_error.rb
+- lib/dependent_restrict/version.rb
 - spec/dependent_restrict_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/coverage_loader.rb
 homepage: http://github.com/sealink/dependent_restrict
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 551629118570124682
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 551629118570124682
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add dependent restrict and improves functionality to ActiveRecord 2/3/4.x.
 test_files:
 - spec/dependent_restrict_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/coverage_loader.rb

data/gemfiles/rails4_0.gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-gemspec :path => '../'
-
-group :development, :test do
-  gem 'rake', '~> 0.9.2'
-  gem 'rdoc', '~> 3.12'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'sqlite3'
-  gem 'activerecord', '~> 4.0.0'
-end
-

data/gemfiles/rails4_1.gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-gemspec :path => '../'
-
-group :development, :test do
-  gem 'rake', '~> 0.9.2'
-  gem 'rdoc', '~> 3.12'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'sqlite3'
-  gem 'activerecord', '~> 4.0'
-end
-