i18n_rails_helpers 0.13.0 → 0.14.0

data/Rakefile

@@ -1,4 +1,11 @@
 # coding: utf-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'

data/lib/contextual_link_helpers.rb

@@ -1,12 +1,13 @@
 module ContextualLinkHelpers
   # CRUD helpers
-  def icon_link_to(action, url, options = {})
+  def icon_link_to(action, url = nil, options = {})
+    url ||= {:action => action}
     options.merge!(:class => "icon icon-#{action}")
     
-    link_to(t_action(action), url, options)
+    link_to(t_action(action), url_for(url), options)
   end
   
-  def contextual_link_to(action, resource_or_model = nil)
+  def contextual_link_to(action, resource_or_model = nil, options = {})
     # Handle both symbols and strings
     action = action.to_s
     
@@ -22,21 +23,37 @@ module ContextualLinkHelpers
     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 ! can?(action.to_sym, model)
+    return if respond_to?(:can?) and cannot?(action.to_sym, model)
     
-    # Link generation
+    # Option generation
     case action
-    when 'new'
-      return icon_link_to(action, send("new_#{model_name}_path"))
-    when 'show'
-      return icon_link_to(action, send("#{model_name}_path", resource))
-    when 'edit'
-      return icon_link_to(action, send("edit_#{model_name}_path", resource))
     when 'delete'
-      return icon_link_to(action, send("#{model_name}_path", resource), :confirm => t_confirm_delete(resource), :method => :delete)
+      options.merge!(:confirm => t_confirm_delete(resource), :method => :delete)
+    end
+
+    # Path generation
+    case action
     when 'index'
-      return icon_link_to(action, send("#{model_name.pluralize}_path"))
+      if model
+        path = polymorphic_path(model)
+      else
+        path = url_for(:action => nil)
+      end
+    when 'show', 'delete'
+      if resource
+        path = polymorphic_path(resource)
+      else
+        return
+      end
+    else
+      if resource_or_model
+        path = polymorphic_path(resource_or_model, :action => action)
+      else
+        path = url_for(:action => action)
+      end
     end
+
+    return icon_link_to(action, path, options)
   end
   
   def contextual_links_for(action = nil, resource_or_model = nil)

data/lib/list_link_helpers.rb

@@ -29,7 +29,7 @@ module ListLinkHelpers
     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 ! can?(action.to_sym, model)
+    return if respond_to?(:can?) and cannot?(action.to_sym, model)
     
     # Link generation
     case action

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_rails_helpers
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 39
+  prerelease: 
   segments: 
   - 0
-  - 13
+  - 14
   - 0
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann"
@@ -14,33 +15,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +02:00
+date: 2011-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: i18n_rails_helpers
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: i18n
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id005
 description: Rails i18n view helpers for things like crud actions, models and and attributes.
 email: simon.huerlimann@cyt.ch
 executables: []
@@ -73,23 +122,27 @@ rdoc_options: []
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Rails i18n view helpers for things like crud actions, models and and attributes.