abstracted 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167a9098bb3ee8d92c0440127e25e5a0d4787c6b
-  data.tar.gz: 66c14332e72b5069de38355fa8e667afb2866364
+  metadata.gz: 829e21cb1af7f63f290d7e843cfdb842177f982d
+  data.tar.gz: caf2682e6db0978d768bbef23fbb9650ff3a8bf6
 SHA512:
-  metadata.gz: c5ff4b4b14bb6c1d87e1d5d2fadc6f3a8792bda873745eea7483c6fe887fba5089f8e1e0d2967ede7810f3f9506ac2aa537cee86d34ef50ac6f7673f9447b18e
-  data.tar.gz: d66691ec7844553af54ccd971a2ff125457a55054a9d2d76f8b653df5bd3ba4d944f48c1b2d13cf01ada567b6656d5b336822b1f648dc7fc5384d73a15d6b6cc
+  metadata.gz: 908fd779e22d8df77a269cab628612692737adc18f20f1ba0195e40cf4ff2f6aa2c26624c2f6c5a7c83f069ef21092a32424335961c68b71d2e3c83826e1ff5a
+  data.tar.gz: 5b3b91a3ce24e678104c553197d40cc0573d7ff9f42ae8596e8246e54825272a5cbf2c2888bfff720f6963b103b3a983afac9e2d2cf292d2535e5735ac51590e

data/app/controllers/abstract_resources_controller.rb

@@ -8,7 +8,6 @@ class AbstractResourcesController < ApplicationController
   respond_to :html, :xml, :js, :json #, :xlsx
 
   before_action :authenticate_user!
-  before_action :set_paper_trail_whodunnit
 
   include PrintControl
   include ResourceControl
@@ -170,7 +169,7 @@ class AbstractResourcesController < ApplicationController
 
   def destroy
     authorize resource
-    result = true if resource.destroy && update_parenthood
+    result = true if delete_resource && update_parenthood
     result ? (flash.now[:notice] = t('.success', resource: resource_class.to_s)) : (flash.now[:error] = t('.deleted.error',resource: resource_class.to_s))
     if result==true
       render layout:false, status: 200, locals: { result: true }
@@ -183,6 +182,14 @@ class AbstractResourcesController < ApplicationController
 
   private
 
+    def delete_resource
+      if resource.respond_to? :deleted_at
+        resource.update_attributes deleted_at: Time.now
+      else
+        resource.destroy
+      end
+    end
+
     # you can override this on your controller
     def redirect_after_create
       resources_url {}

data/app/controllers/concerns/resource_control.rb

@@ -107,7 +107,7 @@ module ResourceControl
   def resources_url options={}
     r=request.path
     options = case params[:action]
-      when 'create','update','delete','destroy'; ""
+      when 'create','update','delete','destroy'; {}
       else resource_options(options)
     end
     return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}$"
@@ -116,9 +116,9 @@ module ResourceControl
     scoop_from_error e
   end
 
-  def resource_options options={}
+  def resource_options options
     options.merge! params.except( "id", "controller", "action", "utf8", "_method", "authenticity_token" )
-    options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&")
+    options = (options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&"))
   end
 
   #

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -581,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Abstracted DRY's up your controllers totally