abstracted 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2829d61f4582508364fcbb86f3dc3f6e36f29c6
-  data.tar.gz: de3dd1080aa08996d921144ef1cded25eb74190a
+  metadata.gz: 3768a2fd0bc32496836612516717cd03550edb9a
+  data.tar.gz: a57bc2f9df972dc31cc87d696a111c36c6d67cf3
 SHA512:
-  metadata.gz: 48cd810f19699a6a154fd5c79e72bafbac130f7840b23bcde783539fd291129783dfec5089e37629747edff3a940ca36b5403b05b7cb536972e52074df518a52
-  data.tar.gz: 08ccfe7d563382d9f79bda47bfa9c3e2ac4440f8a3cdb2c7d63d2800959c7987b0d0d18946dfb13302a55af641f99c625a6202ca6ded9ae7e3c93ae51ef87798
+  metadata.gz: f8b7ed7d8e12fdd28b00ff5a8067b2847a751e4faf81e71c6e6207b4521031901108027d2c46b8d881abf6b47ca49ed956d1a4780b3a49302f64338c5d46bed6
+  data.tar.gz: 07263ffc2f2fa4eb11733b12aa89ec48fbbb27ac3a665c407c365c102a3548bd0173da12645623db33724abae22f047a98d40bbf0aa34de53b5beaba44a683ea

data/app/controllers/abstract_resources_controller.rb

@@ -229,7 +229,9 @@ class AbstractResourcesController < ApplicationController
 
 
     def scoop_from_error e
+
       raise e if %w{ test development }.include? Rails.env
+
       logger.debug "AbstractResourcesController##{params[:action]}: #{e.class}"
       a_url = root_path
 
@@ -317,4 +319,9 @@ class AbstractResourcesController < ApplicationController
 
     end
 
+    def error_counter
+      @error_counter ||= 0 
+      @error_counter = @error_counter + 1
+    end
+
 end

data/app/helpers/abstract_resources_helper.rb

@@ -70,13 +70,27 @@ module AbstractResourcesHelper
   #
   # resource_url returns the current entity's url
   def resource_url options={}
-    opt = {}
-    opt[:id] = options.id if options.class.ancestors.include? ActiveRecord::Base # edit_resource_url(@post)
-    opt.merge!(options) if options.class==Hash
-    opt[:action] ||= 'show'
-    opt[:id] ||= resource.id
-    opt[:controller] ||= resource_class.table_name
-    url_for opt
+    r=request.path
+    id=params[:id]
+    options = case params[:action]
+      when 'create','update','delete','destroy'; ""
+      else resource_options(options)
+    end
+    return "%s%s" % [r,options] if r.match "\/#{resource.class.to_s.tableize}\/#{id}(|\/#{params[:action]})$"
+    "%s%s" % [ r.split("/#{params[:action]}")[0], options]
+
+    # opt = {}
+    # opt[:id] = options.id if options.class.ancestors.include? ActiveRecord::Base # edit_resource_url(@post)
+    # opt.merge!(options) if options.class==Hash
+    # opt[:action] ||= 'show'
+    # opt[:id] ||= resource.id
+    # opt[:controller] ||= resource_class.table_name
+    # url_for opt
+  end
+
+  def resource_options options={}
+    options.merge! params.except( "id", "controller", "action", "utf8", "_method", "authenticity_token" )
+    options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&")
   end
 
   #
@@ -93,8 +107,12 @@ module AbstractResourcesHelper
   # edit_resource_url returns the current entity's url for editing
   def edit_resource_url(options={})
     opt = {}
-    opt[:id] = options.id if options.class.ancestors.include? ActiveRecord::Base # edit_resource_url(@post)
-    opt.merge!(options) if options.class==Hash
+    if options.class.ancestors.include? ActiveRecord::Base # edit_resource_url(@post)
+      return '' if options.id.nil? # raise "'id' value nil - cannot build edit_resource_url"
+      opt[:id] = options.id
+    else
+      opt.merge!(options) if options.class==Hash
+    end
     opt[:action] = :edit
     resource_url opt
     # opt[:id] ||= @resource.id

data/app/helpers/fab_button_helper.rb

@@ -34,7 +34,6 @@ LISTEND
     lst = []
     # if items are empty - dream them up
     options[:items] ||= {}
-
     options[:items].merge!( list: { ajax: 'get', icon: 'list', class: 'blue', url: resources_url(resources, controller: params[:controller]), oxremote: 'false'  }){ |key, v1, v2| v1 }
 
     case options[:action]

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails