link_to_action 0.1.3 → 0.2.0

data/README.md

@@ -19,8 +19,7 @@ really pretty, you will also need icons.
 So how I18n-friendly button-style link with icon looks like in a view code?
 Well, it can look like this:
 
-    <%= link_to raw("<i class=\"icon-edit\"></i> #{t(:edit)}"),
-      edit_comment_path(@comment), class: 'btn' %>
+    <%= link_to raw("<i class=\"icon-edit\"></i> #{t(:edit)}"), edit_comment_path(@comment), class: 'btn' %>
 
 And scaffolded code was:
 
@@ -55,7 +54,7 @@ And then execute:
 
 Add initializer:
 
-    $ rake link_to_action:install
+    $ rails generate link_to_action:install
 
 Edit config/initializers/link_to_action.rb. Note that CSS classes, icons and
 cancan are disabled by default.

data/Rakefile

@@ -1,6 +1,5 @@
 #!/usr/bin/env rake
 begin
-  require 'bundler/gem_tasks'
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'

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

@@ -5,6 +5,9 @@ LinkToAction.setup do |config|
   # Add icons to links, default false
   # config.use_icons = false
 
+  # Place icons to left, default true
+  # config.icons_place_left = true
+
   # Icons by default are adopted to font-awesome
   # Icons size, default 'large'
   # config.icons_size = 'large'
@@ -18,6 +21,9 @@ LinkToAction.setup do |config|
   # Use classes, default false
   # config.use_classes = false
 
+  # Append classes when :class option is specified, default false
+  # config.classes_append = false
+
   # Classes by default are adopted to twitter-bootstrap
   # config.class_default = 'btn'
 
@@ -32,4 +38,4 @@ LinkToAction.setup do |config|
   # config.size_class_large = 'btn-large'
   # config.size_class_small = 'btn-small'
   # config.size_class_mini = 'btn-mini'
-end
+end

data/lib/link_to_action/helpers.rb

@@ -1,3 +1,5 @@
+# require 'ruby-debug'
+# uncomment line above add 'debugger' somewhere (without quotes) to debug something
 module LinkToAction::Helpers
   def link_to_new(object, options = {})
     link_to_action(:new, object, options)
@@ -27,9 +29,16 @@ module LinkToAction::Helpers
       class_action = LinkToAction.send("class_#{action}")
     end
     size = options.delete(:size) || 'default'
-    class_string = [ class_default, class_action, size_class(size),
-      options[:class] ].compact.join(' ')
-    class_string unless class_string.blank?
+    classes = [ class_default, class_action ]
+    if options[:class]
+      classes = if LinkToAction.classes_append
+        classes.concat [ options[:class] ]
+      else
+        options[:class]
+      end
+    end
+    classes = [ classes ,size_class(size) ].flatten.compact.join(' ')
+    classes.strip unless classes.blank?
   end
 
   def size_class(size)
@@ -37,6 +46,7 @@ module LinkToAction::Helpers
   end
 
   def action_icon(action, icon, icon_size)
+    icon_size = nil if icon_size == :default
     [ icon, icon_size ].compact.join(' ')
   end
 
@@ -64,10 +74,14 @@ module LinkToAction::Helpers
   end
 
   def iilink_to(icon_name, name, path, options = {})
+    icon_swap = options.delete(:icon_swap)
     if LinkToAction.use_icons
       icon_class = icon_name.split(' ').map {|i| "icon-#{i}"}.join(' ')
       icon = "<i class=\"#{icon_class}\"></i>"
-      name = raw("#{icon} #{ERB::Util.html_escape(name)}")
+      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

data/lib/link_to_action/version.rb

@@ -1,3 +1,3 @@
 module LinkToAction
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/link_to_action.rb

@@ -14,6 +14,10 @@ module LinkToAction
   mattr_accessor :icons_size
   @@icons_size = 'large'
 
+  # 'position' word is too long
+  mattr_accessor :icons_place_left
+  @@icons_place_left = true
+
   mattr_accessor :icon_new
   @@icon_new = 'plus'
 
@@ -29,6 +33,9 @@ module LinkToAction
   mattr_accessor :use_classes
   @@use_classes = false
 
+  mattr_accessor :classes_append
+  @@classes_append = false
+
   mattr_accessor :class_default
   @@class_default = 'btn'
 
@@ -60,4 +67,4 @@ module LinkToAction
   end
 end
 
-I18n.load_path << "#{File.dirname(__FILE__)}/link_to_action/locale/en.yml"
+I18n.load_path << "#{File.dirname(__FILE__)}/link_to_action/locale/en.yml"

data/link_to_action.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails", "~> 3.2.8"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "debugger"
 end

data/test/default_values_test.rb

@@ -5,11 +5,13 @@ class DefaultValuesTest < ActiveSupport::TestCase
     use_cancan: false,
     use_icons: false,
     icons_size: 'large',
+    icons_place_left: true,
     icon_new: 'plus',
     icon_edit: 'edit',
     icon_destroy: 'trash',
     icon_back: 'undo',
     use_classes: false,
+    classes_append: false,
     class_default: 'btn',
     class_new: 'btn-primary',
     class_edit: nil,
@@ -26,4 +28,4 @@ class DefaultValuesTest < ActiveSupport::TestCase
       assert_equal value, LinkToAction.send(key)
     end
   end
-end
+end