effective_trash 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e6355d34b1b5d1e73b50589906cfe539315aa7
-  data.tar.gz: 5aa4eb0e2378f874b5d332fcfb64c44d688994c5
+  metadata.gz: 9aa7496caf63e3f09ad0778be9ef6c6b4a8667cd
+  data.tar.gz: af51ec535165f1a72c6f1bcf930f4761033bbed3
 SHA512:
-  metadata.gz: 13c35c0f114774263e289ed237ffa8a5827753df1030fc0b3b4486de5f1a9b0456df8a1e921beb3fcf0d4375742fd935cd7901fa0fc2fb51586c20596147e093
-  data.tar.gz: 624af54a2026c9aed71a2a9d3b5a750d0be980641829265635882f6f71f84533da1d6331fd9fb1d983a1daa213ffd5091d90e389d5550cf2e4119897ffa50040
+  metadata.gz: b8cf68d4f4fb439e7b99d6c687d93ac6def8e81707b26903d0de556defa9098c1953ca0ec2ce40c8d2a05f056f51582b179a799c13f4905c34df20e284deb9b6
+  data.tar.gz: 88dede0f9ca2cb31a9b0a75273fecf8d5db4551768718b0e2c22f89bade54748caa5c3857b3804af2b6550ab507672e19292bc1639fe13d3054006d3620f6960

data/app/models/effective/trash.rb

@@ -26,10 +26,8 @@ module Effective
       self[:details] || {}
     end
 
-    # So this is a Trash item
-    # When we delete ourselves, we restore this trash item first
-    def restore!
-      raise 'no attributes to restore from' unless details.kind_of?(Hash) && details[:attributes].present?
+    def to_object
+      raise 'no attributes to consider' unless details.kind_of?(Hash) && details[:attributes].present?
 
       resource = Effective::Resource.new(trashed_type)
       object = trashed_type.constantize.new(details[:attributes])
@@ -37,15 +35,20 @@ module Effective
       resource.nested_resources.each do |association|
         if details[association.name].present? && object.respond_to?("#{association.name}_attributes=")
           nested_attributes = details[association.name].inject({}) do |h, (index, nested)|
-            h[index] = nested[:attributes].except('id', association.inverse_of.foreign_key); h
+            h[index] = nested[:attributes].except('id', association.inverse_of&.foreign_key); h
           end
 
           object.send("#{association.name}_attributes=", nested_attributes)
         end
       end
 
-      object.save!(validate: false)
-      destroy!
+      object
+    end
+
+    # So this is a Trash item
+    # When we delete ourselves, we restore this trash item first
+    def restore!
+      to_object.save!(validate: false)
     end
 
   end

data/app/views/effective/trash/_trash.html.haml

@@ -1,8 +1,6 @@
 .panel.panel-default
   .panel-body
-    %p
-      %span.label.label-default= trash
-      = trash.trashed_to_s
+    %p= trash.trashed_to_s
 
     - if trash.trashed_extra.present?
       %p= trash.trashed_extra

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails