acts_as_removable 1.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1fa206ffd887f93f41139a14651c3743e80b5c74
-  data.tar.gz: 2fb4a88e148d300436f2a24e5bfb8b25ec8f4ba6
+SHA256:
+  metadata.gz: e50fc04fd2ee6847e478c891ef359c65b221e3bd95f5bbcb5b7ea10235873219
+  data.tar.gz: 4efcf86b9ebd4334e8dba4f8c43a70d45559c671ccb41ec08e43e7bdbe5d4523
 SHA512:
-  metadata.gz: 1c56210aa89a186e4ac278302b2cc5ec58c95d86d60879a34b9a1c03f1f703eaa65b9a43701bf03b234362b5096fa1697da3fb3c6d910fac7673e1df5ed09ecc
-  data.tar.gz: e5893b0432d55638f884d6b6f264746c0cc22632929b76fa5b15e4994cd1327b1a38e699d08ee3be0b8642bc5645067c7ce16cd9d0474ed9d0bf7c93dcf8ea36
+  metadata.gz: 0c9fa4c138b9d5e0cfb9759388e7599f3802276554b918bc7688cb572007bc49a6d6f579e2e7de6e87ff7c5d55aa0aae978208c7b0a97d95e265bb338de7e025
+  data.tar.gz: dfb8cdee8cb63d370a46f71cc377124b20901cf295e8cfa83468cab6152446fd7757b40b9073cf7e0d096c39461561b0d7df7e837336db5a5c1d1316b6c92005

data/.rubocop.yml

@@ -0,0 +1,24 @@
+require:
+  - rubocop-performance
+
+AllCops:
+  TargetRubyVersion: 2.4
+
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,25 @@
+sudo: false
+
 language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+
+gemfile:
+  - gemfiles/rails52
+  - gemfiles/rails60
+  - gemfiles/rails61
+
+matrix:
+  exclude:
+    - rvm: 2.5.8
+      gemfile: gemfiles/rails61
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails52
+
+script: bundle exec rake spec
+
+before_install:
+  - gem install bundler -v '~> 2.0'

data/Changelog.md

@@ -0,0 +1,21 @@
+Changelog
+===
+
+#### Unreleased
+
+#### 3.1.0 (2020-12-10)
+* Support for Rails 6.1.0
+* Update travis config
+* Reduce travis build matrix to save time and speed up CI
+
+#### 3.0.1 (2019-11-06)
+* Fix support for Rails 6.0.X patch level releases
+
+#### 3.0.0 (2019-08-26)
+* Support for Rails 6.0.0
+* Drop support for Rails < 5.0.0
+* Unpin bundler gem (development dependency)
+* Cleanup gemspec
+* Remove .ruby-version file
+* Update copyright
+* Add this Changelog

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in acts_as_removable.gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 SIC! Software GmbH
+Copyright (c) 2019 SIC! Software GmbH
 
 MIT License
 

data/README.md

@@ -37,13 +37,6 @@ class MyModel < ActiveRecord::Base
 end
 ```
 
-It's possible to add a default scope with the active (not removed) records:
-```ruby
-class MyModel < ActiveRecord::Base
-  acts_as_removable with_default_scope: true
-end
-```
-
 And you can use callbacks:
 ```ruby
 class MyModel < ActiveRecord::Base

data/Rakefile

@@ -1,7 +1,9 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/acts_as_removable.gemspec

@@ -1,28 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'English'
 require 'acts_as_removable/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "acts_as_removable"
+  spec.name          = 'acts_as_removable'
   spec.version       = ActsAsRemovable::VERSION
-  spec.authors       = ["Florian Schwab", "Erik Ernst"]
-  spec.email         = ["florian.schwab@sic-software.com"]
-  spec.description   = %q{Simplifies handling of pseudo removed records}
-  spec.summary       = %q{Simplifies handling of pseudo removed records}
-  spec.homepage      = "https://github.com/SICSoftwareGmbH/acts_as_removable"
-  spec.license       = "MIT"
+  spec.authors       = ['Florian Schwab', 'Erik-B. Ernst']
+  spec.email         = ['florian.schwab@sic.software', 'erik.ernst@sic.software']
+  spec.description   = 'Simplifies handling of pseudo removed records.'
+  spec.summary       = 'Simplifies handling of pseudo removed records.'
+  spec.homepage      = 'https://github.com/SICSoftwareGmbH/acts_as_removable'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport',  '> 4.0.0'
-  spec.add_dependency 'activerecord',   '> 4.0.0'
+  spec.add_dependency 'activerecord',  '>= 5.0', '< 6.2'
+  spec.add_dependency 'activesupport', '>= 5.0', '< 6.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'sqlite3'
 end

data/gemfiles/rails52

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails-menu-manager.gemspec
+gemspec path: '..'
+
+
+gem 'railties', '~> 5.2'

data/gemfiles/rails60

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails-menu-manager.gemspec
+gemspec path: '..'
+
+
+gem 'railties', '~> 6.0'

data/gemfiles/rails61

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails-menu-manager.gemspec
+gemspec path: '..'
+
+
+gem 'railties', '~> 6.1'

data/lib/acts_as_removable.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 require 'active_record'
-require "acts_as_removable/version"
+require 'acts_as_removable/version'
 
 module ActsAsRemovable
   extend ActiveSupport::Concern
@@ -10,88 +12,73 @@ module ActsAsRemovable
     #
     #   acts_as_removable
     #   acts_as_removable column_name: 'other_column_name'
-    #   acts_as_removable with_default_scope: true
     #
     # ===== Options
     #
     # * <tt>:column_name</tt> - A symbol or string with the column to use for removal timestamp.
-    # * <tt>:with_default_scope</tt> - A boolean indicating to set a default scope with only active (not removed) records
     def acts_as_removable(options = {})
       _acts_as_removable_options.merge!(options)
 
-      scope :removed, -> {
-        removed_at_column_name = _acts_as_removable_options[:column_name]
-        query = where(all.table[removed_at_column_name].not_eq(nil).to_sql)
-        _removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].eq(nil).to_sql)
+      scope :removed, lambda {
+        where(all.table[_acts_as_removable_options[:column_name]].not_eq(nil).to_sql)
       }
 
-      scope :actives, -> {
-        removed_at_column_name = _acts_as_removable_options[:column_name]
-        query = where(all.table[removed_at_column_name].eq(nil).to_sql)
-        _removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].not_eq(nil).to_sql)
+      scope :actives, lambda {
+        where(all.table[_acts_as_removable_options[:column_name]].eq(nil).to_sql)
       }
 
-      default_scope -> {where(all.table[_acts_as_removable_options[:column_name]].eq(nil).to_sql)} if _acts_as_removable_options[:with_default_scope]
-
       define_model_callbacks :remove, :unremove
 
       class_eval do
         def self.before_remove(*args, &block)
-          set_callback :remove, :before, *args, &block
+          set_callback(:remove, :before, *args, &block)
         end
 
         def self.after_remove(*args, &block)
-          set_callback :remove, :after, *args, &block
+          set_callback(:remove, :after, *args, &block)
         end
 
         def self.before_unremove(*args, &block)
-          set_callback :unremove, :before, *args, &block
+          set_callback(:unremove, :before, *args, &block)
         end
 
         def self.after_unremove(*args, &block)
-          set_callback :unremove, :after, *args, &block
+          set_callback(:unremove, :after, *args, &block)
         end
 
         def removed?
           send(self.class._acts_as_removable_options[:column_name]).present?
         end
 
-        def remove(options={})
+        def remove(options = {})
           _update_remove_attribute(:remove, Time.now, false, options)
         end
 
-        def remove!(options={})
+        def remove!(options = {})
           _update_remove_attribute(:remove, Time.now, true, options)
         end
 
-        def unremove(options={})
+        def unremove(options = {})
           _update_remove_attribute(:unremove, nil, false, options)
         end
 
-        def unremove!(options={})
+        def unremove!(options = {})
           _update_remove_attribute(:unremove, nil, true, options)
         end
 
-        def _update_remove_attribute(callback, value, with_bang=false, options={})
-          run_callbacks callback.to_sym do
-            send("#{self.class._acts_as_removable_options[:column_name]}=", value)
-            with_bang ? save!(options) : save(options)
+        def _update_remove_attribute(callback, value, with_bang = false, options = {})
+          self.class.transaction do
+            run_callbacks callback.to_sym do
+              send("#{self.class._acts_as_removable_options[:column_name]}=", value)
+              with_bang ? save!(options) : save(options)
+            end
           end
         end
       end
     end
 
     def _acts_as_removable_options
-      @_acts_as_removable_options ||= {
-          column_name: 'removed_at'
-        }
-    end
-
-    # Delete where statements from query
-    def _removable_where_values(query, column_name, remove_where)
-      query = query.with_default_scope if query.respond_to?(:with_default_scope)
-      query.where_values.delete(remove_where)
-      query
+      @_acts_as_removable_options ||= { column_name: 'removed_at' }
     end
   end
 end

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsRemovable
-  VERSION = '1.0.0'
+  VERSION = '3.1.0'
 end

data/spec/acts_as_removable_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'acts_as_removable' do
   class MyModel < ActiveRecord::Base
-    acts_as_removable with_default_scope: true
+    acts_as_removable
     attr_accessor :callback_before_remove, :callback_after_remove, :callback_before_unremove, :callback_after_unremove
     before_remove do |r|
       r.callback_before_remove = true
@@ -26,10 +28,10 @@ describe 'acts_as_removable' do
   before do
     # setup database
     db_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'acts_as_removable.db'))
-    Dir::mkdir(File.dirname(db_file)) unless File.exists?(File.dirname(db_file))
+    Dir.mkdir(File.dirname(db_file)) unless File.exist?(File.dirname(db_file))
     ActiveRecord::Base.establish_connection(
-      :adapter => 'sqlite3',
-      :database => "#{File.expand_path(File.join(File.dirname(__FILE__), '..'))}/tmp/acts_as_removable.db"
+      adapter:  'sqlite3',
+      database: "#{File.expand_path(File.join(File.dirname(__FILE__), '..'))}/tmp/acts_as_removable.db"
     )
     ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'my_models'")
     ActiveRecord::Base.connection.create_table(:my_models) do |t|
@@ -62,7 +64,7 @@ describe 'acts_as_removable' do
     MySecondModel.create!
     MySecondModel.create!.remove!
 
-    expect(MyModel.count).to be(1)
+    expect(MyModel.count).to be(2)
     expect(MyModel.actives.count).to be(1)
     expect(MyModel.removed.count).to be(1)
     expect(MyModel.unscoped.count).to be(2)

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 

metadata

@@ -1,58 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Florian Schwab
-- Erik Ernst
+- Erik-B. Ernst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +93,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +135,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Simplifies handling of pseudo removed records
+description: Simplifies handling of pseudo removed records.
 email:
-- florian.schwab@sic-software.com
+- florian.schwab@sic.software
+- erik.ernst@sic.software
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
+- ".rubocop.yml"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - acts_as_removable.gemspec
+- gemfiles/rails52
+- gemfiles/rails60
+- gemfiles/rails61
 - lib/acts_as_removable.rb
 - lib/acts_as_removable/version.rb
 - spec/acts_as_removable_spec.rb
@@ -133,11 +178,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Simplifies handling of pseudo removed records
+summary: Simplifies handling of pseudo removed records.
 test_files:
 - spec/acts_as_removable_spec.rb
 - spec/spec_helper.rb

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0.0