less-rails-fontawesome 0.1.0 → 0.2.0

data/README.md

@@ -8,38 +8,52 @@ With LESS and fonts from [Font Awesome](http://fortawesome.github.com/Font-Aweso
 
 Add the gem to your *assets* group in the *Gemfile*:
 
+```ruby
     gem 'less-rails-fontawesome', :group => :assets
+```
 
 Then in your *app/assets/stylesheets/application.css.less*:
 
+```css
     @import 'fontawesome';
+```
 
 You can also use it with the [less-rails-bootstrap](https://github.com/metaskills/less-rails-bootstrap) gem.
 Just import *fontawesome* right after *twitter/bootstrap*:
 
+```css
     @import 'twitter/bootstrap';
     @import 'fontawesome';
+```
+
+([simple demo](http://sharp-ocean-6085.herokuapp.com/))
 
 
 ## Helper methods
 
-To place Font Awesome icon add to *i* element and set *class*
-attribute to an icon name, for example:
+To place Font Awesome icon add *i* element and set its *class*
+attribute to a icon name, for example:
 
+```html
     <i class="icon-trash"></i>
+```
+
+To ease placing icons in Rails *link_to* helper use
+the [ilink_to](https://github.com/wbzyl/less-rails-fontawesome/blob/master/application_helper.rb) helper method.
 
-To ease placing Font Awesome icons, I defined in
-[application_helper.rb](https://github.com/wbzyl/less-rails-fontawesome/blob/master/application_helper.rb)
-a few helper methods.
-For example, to place *icon-upload-alt* icon next to *Edit* button write something like:
+For example, to place the *icon-upload-alt* icon next to *Edit* write something like:
 
-    <%= ilink_to "upload-alt Edit", edit_post_path(post), class: 'btn btn-mini' %>
+```rhtml
+    <%= ilink_to "upload-alt", "Edit", edit_post_path(post), class: 'btn btn-mini' %>
+```
 
-to place *icon-trash* next to *Destroy* button write:
+or to place *icon-trash* next to text *Destroy* button write:
 
-    <%= ilink_to 'trash Destroy', post, confirm: 'Are you sure?', method: :delete, class: 'btn btn-mini btn-danger'%>
+```rhtml
+    <%= ilink_to "trash", "Destroy", post, confirm: 'Are you sure?', method: :delete, class: 'btn btn-mini btn-danger'%>
+```
 
-The idea is to prefix the link text with the icon name stripped off *icon-* prefix.
+(precede the link text with the icon name stripped off *icon-* prefix)
 
 
 ## License

data/application_helper.rb

@@ -2,13 +2,15 @@ module ApplicationHelper
 
   def ilink_to(*args, &block)
     if block_given?
-      options      = args.first || {}
-      html_options = args.second
-      ilink_to(capture(&block), options, html_options)
-    else
-      icon, name   = args[0].strip.split(' ', 2)
-      options      = args[1] || {}
+      icon = args[0]
+      options = args[1] || {}
       html_options = args[2]
+      ilink_to(icon, capture(&block), options, html_options)
+    else
+      icon = args[0]
+      name = args[1]
+      options = args[2] || {}
+      html_options = args[3]
 
       html_options = convert_options_to_data_attributes(options, html_options)
       url = url_for(options)
@@ -17,28 +19,30 @@ module ApplicationHelper
       tag_options = tag_options(html_options)
 
       href_attr = "href=\"#{ERB::Util.html_escape(url)}\"" unless href
-      "<a #{href_attr}#{tag_options}><i class=\"icon-#{icon}\"></i> #{ERB::Util.html_escape(name.html_safe || url)}</a>".html_safe
+      "<a #{href_attr}#{tag_options}><i class=\"icon-#{icon}\"></i> #{ERB::Util.html_escape(name || url)}</a>".html_safe
     end
   end
 
-  def ilink_to_unless
-    if condition
-      if block_given?
-        block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
-      else
-        name
-      end
-    else
-      ilink_to(name, options, html_options)
-    end
-  end
-
-  def ilink_to_if(condition, name, options = {}, html_options = {}, &block)
-    ilink_to_unless !condition, name, options, html_options, &block
-  end
-
-  def ilink_to_unless_current(name, options = {}, html_options = {}, &block)
-    ilink_to_unless current_page?(options), name, options, html_options, &block
-  end
+  # TODO:
+
+  # def ilink_to_unless
+  #   if condition
+  #     if block_given?
+  #       block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
+  #     else
+  #       name
+  #     end
+  #   else
+  #     ilink_to(name, options, html_options)
+  #   end
+  # end
+
+  # def ilink_to_if(condition, name, options = {}, html_options = {}, &block)
+  #   ilink_to_unless !condition, name, options, html_options, &block
+  # end
+
+  # def ilink_to_unless_current(name, options = {}, html_options = {}, &block)
+  #   ilink_to_unless current_page?(options), name, options, html_options, &block
+  # end
 
 end

data/lib/less-rails-fontawesome/version.rb

@@ -2,7 +2,7 @@ module Font
   module Awesome
     module Less
       module Rails
-        VERSION = "0.1.0"
+        VERSION = "0.2.0"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less-rails-fontawesome
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &18393920 !ruby/object:Gem::Requirement
+  requirement: &6127880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *18393920
+  version_requirements: *6127880
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &18393000 !ruby/object:Gem::Requirement
+  requirement: &6126840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *18393000
+  version_requirements: *6126840
 description: Font Awesome, LESS version, with assets pipeline, for Rails 3.1+ Asset
   Pipeline
 email:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: less-rails-fontawesome
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Font Awesome in LESS for Rails 3.1+ Asset Pipeline