acts_as_removable 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca8b02fea9945ffb1dd7187efafbe16fd788dc6
-  data.tar.gz: b98900fca9e10a29296ca8efd5bf2deb62695797
+  metadata.gz: cb77f64473b233261e4953ac268dabcb4f1933fd
+  data.tar.gz: c8838df63eb4f7f90d829964dc4dfa449cf0b888
 SHA512:
-  metadata.gz: c1669f514ae58f35ee1bb4d1a1e9f3329381c4ef1a24efe6eef1b5ed8ce7bb97c99bec40a4eba31b362ed13459718a7482b97f099933bf64acdd00d83fe64ed4
-  data.tar.gz: 3a1704d88c080ecc6420f9e754ae66489c4c0a8374662ff6e3e61f65fd773b879197ea78a101fe1aee9898d7fcf8fda1a6f674abc68cacc07d878108c7aef098
+  metadata.gz: 60226685f2229482828597606881ebaa19d5e38e1cc65c86fd4f40581de5483668b66bf235e1cb1eddb44655b166a256b0bf8c922806de012e3b328d8fd671d2
+  data.tar.gz: 9e10e4d9efb9c24adfc68ad5240fd9aaec312072c853e429f87fb8ba87c8457472dcf6c243dae92a954576fce8a0f0ac7b224e00d52aa767276d0220ce9b3176

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.3.1

data/.travis.yml

@@ -1,7 +1,18 @@
+sudo: false
+
 language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.2.5
+  - 2.3.1
+
+gemfile:
+  - gemfiles/rails40
+  - gemfiles/rails41
+  - gemfiles/rails42
+  - gemfiles/rails50
+
+script: bundle exec rake spec
+
+before_install:
+  - gem install bundler -v '~> 1.12'

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/acts_as_removable.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport',  '> 4.0.0'
-  spec.add_dependency 'activerecord',   '> 4.0.0'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
+  spec.add_dependency 'activerecord',  '>= 4.0', '< 6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/gemfiles/rails40

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

data/gemfiles/rails41

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

data/gemfiles/rails42

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

data/gemfiles/rails50

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

data/lib/acts_as_removable.rb

@@ -10,29 +10,21 @@ 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)
+        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)
+        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
@@ -88,13 +80,6 @@ module ActsAsRemovable
           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
-    end
   end
 end
 

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRemovable
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/spec/acts_as_removable_spec.rb

@@ -2,7 +2,7 @@ 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
@@ -62,7 +62,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Florian Schwab
@@ -9,36 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +122,10 @@ files:
 - README.md
 - Rakefile
 - acts_as_removable.gemspec
+- gemfiles/rails40
+- gemfiles/rails41
+- gemfiles/rails42
+- gemfiles/rails50
 - lib/acts_as_removable.rb
 - lib/acts_as_removable/version.rb
 - spec/acts_as_removable_spec.rb
@@ -134,11 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simplifies handling of pseudo removed records
 test_files:
 - spec/acts_as_removable_spec.rb
 - spec/spec_helper.rb
-has_rdoc: