permanent_records 3.1.6 → 3.2.0

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA1:
-  metadata.gz: 78b0fb28d98b7b5a68bb591b23eaded91bba6f87
-  data.tar.gz: 756981d277d14d61780c49250f6c9893e01f6a6b
 SHA512:
-  metadata.gz: 915ccc96b2ad16475d21349ac09649227816947f66044eaf023a0dec6f561887cd5fb3295dcd73f979a61ae964239c3ff96336c3bfed58086e0deeb148233134
-  data.tar.gz: 7e2723e413ceb80205bfa2256d50ff26383efa77db256f6013c3c7e40c34a1b2cda204ea0d0e363cbd9635513c4d84e474a5ac9622b8c3059f9ad81f79cd21a3
+  metadata.gz: be9cd9f51f282ac7959ef28b582ce21f6ea5fb324d08974bc290a6a3f826ee2fa8d753a31f8b66def452efaa612804e05f512ad966d431f44274af5f98291bbd
+  data.tar.gz: eaa35e4b1c6e95590e0ac67f4109464d8d5609cf7b8b024d74cfef90657fb34d57ed9aa26f37d93795a75c8faa458899cb348c8ee703915d29c4f19c86198b50

data/Gemfile

@@ -8,9 +8,9 @@ gem 'activesupport', ver
 
 group :test do
   gem 'rake'
-  gem 'pg'
+  gem 'sqlite3'
   gem 'pry'
   gem 'awesome_print'
   gem 'database_cleaner'
-  gem 'rspec'
+  gem 'rspec', '~> 2.14.1'
 end

data/README.markdown

@@ -1,83 +1,84 @@
-# PermanentRecords
+# PermanentRecords (Rails 3+)
 
 [http://github.com/JackDanger/permanent_records/](http://github.com/JackDanger/permanent_records/)
 
 This gem prevents any of your ActiveRecord data from being destroyed.
 Any model that you've given a "deleted_at" datetime column will have that column set rather than let the record be deleted.
 
-## Compatibility: This gem is for Rails 3+
-
-## Does it make a lot of sense?
-
-Yes.
+## What methods does it give me?
 
 ```ruby
-    User.find(3).destroy          # sets the 'deleted_at' attribute to Time.now and returns a frozen record
-    User.find(3).destroy(:force)  # executes the real destroy method, the record will be removed from the database
-    User.destroy_all              # soft-deletes all User records
-    User.delete_all               # bye bye everything (no soft-deleting here)
+User.find(3).destroy          # Sets the 'deleted_at' attribute to Time.now 
+                              # and returns a frozen record.
+                              
+User.find(3).destroy(:force)  # Executes the real destroy method, the record 
+                              # will be removed from the database.
+                              
+User.destroy_all              # Soft-deletes all User records.
+
+User.delete_all               # bye bye everything (no soft-deleting here)
 ```
 There are also two scopes provided for easily searching deleted and not deleted records:
 
 ```ruby
-    User.deleted.find(...)        # only returns deleted records.
-    User.not_deleted.find(...)    # only returns non-deleted records.
-```
+User.deleted.find(...)        # Only returns deleted records.
 
-Note: Your normal finds will, by default, _include_ deleted records. You'll have to manually use the 'not_deleted' scope to avoid this:
-
-```ruby
-    User.find(1)                  # will find record number 1, even if it's deleted
-    User.not_deleted.find(1)      # This is probably what you want, it doesn't find deleted records
+User.not_deleted.find(...)    # Only returns non-deleted records.
 ```
 
-## Is Everything Automated?
-
+Note: Your normal finds will, by default, _include_ deleted records. You'll have to manually use the ```not_deleted``` scope to avoid this:
 
-Yes. You don't have to change ANY of your code to get permanent archiving of all your data with this gem. 
-When you call 'destroy' on any record  (or 'destroy_all' on a class or association) your records will
-all have a deleted_at timestamp set on them.
+```ruby
+User.find(1)                  # Will find record number 1, even if it's deleted.
 
+User.not_deleted.find(1)      # This is probably what you want, it doesn't find deleted records.
+```
 
 ## Can I easily undelete records?
 
 Yes. All you need to do is call the 'revive' method.
 
 ```ruby
-    User.find(3).destroy
-    # the user is now deleted
-    User.find(3).revive
-    # the user is back to it's original state
+User.find(3).destroy         # The user is now deleted.
+
+User.find(3).revive          # The user is back to it's original state.
 ```
 
 And if you had dependent records that were set to be destroyed along with the parent record:
 
 ```ruby
-    class User < ActiveRecord::Base
-      has_many :comments, :dependent => :destroy
-    end
-    User.find(3).destroy
-    # all the comments are destroyed as well
-    User.find(3).revive
-    # all the comments that were just destroyed are now back in pristine condition
-    
-    # forcing deletion works the same way: fi you hard delete a record, its dependent records will also be hard deleted
+class User < ActiveRecord::Base
+  has_many :comments, :dependent => :destroy
+end
+
+User.find(3).destroy         # All the comments are destroyed as well.
+
+User.find(3).revive          # All the comments that were just destroyed 
+                             # are now back in pristine condition.
 ```
 
+Forcing deletion works the same way: if you hard delete a record, its dependent records will also be hard deleted.
+
 ## Can I use default scopes?
 
 ```ruby
-    default_scope where(:deleted_at => nil)
+default_scope where(:deleted_at => nil)
 ```
 
 If you use such a default scope, you will need to simulate the `deleted` scope with a method
 
 ```ruby
-    def self.deleted
-      self.unscoped.where('deleted_at IS NOT NULL')
-    end
+def self.deleted
+  self.unscoped.where('deleted_at IS NOT NULL')
+end
 ```
 
+## Is Everything Automated?
+
+Yes. You don't have to change ANY of your code to get permanent archiving of all your data with this gem. 
+When you call `destroy` on any record  (or `destroy_all` on a class or association) your records will
+all have a deleted_at timestamp set on them.
+
 ## Productionizing
 
 If you operate a system where destroying or reviving a record takes more

data/VERSION

@@ -1 +1 @@
-3.1.6
+3.2.0

data/lib/permanent_records.rb

@@ -6,7 +6,7 @@ module PermanentRecords
   # * is_permanent? #=> true/false, depending if you have a deleted_at column
   # * deleted?      #=> true/false, depending if you've called .destroy
   # * destroy       #=> sets deleted_at, your record is now in the .destroyed scope
-  # * revice        #=> undo the destroy
+  # * revive        #=> undo the destroy
   module ActiveRecord
     def self.included(base)
 
@@ -25,7 +25,11 @@ module PermanentRecords
     end
 
     def deleted?
-      deleted_at if is_permanent?
+      if is_permanent?
+        !!deleted_at
+      else
+        destroyed?
+      end
     end
 
     def revive(validate = nil)
@@ -55,18 +59,22 @@ module PermanentRecords
         else
           record.save!
         end
-        @attributes, @attributes_cache = record.attributes, record.attributes
-        # workaround for active_record >= 3.2.0: re-wrap values of serialized attributes
-        # (record.attributes returns the plain values but in the instance variables they are expected to be wrapped)
-        if defined?(::ActiveRecord::AttributeMethods::Serialization::Attribute)
-          serialized_attribute_class = ::ActiveRecord::AttributeMethods::Serialization::Attribute
-          self.class.serialized_attributes.each do |key, coder|
-            if @attributes.key?(key)
-              attr = serialized_attribute_class.new(coder, @attributes[key], :unserialized)
-              @attributes[key] = attr
-              @attributes_cache[key] = attr
+        if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) < ::Gem::Version.new('4.2.0')
+          @attributes, @attributes_cache = record.attributes, record.attributes
+          # workaround for active_record >= 3.2.0: re-wrap values of serialized attributes
+          # (record.attributes returns the plain values but in the instance variables they are expected to be wrapped)
+          if defined?(::ActiveRecord::AttributeMethods::Serialization::Attribute)
+            serialized_attribute_class = ::ActiveRecord::AttributeMethods::Serialization::Attribute
+            self.class.serialized_attributes.each do |key, coder|
+              if @attributes.key?(key)
+                attr = serialized_attribute_class.new(coder, @attributes[key], :unserialized)
+                @attributes[key] = attr
+                @attributes_cache[key] = attr
+              end
             end
           end
+        else # AR >= 4.2.0
+          @attributes = record.instance_variable_get('@attributes')
         end
       rescue Exception => e
         # trigger dependent record destruction (they were revived before this record,
@@ -89,9 +97,8 @@ module PermanentRecords
       end.each do |name, reflection|
         cardinality = reflection.macro.to_s.gsub('has_', '')
         if cardinality == 'many'
-          records = send(name).unscoped.find(
-            :all,
-            :conditions => [
+          records = send(name).unscoped.where(
+            [
               "#{reflection.quoted_table_name}.deleted_at > ?" +
               " AND " +
               "#{reflection.quoted_table_name}.deleted_at < ?",

data/permanent_records.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jack Danger Canty", "David Sulc", "Joe Nelson", "Trond Arve Nordheim"]
+  s.authors = ["Jack Danger Canty", "David Sulc", "Joe Nelson", "Trond Arve Nordheim", "Josh Teneycke"]
   s.date = Date.today.to_s
   s.description = "Never Lose Data. Rather than deleting rows this sets Record#deleted_at and gives you all the scopes you need to work with your data."
   s.email = "gems@6brand.com"

data/spec/permanent_records_spec.rb

@@ -84,6 +84,10 @@ describe PermanentRecords do
       it 'really removes the record' do
         expect { subject }.to change { record.class.count }.by(-1)
       end
+
+      it 'makes deleted? return true' do
+        subject.should be_deleted
+      end
     end
 
     context 'with dependent records' do
@@ -120,7 +124,7 @@ describe PermanentRecords do
         end
       end
       context 'as default scope' do
-        let(:load_comments) { Comment.unscoped.find_all_by_hole_id(subject.id) }
+        let(:load_comments) { Comment.unscoped.where(:hole_id => subject.id) }
         context 'with :has_many cardinality' do
           before {
             load_comments.size.should == 2

data/spec/spec_helper.rb

@@ -17,6 +17,10 @@ module Rails
   def self.env; 'test'end
 end
 
+if I18n.config.respond_to?(:enforce_available_locales)
+  I18n.config.enforce_available_locales = true
+end
+
 require 'logger'
 ActiveRecord::Base.logger = Logger.new support.join("debug.log")
 ActiveRecord::Base.configurations = YAML::load_file support.join('database.yml')

data/spec/support/comment.rb

@@ -1,5 +1,5 @@
 class Comment < ActiveRecord::Base
   belongs_to :hole
 
-  default_scope where(:deleted_at => nil)
+  default_scope { where(:deleted_at => nil) }
 end

data/spec/support/database.yml

@@ -1,6 +1,6 @@
 test:
-  :adapter: postgresql
-  :database: permanent_records
+  :adapter: sqlite3
+  :database: ":memory:"
   :min_messages: ERROR
 # sqlite:
 #   :adapter: sqlite

data/spec/support/difficulty.rb

@@ -1,5 +1,9 @@
 class Difficulty < ActiveRecord::Base
   belongs_to :hole
 
-  default_scope where(:deleted_at => nil)
-end
+  if ActiveRecord::VERSION::STRING == '3.0.0'
+    default_scope where(:deleted_at => nil)
+  else
+    default_scope { where(:deleted_at => nil) }
+  end
+end

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.2.0
 platform: ruby
 authors:
 - Jack Danger Canty
 - David Sulc
 - Joe Nelson
 - Trond Arve Nordheim
+- Josh Teneycke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !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'
 description: Never Lose Data. Rather than deleting rows this sets Record#deleted_at
@@ -50,7 +51,7 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE
 - README.markdown
@@ -58,8 +59,8 @@ files:
 - VERSION
 - lib/permanent_records.rb
 - permanent_records.gemspec
-- spec/spec_helper.rb
 - spec/permanent_records_spec.rb
+- spec/spec_helper.rb
 - spec/support/comment.rb
 - spec/support/database.yml
 - spec/support/difficulty.rb
@@ -82,18 +83,19 @@ 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.0.3
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 3
 summary: Soft-delete your ActiveRecord records
 test_files: []
+has_rdoc: