i18n_rails_helpers 1.2.0 → 1.3.0

data/app/helpers/contextual_link_helpers.rb

@@ -48,9 +48,11 @@ module ContextualLinkHelpers
     end
   end
 
-  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
+  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)
 
     # Handle both symbols and strings
     action = action.to_sym
@@ -104,7 +106,9 @@ module ContextualLinkHelpers
     return icon_link_to(action, path, options)
   end
 
-  def contextual_links_for(action = nil, resource_or_model = nil, options = {})
+  def contextual_links_for(options = {})
+    action = options.delete(:action)
+
     # Use current action if not specified
     action ||= action_name
 
@@ -123,14 +127,14 @@ module ContextualLinkHelpers
       actions << :new
     end
 
-    links = actions.map{|link_for| contextual_link_to(link_for, resource_or_model, options)}
+    links = actions.map{|link_for| contextual_link_to(link_for, options)}
 
     return links.join("\n").html_safe
   end
 
-  def contextual_links(action = nil, resource_or_model = nil, options = {}, &block)
+  def contextual_links(options = {}, &block)
     content_tag('div', :class => I18nRailsHelpers.contextual_class) do
-      content = contextual_links_for(action, resource_or_model, options)
+      content = contextual_links_for(options)
       if block_given?
         additional_content = capture(&block)
         content += ("\n" + additional_content).html_safe

data/app/helpers/list_link_helpers.rb

@@ -1,15 +1,44 @@
 module ListLinkHelpers
+  def action_to_icon(action)
+    case action.to_s
+    when 'new'
+      "plus"
+    when 'show'
+      "eye-open"
+    when 'edit'
+      "edit"
+    when 'delete'
+      "trash"
+    when "index", "list"
+      "list-alt"
+    when "update"
+      "refresh"
+    when "copy"
+      "repeat"
+    else
+      action
+    end
+  end
+
   # List link helpers
   def list_link_to(action, url, options = {})
-    options.merge!(:class => "icon-#{action}-text", :title => t_action(action))
-    
-    link_to(t_action(action), url, options)
+    classes = []
+    if class_options = options.delete(:class)
+      classes << class_options.split(' ')
+    end
+
+    icon = options.delete(:icon)
+    icon ||= action
+
+    link_to(url_for(url), options) do
+      content_tag(:i, "", :class => "icon-#{action_to_icon(icon)}")
+    end
   end
-  
+
   def list_link_for(action, resource_or_model = nil, options = {})
     # Handle both symbols and strings
     action = action.to_s
-    
+
     # Resource and Model setup
     # Support nested resources
     if resource_or_model.is_a? Array
@@ -17,7 +46,7 @@ module ListLinkHelpers
     else
       main_resource_or_model = resource_or_model
     end
-    
+
     # Use controller name to guess resource or model if not specified
     case action
     when 'new', 'index'
@@ -27,10 +56,10 @@ module ListLinkHelpers
       model = resource.class
     end
     model_name = model.to_s.underscore
-    
+
     # No link if CanCan is used and current user isn't authorized to call this action
     return if respond_to?(:can?) and cannot?(action.to_sym, model)
-    
+
     # Link generation
     case action
     when 'index', 'show'
@@ -41,17 +70,17 @@ module ListLinkHelpers
     else
       path = polymorphic_path(resource_or_model, :action => action)
     end
-    
+
     return list_link_to(action, path, options)
   end
-  
+
   def list_links_for(action = nil, resource_or_model = nil)
     # Use current action if not specified
     action ||= action_name
-    
+
     # Handle both symbols and strings
     action = action.to_s
-    
+
     actions = []
     case action
     when 'new', 'create'
@@ -63,9 +92,9 @@ module ListLinkHelpers
     when 'index'
       actions << 'new'
     end
-    
+
     links = actions.map{|link_for| contextual_link_to(link_for, resource_or_model)}
-    
+
     return links.join("\n").html_safe
   end
 end

data/lib/i18n_rails_helpers/version.rb

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

metadata

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