link_to_action 0.2.3 → 0.2.4

data/README.md

@@ -134,6 +134,8 @@ size_class_large = 'btn-large'
 size_class_small = 'btn-small'
 size_class_mini = 'btn-mini'
 show_methods = [ :name, :title, :to_s ]
+destroy_confirm = true
+destroy_skip_pjax = false
 ```
 Look to `config/initializers/link_to_action.rb` for detailed description.
 
@@ -149,6 +151,11 @@ Look to `config/initializers/link_to_action.rb` for detailed description.
 :icon_swap # Swap default position of icon left-right
 ```
 
+`link_to_destroy` options:
+```ruby
+:confirm # true/false or some text per-link basis
+```
+
 `link_to_show` options:
 ```ruby
 :name # overwrites default name of the link
@@ -166,6 +173,12 @@ link_to_new Comment, params: {user_id: 1} # /comments/new?user_id=1
 link_to_new [ @user, Comment ] # /users/1/comments/new
 ```
 
+## TODO
+
+1. Add templates to change Rails scaffold templates.
+2. Better testing.
+3. Improve README, add more examples.
+
 ## Contributing
 
 1. Fork it

data/lib/generators/link_to_action/install_generator.rb

@@ -5,14 +5,16 @@ module LinkToAction
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Copy LinkToAction configuration file"
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('../../..', __FILE__)
 
       def copy_initializers
-        copy_file 'link_to_action.rb', 'config/initializers/link_to_action.rb'
+        copy_file 'generators/link_to_action/templates/link_to_action.rb',
+          'config/initializers/link_to_action.rb'
       end
 
       def copy_locale_file
-        copy_file 'en.yml', 'config/locales/link_to_action.en.yml'
+        copy_file 'link_to_action/locale/en.yml',
+          'config/locales/link_to_action.en.yml'
       end
     end
   end

data/lib/generators/link_to_action/templates/link_to_action.rb

@@ -43,4 +43,8 @@ LinkToAction.setup do |config|
 
   # Methods for link_to_show
   # config.show_methods = [ :name, :title, :to_s ]
+  
+  # Destroy link options
+  # config.destroy_confirm = true
+  # config.destroy_skip_pjax = false
 end

data/lib/link_to_action/helpers.rb

@@ -1,5 +1,7 @@
 # require 'ruby-debug'
 # uncomment line above add 'debugger' somewhere (without quotes) to debug something
+require_relative 'utils'
+
 module LinkToAction::Helpers
   def link_to_new(object, options = {})
     link_to_action(:new, object, options)
@@ -15,8 +17,20 @@ module LinkToAction::Helpers
 
   def link_to_destroy(object, options = {})
     options[:method] = :delete
-    options[:data] = { :confirm => t(:'helpers.link_to.destroy_confirm') }
-    options['data-skip-pjax'] = true
+    if (options.has_key? :confirm)
+      confirm = options.delete(:confirm)
+    else
+      confirm = LinkToAction.destroy_confirm
+    end
+    if confirm
+      if confirm.kind_of?(String)
+        confirm_text = confirm
+      else
+        confirm_text = t(:'helpers.link_to.destroy_confirm')
+      end
+      options[:data] = { :confirm => confirm_text }
+    end
+    options['data-skip-pjax'] = true if LinkToAction.destroy_skip_pjax
     link_to_action(:destroy, object, options)
   end
 
@@ -37,49 +51,22 @@ module LinkToAction::Helpers
     link_to name, object, options
   end
 
-  # TODO: Move to separate module to avoid clashes
+  # TODO: Find the way to move this to separate module without loosing access to Rails helpers
+  # TODO: all these LinkToAction:: are not DRY, do something with this
   private
   
-  def action_class(action, options)
-    if LinkToAction.use_classes
-      class_default = LinkToAction.class_default
-      class_action = LinkToAction.send("class_#{action}")
-    end
-    size = options.delete(:size) || 'default'
-    classes = []
-    classes = [ class_default, class_action ] unless class_action == ''
-    if options[:class]
-      classes = if LinkToAction.classes_append
-        classes.concat [ options[:class] ]
-      else
-        [ options[:class] ]
-      end
-    end
-    classes = classes.concat([ size_class(size) ]).compact.join(' ')
-    classes unless classes.blank?
-  end
-
-  def size_class(size)
-    LinkToAction.send("size_class_#{size}")
-  end
-
-  def action_icon(action, icon, icon_size)
-    icon_size = nil if icon_size == :default
-    [ icon, icon_size ].compact.map {|i| "icon-#{i}"}.join(' ') unless icon == ''
-  end
-
   def link_to_action(action, object, options)
-    name = options.delete(:name) || t_action(object, action)
+    name = options.delete(:name) || LinkToAction::Utils::t_action(object, action)
     params = options.delete(:params) || {}
     params[:action] = action if [ :new, :edit ].include? action
-    options[:class] = action_class(action, options)
-    icon = options.delete(:icon) || LinkToAction.send("icon_#{action}")
-    icon_size = options.delete(:icon_size) || LinkToAction.icons_size
-    iilink_to action_icon(action, icon, icon_size), name, action_path(action, object, params),
-      options if cancan?(action, object)
+    options[:class] = LinkToAction::Utils::action_class(action, options)
+    name = LinkToAction::Utils::add_icon_to_name(action, name, options)
+    if link_to_action_cancan?(action, object)
+      link_to name, link_to_action_path(action, object, params), options
+    end
   end
 
-  def action_path(action, object, params)
+  def link_to_action_path(action, object, params)
     if action == :back
       action
     else
@@ -87,36 +74,9 @@ module LinkToAction::Helpers
     end
   end
 
-  def cancan?(*args)
+  def link_to_action_cancan?(*args)
     args[0] == :back || ( LinkToAction.use_cancan ? can?(*args) : true )
   end
-
-  def iilink_to(icon, name, path, options = {})
-    icon_swap = options.delete(:icon_swap)
-    if LinkToAction.use_icons && icon
-      icon = "<i class=\"#{icon}\"></i>"
-      name = [icon, ERB::Util.html_escape(name) ]
-      name.reverse! unless LinkToAction.icons_place_left
-      name.reverse! if icon_swap
-      name = raw(name.join(' '))
-    end
-    link_to name, path, options
-  end
-
-  # TODO: inspect some advanced I18n
-  # actionpack/lib/action_view/helpers/form_helper.rb, submit_default_value
-  def t_action(object, action)
-    object = object.last if object.kind_of? Array
-    model = if object.respond_to?(:model_name)
-      object.model_name.human
-    else
-      object.class.model_name.human if object.class.respond_to?(:model_name)
-    end
-    
-    model = model.pluralize if action == :index
-
-    t(:"helpers.link_to.#{action}", model: model)
-  end
 end
 
 ActionView::Base.send :include, LinkToAction::Helpers

data/lib/link_to_action/utils.rb

@@ -0,0 +1,57 @@
+module LinkToAction::Utils
+  def self.action_icon(action, options)
+    icon = options.delete(:icon) || LinkToAction.send("icon_#{action}")
+    icon_size = options.delete(:icon_size) || LinkToAction.icons_size
+    icon_size = nil if icon_size == :default
+    [ icon, icon_size ].compact.map {|i| "icon-#{i}"}.join(' ') unless icon == ''
+  end
+
+  def self.add_icon_to_name(action, name, options)
+    icon = self.action_icon(action, options)
+    icon_swap = options.delete(:icon_swap)
+    if LinkToAction.use_icons && icon
+      icon = "<i class=\"#{icon}\"></i>"
+      name = [icon, ERB::Util.html_escape(name) ]
+      name.reverse! unless LinkToAction.icons_place_left
+      name.reverse! if icon_swap
+      name.join(' ').html_safe
+    else
+      name
+    end
+  end
+
+  def self.action_class(action, options)
+    if LinkToAction.use_classes
+      class_default = LinkToAction.class_default
+      class_action = LinkToAction.send("class_#{action}")
+    end
+    size = options.delete(:size) || 'default'
+    classes = []
+    classes = [ class_default, class_action ] unless class_action == ''
+    if options[:class]
+      classes = if LinkToAction.classes_append
+        classes.concat [ options[:class] ]
+      else
+        [ options[:class] ]
+      end
+    end
+    size_class =  [ LinkToAction.send("size_class_#{size}") ]
+    classes = classes.concat(size_class).compact.join(' ')
+    classes unless classes.blank?
+  end
+  
+  # TODO: inspect some advanced I18n
+  # actionpack/lib/action_view/helpers/form_helper.rb, submit_default_value
+  def self.t_action(object, action)
+    object = object.last if object.kind_of? Array
+    model = if object.respond_to?(:model_name)
+      object.model_name.human
+    else
+      object.class.model_name.human if object.class.respond_to?(:model_name)
+    end
+    
+    model = model.pluralize if action == :index
+
+    I18n.t(:"helpers.link_to.#{action}", model: model)
+  end
+end

data/lib/link_to_action/version.rb

@@ -1,3 +1,3 @@
 module LinkToAction
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/link_to_action.rb

@@ -71,6 +71,12 @@ module LinkToAction
 
   mattr_accessor :show_methods
   @@show_methods = [ :name, :title, :to_s ]
+  
+  mattr_accessor :destroy_confirm
+  @@destroy_confirm = true
+  
+  mattr_accessor :destroy_skip_pjax
+  @@destroy_skip_pjax = false
 
   def self.setup
     yield self

data/test/default_values_test.rb

@@ -23,7 +23,9 @@ class DefaultValuesTest < ActiveSupport::TestCase
     size_class_large: 'btn-large',
     size_class_small: 'btn-small',
     size_class_mini: 'btn-mini',
-    show_methods: [ :name, :title, :to_s ]
+    show_methods: [ :name, :title, :to_s ],
+    destroy_confirm: true,
+    destroy_skip_pjax: false
   }
 
   DEFAULT_VALUES.each do |key, value|