acts_as_removable 0.9.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e52df51683c7203a4a78ed2f72ce9b5c72d464
-  data.tar.gz: 9a39dbee521544bdcdae76250996c6dcb12e1fbf
+  metadata.gz: 1fa206ffd887f93f41139a14651c3743e80b5c74
+  data.tar.gz: 2fb4a88e148d300436f2a24e5bfb8b25ec8f4ba6
 SHA512:
-  metadata.gz: 6f16a0de9785d79ffd75790c7b4872e6d7119fc9afc474547fa3aaaa6815e95e2de6e0bc5dbe12384d43864c29e44d6c064649c2fe6cc3ebac76358f103cc9a7
-  data.tar.gz: 4e0651c43989baa13f8624f58513ce2df8adbd8c2b55a75e99f983006c6669a9e9448168e5570cea926c2e131ad4d32ecd835fa6b4b7eef8f24647a6122bf1ed
+  metadata.gz: 1c56210aa89a186e4ac278302b2cc5ec58c95d86d60879a34b9a1c03f1f703eaa65b9a43701bf03b234362b5096fa1697da3fb3c6d910fac7673e1df5ed09ecc
+  data.tar.gz: e5893b0432d55638f884d6b6f264746c0cc22632929b76fa5b15e4994cd1327b1a38e699d08ee3be0b8642bc5645067c7ce16cd9d0474ed9d0bf7c93dcf8ea36

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2

data/README.md

@@ -37,10 +37,10 @@ class MyModel < ActiveRecord::Base
 end
 ```
 
-It's possible to skip the default_scope:
+It's possible to add a default scope with the active (not removed) records:
 ```ruby
 class MyModel < ActiveRecord::Base
-  acts_as_removable without_default_scope: true
+  acts_as_removable with_default_scope: true
 end
 ```
 

data/lib/acts_as_removable.rb

@@ -10,12 +10,12 @@ module ActsAsRemovable
     #
     #   acts_as_removable
     #   acts_as_removable column_name: 'other_column_name'
-    #   acts_as_removable without_default_scope: true
+    #   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>:without_default_scope</tt> - A boolean indicating to not set a default scope.
+    # * <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)
 
@@ -31,7 +31,7 @@ module ActsAsRemovable
         _removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].not_eq(nil).to_sql)
       }
 
-      default_scope -> {where(all.table[_acts_as_removable_options[:column_name]].eq(nil).to_sql)} unless _acts_as_removable_options[:without_default_scope]
+      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
 

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRemovable
-  VERSION = '0.9.5'
+  VERSION = '1.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
+    acts_as_removable with_default_scope: true
     attr_accessor :callback_before_remove, :callback_after_remove, :callback_before_unremove, :callback_after_unremove
     before_remove do |r|
       r.callback_before_remove = true
@@ -20,7 +20,7 @@ describe 'acts_as_removable' do
   end
 
   class MySecondModel < ActiveRecord::Base
-    acts_as_removable column_name: :use_this_column, without_default_scope: true
+    acts_as_removable column_name: :use_this_column
   end
 
   before do
@@ -44,12 +44,12 @@ describe 'acts_as_removable' do
 
   it 'test column and check method' do
     [[MyModel.create!, :removed_at], [MySecondModel.create!, :use_this_column]].each do |r, column_name|
-      r.removed?.should be_false
-      r.send(column_name).should be_nil
+      expect(r.removed?).to be(false)
+      expect(r.send(column_name)).to be(nil)
 
       r.remove
-      r.removed?.should be_true
-      r.send(column_name).should be_a(Time)
+      expect(r.removed?).to be(true)
+      expect(r.send(column_name)).to be_kind_of(Time)
     end
   end
 
@@ -62,36 +62,36 @@ describe 'acts_as_removable' do
     MySecondModel.create!
     MySecondModel.create!.remove!
 
-    MyModel.count.to_i.should be(1)
-    MyModel.actives.count.should be(1)
-    MyModel.removed.count.should be(1)
-    MyModel.unscoped.count.should be(2)
+    expect(MyModel.count).to be(1)
+    expect(MyModel.actives.count).to be(1)
+    expect(MyModel.removed.count).to be(1)
+    expect(MyModel.unscoped.count).to be(2)
 
-    MySecondModel.count.to_i.should be(2)
-    MySecondModel.actives.count.should be(1)
-    MySecondModel.removed.count.should be(1)
-    MySecondModel.unscoped.count.should be(2)
+    expect(MySecondModel.count).to be(2)
+    expect(MySecondModel.actives.count).to be(1)
+    expect(MySecondModel.removed.count).to be(1)
+    expect(MySecondModel.unscoped.count).to be(2)
   end
 
   it 'test callbacks' do
     r = MyModel.create!
-    r.callback_before_remove.should be_false
-    r.callback_after_remove.should be_false
-    r.callback_before_unremove.should be_false
-    r.callback_after_unremove.should be_false
+    expect(r.callback_before_remove).to be(nil)
+    expect(r.callback_after_remove).to be(nil)
+    expect(r.callback_before_unremove).to be(nil)
+    expect(r.callback_after_unremove).to be(nil)
 
     r.remove
 
-    r.callback_before_remove.should be_true
-    r.callback_after_remove.should be_true
-    r.callback_before_unremove.should be_false
-    r.callback_after_unremove.should be_false
+    expect(r.callback_before_remove).to be(true)
+    expect(r.callback_after_remove).to be(true)
+    expect(r.callback_before_unremove).to be(nil)
+    expect(r.callback_after_unremove).to be(nil)
 
     r.unremove
 
-    r.callback_before_remove.should be_true
-    r.callback_after_remove.should be_true
-    r.callback_before_unremove.should be_true
-    r.callback_after_unremove.should be_true
+    expect(r.callback_before_remove).to be(true)
+    expect(r.callback_after_remove).to be(true)
+    expect(r.callback_before_unremove).to be(true)
+    expect(r.callback_after_unremove).to be(true)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Florian Schwab
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-12-16 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   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
     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: Simplifies handling of pseudo removed records
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simplifies handling of pseudo removed records