destroyed_at 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d63b138a42814623971150b35a82be8241fa698c
-  data.tar.gz: 7fc26af45fd4890ba6e705e0cada5c739c962cb9
+  metadata.gz: 0891b99ff62c41dcc3c065cb1ac598781707ea66
+  data.tar.gz: 15b26364c34fa8e7ba0868e995a787dcfa3b9328
 SHA512:
-  metadata.gz: 1cb8db486711ff5a47de49a2b5d47ad0cc45c2e437c341279590c6619acfefba7cdd6836e1a79193a43da033a138d54fe46fd0b0b9ecb84459a9a9da23630ea1
-  data.tar.gz: 885386854dcc5e2ecdb7e51d85f254a630bc68e8c1e4594d2f6f40179721f6a3609f59419401e062dab39682b22036349c9104539b9017eedd0f756ce1f0e862
+  metadata.gz: 5bd593a8e0d239de2196877179e935a02f0bf4ef3b1907396b405430011455a3bf4ba9771dbb434ac6498e5ff05aea79ab25d9375f84752831c90cb10e385120
+  data.tar.gz: 27072734f2bcfcf621ef0fe54748b2d035477f5f7cf228e7fc4533d47b385eca584308bd47601c816ebe39b3d94b88ed1ce52ab6882477fd04b60d5ee34c8c8d

data/CHANGELOG.md

@@ -1,10 +1,18 @@
+## 1.0.0
+
+* Requires equal to or greater than Ruby `2.0` -
+  [ryanwood](https://github.com/ryanwood)
+* Updates `reflections` to `_reflections` -
+  [mukimov](https://github.com/mukimov)
+* Fixes an exception which was was raised when attempting to destroy a 
+target record whose parent did not mix in DestroyedAt.
+
 ## 0.4.0
 
 * Updates for Rails 4.1
 * Removes `.with_default_scope` which has been deprecated.
 * Enables retrieval of destroyed objects by time via `.destroyed`
-  method, which now takes an optional time attribute. - Lin Reid & Dan
-McClain
+  method, which now takes an optional time attribute. - [linstula](https://github.com/linstula) & [danmcclain](https://github.com/danmcclain)
 * Removes `m` as a development dependency, since it is not compatible
   with `minitest 5`.
 
@@ -12,13 +20,13 @@ McClain
 **Stable for Rails 4.0**
 
 * [Bug] Fixed route not raising when resource constant does not exist -
-  Brian Cardarella
+  [bcardarella](https://github.com/bcardarella)
 
 ## 0.3.0
 
-* Fix issue with has_many destroy against regular models - Brian
-  Cardarella
+* Fix issue with has_many destroy against regular models - [bcardarella](https://github.com/bcardarella)
 * Relation.destoyed removes the destoyed scope and adds a scope 
-  for records that have been destoyed - Dan McClain
-* Added /restore route for restorable resources - Brian Cardarella &
-  Romina Vargas
+  for records that have been destoyed -
+[danmcclain](https://github.com/danmcclain)
+* Added /restore route for restorable resources - [bcardarella](https://github.com/bcardarella) &
+  [rsocci](https://github.com/rsocci)

data/destroyed_at.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '~> 2.0'
 
   spec.add_runtime_dependency "activerecord", '~> 4.1'
   spec.add_runtime_dependency 'actionpack', '~> 4.1'

data/lib/destroyed_at.rb

@@ -14,6 +14,14 @@ module DestroyedAt
     end
   end
 
+  def self.destroy_target_of_association(owner, target)
+    if target.respond_to?(:destroyed_at) && owner.respond_to?(:destroyed_at)
+      target.destroy(owner.destroyed_at)
+    elsif target.respond_to?(:destroyed_at)
+      target.destroy
+    end
+  end
+
   module ClassMethods
     def destroyed(time = nil)
       query = where.not(destroyed_at: nil)
@@ -67,7 +75,7 @@ module DestroyedAt
   end
 
   def _restore_associations
-    reflections.select { |key, value| value.options[:dependent] == :destroy }.keys.each do |key|
+    _reflections.select { |key, value| value.options[:dependent] == :destroy }.keys.each do |key|
       assoc = association(key)
       reload_association = false
       if assoc.options[:through] && assoc.options[:dependent] == :destroy

data/lib/destroyed_at/belongs_to_association.rb

@@ -1,12 +1,10 @@
 module DestroyedAt
   module BelongsToAssociation
     def handle_dependency
-      if load_target
-        if options[:dependent] == :destroy && target.respond_to?(:destroyed_at)
-          target.destroy(owner.destroyed_at)
-        else
-          super
-        end
+      if load_target && method == :destroy
+        DestroyedAt.destroy_target_of_association(target, owner)
+      else
+        super
       end
     end
   end

data/lib/destroyed_at/has_one_association.rb

@@ -1,12 +1,10 @@
 module DestroyedAt
   module HasOneAssociation
     def delete(method = options[:dependent])
-      if load_target
-        if method == :destroy && target.respond_to?(:destroyed_at)
-          target.destroy(owner.destroyed_at)
-        else
-          super
-        end
+      if load_target && method == :destroy
+        DestroyedAt.destroy_target_of_association(target, owner)
+      else
+        super
       end
     end
   end

data/lib/destroyed_at/mapper.rb

@@ -14,7 +14,7 @@ ActionDispatch::Routing::Mapper.send(:prepend, DestroyedAt::Routes)
 module DestroyedAt::Resource
   def default_actions
     actions = super
-    class_name = self.name.camelcase.singularize
+    class_name = self.singular.camelcase
 
     if Module.const_defined?(class_name) && class_name.constantize.included_modules.include?(DestroyedAt)
       actions << :restore

data/lib/destroyed_at/routes.rb

@@ -13,7 +13,7 @@ module DestroyedAt::Mapper
   module Resource
     def default_actions
       actions = super
-      if self.name.camelcase.singularize.constantize.included_modules.include?(DestroyedAt)
+      if self.singular.camelcase.constantize.included_modules.include?(DestroyedAt)
         actions << :restore
       end
 

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

data/test/destroyed_at_test.rb

@@ -72,6 +72,15 @@ describe 'destroying an activerecord instance' do
     post.destroy
     Categorization.unscoped.count.must_equal 0
   end
+
+  it 'destroys child when parent does not mixin DestroyedAt' do
+    avatar = Avatar.create
+    author = Author.create(avatar: avatar)
+    author.destroy!
+
+    Author.count.must_equal 0
+    Avatar.count.must_equal 1
+  end
 end
 
 describe 'restoring an activerecord instance' do

data/test/mapper_test.rb

@@ -71,6 +71,19 @@ class MapperTest < ActiveSupport::TestCase
     end
   end
 
+  test 'does not raise if `:as` option is used in routes' do
+    draw do
+      resources :cars, as: :automobiles
+    end
+
+    begin
+      @set.recognize_path('/cars', method: :get)
+      assert true, 'path recognized'
+    rescue ActionController::RoutingError
+      assert false, 'this should not be reached'
+    end
+  end
+
   private
 
   def draw(&block)

data/test/test_helper.rb

@@ -28,6 +28,7 @@ ActiveRecord::Base.establish_connection(
 DatabaseCleaner.strategy = :truncation
 
 ActiveRecord::Base.connection.execute(%{CREATE TABLE authors (id INTEGER PRIMARY KEY);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE avatars (id INTEGER PRIMARY KEY, author_id INTEGER, destroyed_at DATETIME);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE categories (id INTEGER PRIMARY KEY);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE categorizations (id INTEGER PRIMARY KEY, category_id INTEGER, post_id INTEGER);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE comments (id INTEGER PRIMARY KEY, commenter_id INTEGER, post_id INTEGER, destroyed_at DATETIME);})
@@ -37,6 +38,12 @@ ActiveRecord::Base.connection.execute(%{CREATE TABLE posts (id INTEGER PRIMARY K
 
 class Author < ActiveRecord::Base
   has_many :posts
+  has_one :avatar, dependent: :destroy
+end
+
+class Avatar < ActiveRecord::Base
+  include DestroyedAt
+  belongs_to :author
 end
 
 class Category < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,9 +172,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.