acts_as_removable 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc13acf0ef4676070b9c1b58df18af874be7940
-  data.tar.gz: f25399054b7cab95fd0489cd0e88a6685a90997d
+  metadata.gz: b2e52df51683c7203a4a78ed2f72ce9b5c72d464
+  data.tar.gz: 9a39dbee521544bdcdae76250996c6dcb12e1fbf
 SHA512:
-  metadata.gz: d390b4ccf8503d4554d1efb90a750675d83af09a65cb25b578d04996031f328ef904f3a82721bbde4727f4919a7b06d28ab97f87b2d3869a9693bc80088e8daa
-  data.tar.gz: 0e79c8d9d8ec1ac4d9e56aa111b16965aaa4455d734e0c057ca8dda37d541073ea3226d81093a231f6b2da1ad5d28375b18a71040b899117f4d035f38d58ffda
+  metadata.gz: 6f16a0de9785d79ffd75790c7b4872e6d7119fc9afc474547fa3aaaa6815e95e2de6e0bc5dbe12384d43864c29e44d6c064649c2fe6cc3ebac76358f103cc9a7
+  data.tar.gz: 4e0651c43989baa13f8624f58513ce2df8adbd8c2b55a75e99f983006c6669a9e9448168e5570cea926c2e131ad4d32ecd835fa6b4b7eef8f24647a6122bf1ed

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRemovable
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/lib/acts_as_removable.rb

@@ -5,12 +5,7 @@ require "acts_as_removable/version"
 module ActsAsRemovable
   extend ActiveSupport::Concern
 
-  included do
-    extend(ClassMethods)
-  end
-
   module ClassMethods
-
     # Add ability to remove ActiveRecord instances
     #
     #   acts_as_removable
@@ -21,29 +16,26 @@ module ActsAsRemovable
     #
     # * <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.
-    def acts_as_removable(options={})
-      self.class_eval do
-        @_acts_as_removable_column_name = (options[:column_name] || 'removed_at').to_s
-        def self._acts_as_removable_column_name
-          @_acts_as_removable_column_name
-        end
+    def acts_as_removable(options = {})
+      _acts_as_removable_options.merge!(options)
 
-        scope :removed, -> {
-          removed_at_column_name = self._acts_as_removable_column_name
-          query = where(all.table[removed_at_column_name].not_eq(nil).to_sql)
-          ::ActsAsRemovable.removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].eq(nil).to_sql)
-        }
+      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 :actives, -> {
-          removed_at_column_name = self._acts_as_removable_column_name
-          query = where(all.table[removed_at_column_name].eq(nil).to_sql)
-          ::ActsAsRemovable.removable_where_values(query, removed_at_column_name, all.table[removed_at_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)
+      }
 
-        default_scope -> {where(all.table[self._acts_as_removable_column_name].eq(nil).to_sql)} unless options[:without_default_scope]
+      default_scope -> {where(all.table[_acts_as_removable_options[:column_name]].eq(nil).to_sql)} unless _acts_as_removable_options[:without_default_scope]
 
-        define_model_callbacks :remove, :unremove
+      define_model_callbacks :remove, :unremove
 
+      class_eval do
         def self.before_remove(*args, &block)
           set_callback :remove, :before, *args, &block
         end
@@ -61,7 +53,7 @@ module ActsAsRemovable
         end
 
         def removed?
-          self.send(self.class._acts_as_removable_column_name).present?
+          send(self.class._acts_as_removable_options[:column_name]).present?
         end
 
         def remove(options={})
@@ -80,23 +72,27 @@ module ActsAsRemovable
           _update_remove_attribute(:unremove, nil, true, options)
         end
 
-        private
-
         def _update_remove_attribute(callback, value, with_bang=false, options={})
           run_callbacks callback.to_sym do
-            self.send("#{self.class._acts_as_removable_column_name}=", value)
-            with_bang ? self.save!(options) : self.save(options)
+            send("#{self.class._acts_as_removable_options[:column_name]}=", value)
+            with_bang ? save!(options) : save(options)
           end
         end
       end
     end
-  end
 
-  # Helps deleting where statements from query
-  def self.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
+    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
+    end
   end
 end
 

data/spec/acts_as_removable_spec.rb

@@ -28,7 +28,7 @@ describe 'acts_as_removable' do
     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))
     ActiveRecord::Base.establish_connection(
-      :adapter => "sqlite3",
+      :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'")
@@ -42,7 +42,7 @@ describe 'acts_as_removable' do
     end
   end
 
-  it "test column and check method" 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
@@ -53,7 +53,7 @@ describe 'acts_as_removable' do
     end
   end
 
-  it "test scopes" do
+  it 'test scopes' do
     MyModel.delete_all
     MySecondModel.delete_all
 
@@ -73,7 +73,7 @@ describe 'acts_as_removable' do
     MySecondModel.unscoped.count.should be(2)
   end
 
-  it "test callbacks" do
+  it 'test callbacks' do
     r = MyModel.create!
     r.callback_before_remove.should be_false
     r.callback_after_remove.should be_false
@@ -93,6 +93,5 @@ describe 'acts_as_removable' do
     r.callback_after_remove.should be_true
     r.callback_before_unremove.should be_true
     r.callback_after_unremove.should 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.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Florian Schwab
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport