font_awesome-sass-rails 2.2.1 → 2.2.2

data/README.md

@@ -119,6 +119,12 @@ For hyphenated icon names, surround the icon name with quotes:
 awesome_icon(:'bookmark-empty').should == "<i class=\"icon-bookmark-empty\"></i>"
 ```
 
+Or just use underscores, which will be auto-converted to dashes.
+
+```ruby
+awesome_icon(:bookmark_empty).should == "<i class=\"icon-bookmark-empty\"></i>"
+```
+
 ## Version
 
 Font Awesome 2.0 is currently included. Enjoy :)

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/font_awesome-sass-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "font_awesome-sass-rails"
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-11-26"
+  s.date = "2012-12-03"
   s.description = "Use Font Awesome in your Rails app :)"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [

data/lib/font_awesome-sass/view_helper.rb

@@ -7,6 +7,9 @@ module FontAwesomeSass
       content ||= capture(&block) if block_given?
       content ||= ''
 
+      name = name.to_s.dasherize
+      name.gsub! /^icon-/, ''
+
       clazz = "icon-#{name}"
       clazz << " icon-#{size}" if size.to_s == 'large'
       clazz << " " << options.delete(:class) if options[:class]
@@ -19,7 +22,7 @@ module FontAwesomeSass
       size = options[:size] if options[:size]
       type = options.delete(:type) if options[:type]
 
-      clazz = "btn "
+      clazz = "btn"
       clazz << " btn-#{size}" if size
       clazz << " btn-#{type}" if type && %w{primary}.include?(type.to_s)
 

data/spec/font_awesome_sass/view_helper_spec.rb

@@ -5,13 +5,25 @@ describe FontAwesomeSass::ViewHelper do
           FontAwesomeSass::ViewHelper
   
   describe 'awesome_icon' do          
-    describe ".awesome_icon :ok, 'Okay :)'" do
+    describe ".awesome_icon :ok" do
       specify do
         awesome_icon(:ok).should == "<i class=\"icon-ok\"></i>"
       end
     end
 
-    describe ".awesome_icon :ok, 'Okay :)'" do
+    describe ".awesome_icon :oki_doki'" do
+      specify do
+        awesome_icon(:oki_doki).should == "<i class=\"icon-oki-doki\"></i>"
+      end
+    end
+
+    describe ".awesome_icon :icon_oki_doki'" do
+      specify do
+        awesome_icon(:icon_oki_doki).should == "<i class=\"icon-oki-doki\"></i>"
+      end
+    end
+
+    describe ".awesome_icon :ok, size: :large'" do
       specify do
         awesome_icon(:ok, size: :large).should == "<i class=\"icon-ok icon-large\"></i>"
       end
@@ -51,13 +63,22 @@ describe FontAwesomeSass::ViewHelper do
   end
 
   describe 'awesome_btn' do
+    specify do
+      res = awesome_btn do
+        awesome_icon(:ok) + awesome_icon(:plus)
+      end
+      res.should == "<a class=\"btn\" href=\"#\"><i class=\"icon-ok\"></i><i class=\"icon-plus\"></i></a>"
+    end
+
     specify do
       res = awesome_btn(:ok, size: 'large', type: 'primary', href: 'google.com') do
         awesome_icon(:ok) + awesome_icon(:plus)
       end
-      res.should == "<a class=\"btn  btn-large btn-primary\" href=\"google.com\"><i class=\"icon-ok\"></i><i class=\"icon-plus\"></i></a>"
+      res.should == "<a class=\"btn btn-large btn-primary\" href=\"google.com\"><i class=\"icon-ok\"></i><i class=\"icon-plus\"></i></a>"
     end
   end
+
+
   
   describe 'awesome_button' do
     describe ".awesome_button(:ok, size: 'large', type: 'primary', href: 'google.com') {'Okay :)'}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font_awesome-sass-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4348156922474268699
+      hash: -3702657322275677174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: