acts_as_removable 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2104af4e96da53bc63227ea60da8acd3916de925b60a21b4b07612d06a38afd5
-  data.tar.gz: 4207a15fff8f2d84931726ac8a46dae342f505ec5249a353e029bbdd9ace6038
+  metadata.gz: 73a8321dc5f10d5b391838d8ef5e5ae42fd9234f79e11acd8897499baa529ff8
+  data.tar.gz: 35e65edd2a3231765e29002fe0685851b41ad5ef4917db4d85f4158f367085b5
 SHA512:
-  metadata.gz: fe7c2c196cedcee69c6e675b2eb728f91250d0e15f697a56e67b126e2eeaf31f20997944d6c12c5a770e6c4731fe42f0b15d670a1b8410465c1199f457b04ffc
-  data.tar.gz: 4f4f97cf7baa15f67589383eef923753ac01e18c1b25d34dc3f11e1320f79042a2f9291cd86416cbf671126d9d625109961d0b5074ec6589ddfd611f6c9c0908
+  metadata.gz: 8385b5a3e3c992401e4690cd4c76520a1760d35a9c19543064cc4fa668b77164768df84a5cd2bb8e6966496b70f82a0e3779853443c4113abc6c4ba14ed46441
+  data.tar.gz: 7e403cfae73a20e6d76bcb255f9e0cbd1c0f73b8ca67ac5f3c23f686dd5c34c4501a20769e0dda38fd15a55acec4ad13bc4b8f6f83aad05dfe6437e4d84ee574

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

@@ -3,16 +3,22 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.4.7
+  - 2.5.6
+  - 2.6.4
 
 gemfile:
-  - gemfiles/rails40
-  - gemfiles/rails41
-  - gemfiles/rails42
   - gemfiles/rails50
+  - gemfiles/rails51
+  - gemfiles/rails52
+  - gemfiles/rails60
+
+matrix:
+  exclude:
+    - rvm: 2.4.7
+      gemfile: gemfiles/rails60
 
 script: bundle exec rake spec
 
 before_install:
-  - gem install bundler -v '~> 1.12'
+  - gem install bundler -v '~> 2.0'

data/Changelog.md

@@ -3,6 +3,9 @@ Changelog
 
 #### Unreleased
 
+#### 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

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/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.version       = ActsAsRemovable::VERSION
   spec.authors       = ['Florian Schwab', 'Erik-B. Ernst']
-  spec.email         = ['florian.schwab@sic-software.com']
+  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.add_dependency 'activerecord',  '>= 5.0', '<= 6.0'
-  spec.add_dependency 'activesupport', '>= 5.0', '<= 6.0'
+  spec.add_dependency 'activerecord',  '>= 5.0', '< 6.1'
+  spec.add_dependency 'activesupport', '>= 5.0', '< 6.1'
 
-  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/{rails40 → rails51}

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 
-gem 'railties', '~> 4.0'
+gem 'railties', '~> 5.1'

data/gemfiles/{rails41 → rails52}

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 
-gem 'railties', '~> 4.1'
+gem 'railties', '~> 5.2'

data/gemfiles/{rails42 → rails60}

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 
-gem 'railties', '~> 4.2'
+gem 'railties', '~> 6.0'

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
@@ -17,11 +19,11 @@ module ActsAsRemovable
     def acts_as_removable(options = {})
       _acts_as_removable_options.merge!(options)
 
-      scope :removed, -> {
+      scope :removed, lambda {
         where(all.table[_acts_as_removable_options[:column_name]].not_eq(nil).to_sql)
       }
 
-      scope :actives, -> {
+      scope :actives, lambda {
         where(all.table[_acts_as_removable_options[:column_name]].eq(nil).to_sql)
       }
 
@@ -76,9 +78,7 @@ module ActsAsRemovable
     end
 
     def _acts_as_removable_options
-      @_acts_as_removable_options ||= {
-          column_name: 'removed_at'
-        }
+      @_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 = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/acts_as_removable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'acts_as_removable' do
@@ -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|

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Florian Schwab
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,23 +48,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !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
@@ -93,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
@@ -109,12 +137,14 @@ dependencies:
         version: '0'
 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"
+- ".rubocop.yml"
 - ".travis.yml"
 - Changelog.md
 - Gemfile
@@ -122,10 +152,10 @@ files:
 - README.md
 - Rakefile
 - acts_as_removable.gemspec
-- gemfiles/rails40
-- gemfiles/rails41
-- gemfiles/rails42
 - gemfiles/rails50
+- gemfiles/rails51
+- gemfiles/rails52
+- gemfiles/rails60
 - lib/acts_as_removable.rb
 - lib/acts_as_removable/version.rb
 - spec/acts_as_removable_spec.rb
@@ -149,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Simplifies handling of pseudo removed records.