rails-trash 1.1.2 → 2.0.0

data/lib/rails-trash.rb

@@ -2,76 +2,80 @@ module Rails
   module Trash
 
     def self.included(base)
-      base.extend ClassMethods
+      base.send :extend, Extension
     end
 
-    module ClassMethods
-
+    module Extension
       ##
       #   class Entry < ActiveRecord::Base
       #     has_trash
-      #     default_scope where(:deleted_at => nil)
       #   end
       #
       def has_trash
-        extend ClassMethodsMixin
+        extend ClassMethods
         include InstanceMethods
         alias_method_chain :destroy, :trash
       end
+    end
 
-      module ClassMethodsMixin
-
-        def deleted(field = nil, value = nil)
-          deleted_at = Arel::Table.new(self.table_name)[:deleted_at]
-          data = unscoped
-          data = data.where(field => value) if field && value
-          data.where(deleted_at.not_eq(nil))
-        end
+    module ClassMethods
 
-        def find_in_trash(id)
-          deleted.find(id)
-        end
+      def deleted(field = nil, value = nil)
+        deleted_at = Arel::Table.new(self.table_name)[:deleted_at]
+        data = unscoped
+        data = data.where(field => value) if field && value
+        data.where(deleted_at.not_eq(nil))
+      end
 
-        def restore(id)
-          find_in_trash(id).restore
-        end
+      def find_in_trash(id)
+        deleted.find(id)
+      end
 
+      def restore(id)
+        find_in_trash(id).restore
       end
 
-      module InstanceMethods
+    end
 
-        def destroy_with_trash
-          return destroy_without_trash if @trash_is_disabled
-          deleted_at = Time.now.utc
-          self.update_attribute(:deleted_at, deleted_at)
-          self.class.reflect_on_all_associations(:has_many).each do |reflection|
-            if reflection.options[:dependent].eql?(:destroy)
-              self.send(reflection.name).update_all(:deleted_at => deleted_at)
-            end
-          end
-        end
+    module InstanceMethods
 
-        def restore
-          self.update_attribute(:deleted_at, nil)
+      def self.included(base)
+        base.class_eval do
+          default_scope where(:deleted_at => nil) if arel_table[:deleted_at]
         end
+      end
 
-        def disable_trash
-          save_val = @trash_is_disabled
-          begin
-            @trash_is_disabled = true
-            yield if block_given?
-          ensure
-            @trash_is_disabled = save_val
+      def destroy_with_trash
+        return destroy_without_trash if @trash_is_disabled
+        deleted_at = Time.now.utc
+        self.update_attribute(:deleted_at, deleted_at)
+        self.class.reflect_on_all_associations(:has_many).each do |reflection|
+          if reflection.options[:dependent].eql?(:destroy)
+            self.send(reflection.name).update_all(:deleted_at => deleted_at)
           end
         end
+      end
 
-        def trashed?
-          deleted_at.present?
+      def restore
+        self.update_attribute(:deleted_at, nil)
+      end
+
+      def disable_trash
+        save_val = @trash_is_disabled
+        begin
+          @trash_is_disabled = true
+          yield if block_given?
+        ensure
+          @trash_is_disabled = save_val
         end
+      end
 
+      def trashed?
+        deleted_at.present?
       end
 
     end
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-trash
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153320580 !ruby/object:Gem::Requirement
+  requirement: &70170312315600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,29 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153320580
+  version_requirements: *70170312315600
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &70170312314400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *70170312314400
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70170312313380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :development
+  prerelease: false
+  version_requirements: *70170312313380
 description: 
 email: contact@francescesplugas.com
 executables: []
@@ -30,7 +51,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rails-trash.rb
-has_rdoc: true
 homepage: https://github.com/fesplugas/rails-trash
 licenses: []
 post_install_message: 
@@ -43,15 +63,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4238735881725459162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4238735881725459162
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Trash