i18n_rails_helpers 1.0.7 → 1.0.8

data/app/helpers/contextual_link_helpers.rb

@@ -29,7 +29,12 @@ module ContextualLinkHelpers
 
     classes << "btn"
 
-    url ||= {:action => action}
+    if action.is_a? Symbol
+      url ||= {:action => action}
+      title = t_action(action)
+    else
+      title = action
+    end
 
     icon = options.delete(:icon)
     icon ||= action
@@ -38,47 +43,47 @@ module ContextualLinkHelpers
     classes << "btn-#{type}"
 
     options.merge!(:class => classes.join(" "))
-    link_to(url_for(url), options) do 
-      content_tag(:i, "", :class => "icon-#{action_to_icon(icon)}") + " " + t_action(action)
+    link_to(url_for(url), options) do
+      content_tag(:i, "", :class => "icon-#{action_to_icon(icon)}") + " " + title
     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
 
     # Handle both symbols and strings
-    action = action.to_s
-    
+    action = action.to_sym
+
     # Resource and Model setup
     # Use controller name to guess resource or model if not specified
     case action
-    when 'new', 'index'
+    when :new, :index
       model = resource_or_model || controller_name.singularize.camelize.constantize
-    when 'show', 'edit', 'delete'
+    when :show, :edit, :delete
       resource = resource_or_model || instance_variable_get("@#{controller_name.singularize}")
       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?(:cannot?) and cannot?(action.to_sym, model)
-    
+
     # Option generation
     case action
-    when 'delete'
+    when :delete
       options.merge!(:confirm => t_confirm_delete(resource), :method => :delete)
     end
 
     # Path generation
     case action
-    when 'index'
+    when :index
       if model
         path = polymorphic_path(model)
       else
         path = url_for(:action => nil)
       end
-    when 'show', 'delete'
+    when :show, :delete
       if resource
         path = polymorphic_path(resource)
       else
@@ -94,31 +99,31 @@ module ContextualLinkHelpers
 
     return icon_link_to(action, path, options)
   end
-  
+
   def contextual_links_for(action = nil, resource_or_model = nil, options = {})
     # Use current action if not specified
     action ||= action_name
-    
+
     # Handle both symbols and strings
-    action = action.to_s
-    
+    action = action.to_sym
+
     actions = []
     case action
-    when 'new', 'create'
-      actions << 'index'
-    when 'show'
-      actions += ['edit', 'delete', 'index']
-    when 'edit', 'update'
-      actions += ['show', 'delete', 'index']
-    when 'index'
-      actions << 'new'
+    when :new, :create
+      actions << :index
+    when :show
+      actions += [:edit, :delete, :index]
+    when :edit, :update
+      actions += [:show, :delete, :index]
+    when :index
+      actions << :new
     end
-    
+
     links = actions.map{|link_for| contextual_link_to(link_for, resource_or_model, options)}
-    
+
     return links.join("\n").html_safe
   end
-  
+
   def contextual_links(action = nil, resource_or_model = nil, options = {})
     content_tag('div', :class => 'contextual') do
       contextual_links_for(action, resource_or_model, options)

data/lib/i18n_rails_helpers/version.rb

@@ -1,3 +1,3 @@
 module I18nRailsHelpers
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n_rails_helpers
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
+version: !ruby/object:Gem::Version
+  version: 1.0.8
+  prerelease: 
 platform: ruby
-authors: 
-- "Simon H\xC3\xBCrlimann (CyT)"
+authors:
+- Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-06 00:00:00 +02:00
-default_executable: 
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies: []
-
-description: Rails i18n view helpers for things like crud actions, models and and attributes.
+description: Rails i18n view helpers for things like crud actions, models and and
+  attributes.
 email: simon.huerlimann@cyt.ch
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - app/helpers/contextual_link_helpers.rb
 - app/helpers/i18n_helpers.rb
 - app/helpers/list_link_helpers.rb
@@ -38,39 +29,29 @@ files:
 - lib/i18n_rails_helpers/version.rb
 - rails/init.rb
 - README.markdown
-has_rdoc: true
 homepage: https://github.com/huerlisi/i18n_rails_helpers
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: I18n Rails helpers
 test_files: []
-
+has_rdoc: