protective 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0dfc31d7a1219447cc46645f4b5c7d0dbe74ac64
+  data.tar.gz: c73c7eabbefbec37e5e6645538c4342cb97c5e88
+SHA512:
+  metadata.gz: f2c97c8f6657b28630e4190a1a554a60d4378daacd938601dd19255054047c2eb1e296c957ce72b48c7f50e1f6d3c7535a7ff84f9188efbe6075786d2254e1eb
+  data.tar.gz: 9177fd36fc0980acc58680df79cb75e6e6a49709020a735e5c72c03511aa9317030f4b3f6a0ae12b6227b8f85f3b0e5fee442eddc25dc68bb8fe899d0a7e279e

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+
+rvm:
+  - 2.4.1

data/Gemfile

@@ -1,15 +1,14 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org"
 
 gem "activerecord"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "sqlite3"
+  gem "bundler"
+  gem "jeweler"
+  gem "simplecov"
+  gem 'sqlite3', :platforms => :ruby
+  gem 'jdbc-sqlite3', :platforms => :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 end

data/Gemfile.lock

@@ -1,35 +1,90 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.7)
-    builder (2.1.2)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
+      arel (~> 8.0)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    docile (1.1.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.5)
+    highline (1.7.8)
+    i18n (0.8.6)
+    jeweler (2.3.7)
+      builder
+      bundler (>= 1)
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    sqlite3 (1.3.3)
-    tzinfo (0.3.24)
+      rdoc
+      semver2
+    json (2.1.0)
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    semver2 (3.4.2)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
+  activerecord-jdbcsqlite3-adapter
+  bundler
+  jdbc-sqlite3
+  jeweler
+  simplecov
   sqlite3
+
+BUNDLED WITH
+   1.15.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Pascal Zumkehr
+Copyright (c) 2011-2017 Pascal Zumkehr
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,12 +1,15 @@
 = protective
 
+{<img src="https://secure.travis-ci.org/codez/protective.png" />}[http://travis-ci.org/codez/protective]
+
 In your ActiveRecord models, you used to protect the instances from being destroyed as follows:
 
   before_destroy :protect_if_has_attachments
-  
+
   def protect_if_has_attachments
     unless attachments.empty?
       errors.add(:base, "Record has attachments and cannot be destroyed")
+      false
     end
   end
 
@@ -14,7 +17,7 @@ With +protective+, this is reduced to:
 
   protect_if :attachments, "Record has attachments and cannot be destroyed"
 
-Of course, you may pass the name of any defined method. If its result evaluates to +present?+, the record is not going to be destroyed. No exception is thrown, but a message is added to the +errors+ object of your model. This may then be used further on.
+Of course, you may pass the name of any defined method. If its result evaluates to <tt>present?</tt>, the record is not going to be destroyed. No exception is thrown, but a message is added to the +errors+ object of your model. This may then be used further on.
 
 To use protective, simply add it to your +Gemfile+:
 
@@ -23,6 +26,5 @@ To use protective, simply add it to your +Gemfile+:
 
 == Copyright
 
-Copyright (c) 2011 Pascal Zumkehr. See LICENSE.txt for
+Copyright (c) 2011-2017 Pascal Zumkehr. See LICENSE.txt for
 further details.
-

data/Rakefile

@@ -9,6 +9,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
+task :default => :test
+
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
@@ -21,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Pascal Zumkehr"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'activerecord'
+  #  gem.add_runtime_dependency 'activerecord'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -33,16 +35,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/protective.rb

@@ -6,7 +6,7 @@ module Protective
   def self.included(base)
     base.send :extend, ClassMethods
   end
-  
+
   module ClassMethods
     # Protects a record from being destroyed if the passed method
     # evaluates to #present? upon destruction. If a messag is given,
@@ -16,36 +16,38 @@ module Protective
         class_attribute :protect_if_methods
         self.protect_if_methods = {}
 
-        before_destroy :destruction_allowed? 
+        before_destroy :destruction_allowed?
         send :include, InstanceMethods
       end
-      
+
       protect_if_methods[method] = message
     end
   end
-   
+
   module InstanceMethods
-  
+
     # Returns true if this record cannot be destroyed.
     def protected?
       protect_if_methods.keys.any? do |method|
         !protect_method_allows_destruction(method)
       end
     end
-  
+
     # Returns true if this record may be destroyed or
     # adds possible error messages to the #errors object otherwise.
     def destruction_allowed?
-      protect_if_methods.all? do |method, message|
-        unless allowed = protect_method_allows_destruction(method)
-          errors.add(:base, message) if message
-        end
+      success = protect_if_methods.all? do |method, message|
+        allowed = protect_method_allows_destruction(method)
+        errors.add(:base, message) if !allowed && message
         allowed
       end
+
+      throw(:abort) if !success && ActiveRecord::VERSION::MAJOR >= 5
+      success
     end
-    
+
     private
-    
+
     def protect_method_allows_destruction(method)
       value = send(method)
       if value.respond_to?(:empty?) # ar *_many association
@@ -58,4 +60,4 @@ module Protective
 
 end
 
-ActiveRecord::Base.send :include, Protective
+ActiveRecord::Base.send :include, Protective

data/test/helper.rb

@@ -7,20 +7,22 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+if RUBY_VERSION =~ /\A1\.9/ && !defined?(JRUBY_VERSION)
+	require 'simplecov'
+	SimpleCov.start
+end
+
+require 'minitest'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'protective'
 
+DB_CONFIG = { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'),
+              :database => File.join('test', 'protective_plugin.sqlite3.db')}
 
 def load_schema
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-
-  ActiveRecord::Base.establish_connection(config['sqlite3'])
-  load(File.dirname(__FILE__) + "/schema.rb")
-end
-
-
-class Test::Unit::TestCase
+  ActiveRecord::Base.establish_connection(DB_CONFIG)
+  load(File.join(File.dirname(__FILE__), "schema.rb"))
 end

data/test/protective_test.rb

@@ -1,37 +1,37 @@
 require 'helper'
 
-class ProtectiveTest < Test::Unit::TestCase
+class ProtectiveTest < Minitest::Test
   load_schema
- 
+
   class Subject < ActiveRecord::Base
     has_many :attachments
-    
+
     protect_if :attachments, "Still has attachments"
     protect_if :marked
   end
- 
+
   class Attachment < ActiveRecord::Base
     belongs_to :subjects
   end
-  
+
   def test_setup
     assert_equal [], Subject.all
     assert_equal 2, Subject.protect_if_methods.size
   end
-  
+
   def test_empty_subject_may_be_destroyed
     s = Subject.create! :name => 'test'
     assert !s.protected?
     assert s.destroy
   end
-  
+
   def test_marked_subject_may_not_be_destroyed
     s = Subject.create! :name => 'test', :marked => true
     assert s.protected?
     assert !s.destroy
     assert_equal 0, s.errors.count
   end
-  
+
   def test_subject_may_not_be_destroyed_with_attachements
     s = Subject.create! :name => 'test'
     s.attachments.create! :name => 'att'
@@ -39,13 +39,12 @@ class ProtectiveTest < Test::Unit::TestCase
     assert_equal 1, s.attachments.count
     assert s.protected?
     assert !s.destroy
-    assert_equal ["Still has attachments"], s.errors[:base]    
-    assert !s.destruction_allowed?
+    assert_equal ["Still has attachments"], Array(s.errors[:base])
   end
-  
+
   def teardown
     Subject.delete_all
     Attachment.delete_all
   end
-  
+
 end

metadata

@@ -1,122 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: protective
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-07 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2017-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: activerecord
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !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: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  name: activerecord
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jdbc-sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id006
-description: Protect records from being destroyed in a declarative way. Simply add 'protect_if :dont_delete, "Record is marked as not deletable"' to your ActiveRecord model. Your record will no be destroyed and the given message is added to the errors object.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcsqlite3-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Protect records from being destroyed in a declarative way. Simply add
+  'protect_if :dont_delete, "Record is marked as not deletable"' to your ActiveRecord
+  model. Your record will no be destroyed and the given message is added to the errors
+  object.
 email: spam@codez.ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
-- .document
+files:
+- ".document"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -124,46 +128,31 @@ files:
 - Rakefile
 - VERSION
 - lib/protective.rb
-- rails/init.rb
-- test/database.yml
 - test/helper.rb
 - test/protective_test.rb
 - test/schema.rb
-has_rdoc: true
 homepage: http://github.com/codez/protective
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Protect records from being destroyed in a declarative way
-test_files: 
-- test/helper.rb
-- test/protective_test.rb
-- test/schema.rb
+test_files: []

data/rails/init.rb

@@ -1 +0,0 @@
-require 'protective'

data/test/database.yml

@@ -1,3 +0,0 @@
-sqlite3:
-  adapter: sqlite3
-  database: test/protective_plugin.sqlite3.db