i18n_rails_helpers 1.3.0 → 1.3.1

data/app/helpers/contextual_link_helpers.rb

@@ -48,11 +48,9 @@ module ContextualLinkHelpers
     end
   end
 
-  def contextual_link_to(action, options = {})
-    # We don't want to change the passed in options
-    options = options.dup
-
-    resource_or_model = options.delete(:resource) || options.delete(:model)
+  def contextual_link_to(action, resource_or_model = nil, link_options = {})
+    # We don't want to change the passed in link_options
+    options = link_options.dup
 
     # Handle both symbols and strings
     action = action.to_sym
@@ -81,34 +79,37 @@ module ContextualLinkHelpers
       options.merge!(:confirm => t_confirm_delete(resource), :method => :delete)
     end
 
-    # Path generation
-    case action
-    when :index
-      if explicit_resource_or_model
-        path = polymorphic_path(model)
-      else
-        path = url_for(:action => nil)
-      end
-    when :delete, :destroy
-      if explicit_resource_or_model
-        path = polymorphic_path(resource)
-      else
-        path = url_for(:action => :destroy)
-      end
-    else
-      if explicit_resource_or_model
-        path = polymorphic_path(resource_or_model, :action => action)
+    begin
+      # Path generation
+      case action
+      when :index
+        if explicit_resource_or_model
+          path = polymorphic_path(model)
+        else
+          path = url_for(:action => nil)
+        end
+      when :delete, :destroy
+        if explicit_resource_or_model
+          path = polymorphic_path(resource)
+        else
+          path = url_for(:action => :destroy)
+        end
       else
-        path = url_for(:action => action)
+        if explicit_resource_or_model
+          path = polymorphic_path(resource_or_model, :action => action)
+        else
+          path = url_for(:action => action)
+        end
       end
-    end
 
-    return icon_link_to(action, path, options)
-  end
+      return icon_link_to(action, path, options)
 
-  def contextual_links_for(options = {})
-    action = options.delete(:action)
+    rescue ActionController::UrlGenerationError
+      # This handles cases where we did exclude crud actions in the routing map.
+    end
+  end
 
+  def contextual_links_for(action = nil, resource_or_model = nil, options = {})
     # Use current action if not specified
     action ||= action_name
 
@@ -127,14 +128,14 @@ module ContextualLinkHelpers
       actions << :new
     end
 
-    links = actions.map{|link_for| contextual_link_to(link_for, options)}
+    links = actions.map{|link_for| contextual_link_to(link_for, resource_or_model, options)}
 
     return links.join("\n").html_safe
   end
 
-  def contextual_links(options = {}, &block)
+  def contextual_links(action = nil, resource_or_model = nil, options = {}, &block)
     content_tag('div', :class => I18nRailsHelpers.contextual_class) do
-      content = contextual_links_for(options)
+      content = contextual_links_for(action, resource_or_model, options)
       if block_given?
         additional_content = capture(&block)
         content += ("\n" + additional_content).html_safe

data/lib/i18n_rails_helpers/version.rb

@@ -1,3 +1,3 @@
 module I18nRailsHelpers
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_rails_helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies: []
 description: Rails i18n view helpers for things like crud actions, models and and
   attributes.