font_awesome_rails 0.0.1 → 0.0.2

data/app/assets/stylesheets/font-awesome/_mixins.scss

@@ -6,7 +6,6 @@
 }
 
 @mixin icon-before($name) {
-  @extend %icon-before;
   @include icon-before-style {
     @include icon-content($name);
     @content;
@@ -14,7 +13,6 @@
 }
 
 @mixin icon-after($name) {
-  @extend %icon-after;
   @include icon-after-style {
     @include icon-content($name);
     @content;
@@ -23,7 +21,7 @@
 
 @mixin icon-content($name) {
   @extend %icon-content;
-  @extend %icon-#{$name};
+  content: icon-character($name);
 }
 
 @mixin icon-image($args...) {
@@ -43,16 +41,15 @@
 }
 
 @mixin icon-before-style {
-  &%icon-before:before {
+  &:before {
     @content;
   }
 }
 
 @mixin icon-after-style {
-  &%icon-after:after {
+  &:after {
     @content;
   }
 }
 
 @import "styles";
-@import "icons";

data/app/assets/stylesheets/font-awesome/_styles.scss

@@ -32,14 +32,6 @@
   }
 }
 
-li {
-  @include icon-style {
-    display: inline-block;
-    width: 1.25em;
-    text-align: center;
-  }
-}
-
 %icon-list {
   list-style-type: none;
   margin-left: 2em;

data/lib/font_awesome/sass_extensions/functions.rb

@@ -8,6 +8,8 @@ module FontAwesome
       included do
         declare :icon_image, [:name]
         declare :icon_image, [:name, :style]
+
+        declare :icon_character, [:name]
       end
 
       def icon_image(name, style=nil)
@@ -21,6 +23,12 @@ module FontAwesome
 
         Sass::Script::String.new icon.to_uri, :string
       end
+
+      def icon_character(name)
+        assert_type name, :String
+
+        Sass::Script::String.new HexCode.new(name.value).to_css, :string
+      end
     end
   end
 end

data/lib/font_awesome_rails/version.rb

@@ -1,3 +1,3 @@
 module FontAwesomeRails
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/font_awesome/sass_extensions/functions_spec.rb

@@ -41,6 +41,10 @@ describe FontAwesome::SassExtensions::Functions do
     it "returns a data-uri representation of the icon" do
       icon_image.should == Sass::Script::String.new("uri")
     end
+
+    it "quotes the returned string" do
+      icon_image.type.should == :string
+    end
   end
 
   describe "icon-image($name, $style)" do
@@ -65,5 +69,34 @@ describe FontAwesome::SassExtensions::Functions do
     it "returns a data-uri representation of the icon" do
       icon_image.should == Sass::Script::String.new("uri")
     end
+
+    it "quotes the returned string" do
+      icon_image.type.should == :string
+    end
+  end
+
+  it "declares icon-character($name)" do
+    EvaluationContext.declarations.should include [:icon_character, [:name]]
+  end
+
+  describe "icon-character($name)" do
+    subject(:icon_character) { functions.icon_character(name) }
+    let(:name) { Sass::Script::String.new("pizza") }
+    let(:hex_code) { stub("HexCode", to_css: "\\f00d") }
+
+    before { FontAwesome::HexCode.stubs(:new).with("pizza").returns(hex_code) }
+
+    it "requires that $name be a string" do
+      functions.expects(:assert_type).with(name, :String)
+      icon_character
+    end
+
+    it "returns the css-formatted hex code for the icon" do
+      icon_character.should == Sass::Script::String.new("\\f00d")
+    end
+
+    it "quotes the returned string" do
+      icon_character.type.should == :string
+    end
   end
 end

data/tasks/update.rake

@@ -4,5 +4,5 @@ desc "Update Font Awesome and generate code"
 task :update => "update:all"
 
 namespace :update do
-  task :all => [:font_awesome, :font, :hex_codes, :metrics, :sass, :classic]
+  task :all => [:font_awesome, :font, :hex_codes, :metrics, :classic]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font_awesome_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -138,7 +138,6 @@ files:
 - Rakefile
 - app/assets/stylesheets/_font-awesome.scss
 - app/assets/stylesheets/font-awesome/_font.scss
-- app/assets/stylesheets/font-awesome/_icons.scss
 - app/assets/stylesheets/font-awesome/_mixins.scss
 - app/assets/stylesheets/font-awesome/_styles.scss
 - font_awesome_rails.gemspec
@@ -160,7 +159,6 @@ files:
 - spec/tasks/update_classic_sass_task_spec.rb
 - spec/tasks/update_hex_codes_task_spec.rb
 - spec/tasks/update_metrics_task_spec.rb
-- spec/tasks/update_sass_task_spec.rb
 - tasks/gem_dir.rb
 - tasks/spec.rake
 - tasks/task.rb
@@ -171,11 +169,9 @@ files:
 - tasks/update/hex_codes.rake
 - tasks/update/metrics.rake
 - tasks/update/metrics.rb
-- tasks/update/sass.rake
 - tasks/update/update_classic_sass_task.rb
 - tasks/update/update_hex_codes_task.rb
 - tasks/update/update_metrics_task.rb
-- tasks/update/update_sass_task.rb
 - vendor/assets/font/fontawesome-webfont.eot
 - vendor/assets/font/fontawesome-webfont.svg
 - vendor/assets/font/fontawesome-webfont.ttf
@@ -196,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 185411375
+      hash: -24075267
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 185411375
+      hash: -24075267
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -222,4 +218,3 @@ test_files:
 - spec/tasks/update_classic_sass_task_spec.rb
 - spec/tasks/update_hex_codes_task_spec.rb
 - spec/tasks/update_metrics_task_spec.rb
-- spec/tasks/update_sass_task_spec.rb

data/app/assets/stylesheets/font-awesome/_icons.scss

@@ -1,210 +0,0 @@
-%icon-glass { content: '\f000'; }
-%icon-music { content: '\f001'; }
-%icon-search { content: '\f002'; }
-%icon-envelope { content: '\f003'; }
-%icon-heart { content: '\f004'; }
-%icon-star { content: '\f005'; }
-%icon-star-empty { content: '\f006'; }
-%icon-user { content: '\f007'; }
-%icon-film { content: '\f008'; }
-%icon-th-large { content: '\f009'; }
-%icon-th { content: '\f00a'; }
-%icon-th-list { content: '\f00b'; }
-%icon-ok { content: '\f00c'; }
-%icon-remove { content: '\f00d'; }
-%icon-zoom-in { content: '\f00e'; }
-%icon-zoom-out { content: '\f010'; }
-%icon-off { content: '\f011'; }
-%icon-signal { content: '\f012'; }
-%icon-cog { content: '\f013'; }
-%icon-trash { content: '\f014'; }
-%icon-home { content: '\f015'; }
-%icon-file { content: '\f016'; }
-%icon-time { content: '\f017'; }
-%icon-road { content: '\f018'; }
-%icon-download-alt { content: '\f019'; }
-%icon-download { content: '\f01a'; }
-%icon-upload { content: '\f01b'; }
-%icon-inbox { content: '\f01c'; }
-%icon-play-circle { content: '\f01d'; }
-%icon-repeat { content: '\f01e'; }
-%icon-refresh { content: '\f021'; }
-%icon-list-alt { content: '\f022'; }
-%icon-lock { content: '\f023'; }
-%icon-flag { content: '\f024'; }
-%icon-headphones { content: '\f025'; }
-%icon-volume-off { content: '\f026'; }
-%icon-volume-down { content: '\f027'; }
-%icon-volume-up { content: '\f028'; }
-%icon-qrcode { content: '\f029'; }
-%icon-barcode { content: '\f02a'; }
-%icon-tag { content: '\f02b'; }
-%icon-tags { content: '\f02c'; }
-%icon-book { content: '\f02d'; }
-%icon-bookmark { content: '\f02e'; }
-%icon-print { content: '\f02f'; }
-%icon-camera { content: '\f030'; }
-%icon-font { content: '\f031'; }
-%icon-bold { content: '\f032'; }
-%icon-italic { content: '\f033'; }
-%icon-text-height { content: '\f034'; }
-%icon-text-width { content: '\f035'; }
-%icon-align-left { content: '\f036'; }
-%icon-align-center { content: '\f037'; }
-%icon-align-right { content: '\f038'; }
-%icon-align-justify { content: '\f039'; }
-%icon-list { content: '\f03a'; }
-%icon-indent-left { content: '\f03b'; }
-%icon-indent-right { content: '\f03c'; }
-%icon-facetime-video { content: '\f03d'; }
-%icon-picture { content: '\f03e'; }
-%icon-pencil { content: '\f040'; }
-%icon-map-marker { content: '\f041'; }
-%icon-adjust { content: '\f042'; }
-%icon-tint { content: '\f043'; }
-%icon-edit { content: '\f044'; }
-%icon-share { content: '\f045'; }
-%icon-check { content: '\f046'; }
-%icon-move { content: '\f047'; }
-%icon-step-backward { content: '\f048'; }
-%icon-fast-backward { content: '\f049'; }
-%icon-backward { content: '\f04a'; }
-%icon-play { content: '\f04b'; }
-%icon-pause { content: '\f04c'; }
-%icon-stop { content: '\f04d'; }
-%icon-forward { content: '\f04e'; }
-%icon-fast-forward { content: '\f050'; }
-%icon-step-forward { content: '\f051'; }
-%icon-eject { content: '\f052'; }
-%icon-chevron-left { content: '\f053'; }
-%icon-chevron-right { content: '\f054'; }
-%icon-plus-sign { content: '\f055'; }
-%icon-minus-sign { content: '\f056'; }
-%icon-remove-sign { content: '\f057'; }
-%icon-ok-sign { content: '\f058'; }
-%icon-question-sign { content: '\f059'; }
-%icon-info-sign { content: '\f05a'; }
-%icon-screenshot { content: '\f05b'; }
-%icon-remove-circle { content: '\f05c'; }
-%icon-ok-circle { content: '\f05d'; }
-%icon-ban-circle { content: '\f05e'; }
-%icon-arrow-left { content: '\f060'; }
-%icon-arrow-right { content: '\f061'; }
-%icon-arrow-up { content: '\f062'; }
-%icon-arrow-down { content: '\f063'; }
-%icon-share-alt { content: '\f064'; }
-%icon-resize-full { content: '\f065'; }
-%icon-resize-small { content: '\f066'; }
-%icon-plus { content: '\f067'; }
-%icon-minus { content: '\f068'; }
-%icon-asterisk { content: '\f069'; }
-%icon-exclamation-sign { content: '\f06a'; }
-%icon-gift { content: '\f06b'; }
-%icon-leaf { content: '\f06c'; }
-%icon-fire { content: '\f06d'; }
-%icon-eye-open { content: '\f06e'; }
-%icon-eye-close { content: '\f070'; }
-%icon-warning-sign { content: '\f071'; }
-%icon-plane { content: '\f072'; }
-%icon-calendar { content: '\f073'; }
-%icon-random { content: '\f074'; }
-%icon-comment { content: '\f075'; }
-%icon-magnet { content: '\f076'; }
-%icon-chevron-up { content: '\f077'; }
-%icon-chevron-down { content: '\f078'; }
-%icon-retweet { content: '\f079'; }
-%icon-shopping-cart { content: '\f07a'; }
-%icon-folder-close { content: '\f07b'; }
-%icon-folder-open { content: '\f07c'; }
-%icon-resize-vertical { content: '\f07d'; }
-%icon-resize-horizontal { content: '\f07e'; }
-%icon-bar-chart { content: '\f080'; }
-%icon-twitter-sign { content: '\f081'; }
-%icon-facebook-sign { content: '\f082'; }
-%icon-camera-retro { content: '\f083'; }
-%icon-key { content: '\f084'; }
-%icon-cogs { content: '\f085'; }
-%icon-comments { content: '\f086'; }
-%icon-thumbs-up { content: '\f087'; }
-%icon-thumbs-down { content: '\f088'; }
-%icon-star-half { content: '\f089'; }
-%icon-heart-empty { content: '\f08a'; }
-%icon-signout { content: '\f08b'; }
-%icon-linkedin-sign { content: '\f08c'; }
-%icon-pushpin { content: '\f08d'; }
-%icon-external-link { content: '\f08e'; }
-%icon-signin { content: '\f090'; }
-%icon-trophy { content: '\f091'; }
-%icon-github-sign { content: '\f092'; }
-%icon-upload-alt { content: '\f093'; }
-%icon-lemon { content: '\f094'; }
-%icon-phone { content: '\f095'; }
-%icon-check-empty { content: '\f096'; }
-%icon-bookmark-empty { content: '\f097'; }
-%icon-phone-sign { content: '\f098'; }
-%icon-twitter { content: '\f099'; }
-%icon-facebook { content: '\f09a'; }
-%icon-github { content: '\f09b'; }
-%icon-unlock { content: '\f09c'; }
-%icon-credit-card { content: '\f09d'; }
-%icon-rss { content: '\f09e'; }
-%icon-hdd { content: '\f0a0'; }
-%icon-bullhorn { content: '\f0a1'; }
-%icon-bell { content: '\f0a2'; }
-%icon-certificate { content: '\f0a3'; }
-%icon-hand-right { content: '\f0a4'; }
-%icon-hand-left { content: '\f0a5'; }
-%icon-hand-up { content: '\f0a6'; }
-%icon-hand-down { content: '\f0a7'; }
-%icon-circle-arrow-left { content: '\f0a8'; }
-%icon-circle-arrow-right { content: '\f0a9'; }
-%icon-circle-arrow-up { content: '\f0aa'; }
-%icon-circle-arrow-down { content: '\f0ab'; }
-%icon-globe { content: '\f0ac'; }
-%icon-wrench { content: '\f0ad'; }
-%icon-tasks { content: '\f0ae'; }
-%icon-filter { content: '\f0b0'; }
-%icon-briefcase { content: '\f0b1'; }
-%icon-fullscreen { content: '\f0b2'; }
-%icon-group { content: '\f0c0'; }
-%icon-link { content: '\f0c1'; }
-%icon-cloud { content: '\f0c2'; }
-%icon-beaker { content: '\f0c3'; }
-%icon-cut { content: '\f0c4'; }
-%icon-copy { content: '\f0c5'; }
-%icon-paper-clip { content: '\f0c6'; }
-%icon-save { content: '\f0c7'; }
-%icon-sign-blank { content: '\f0c8'; }
-%icon-reorder { content: '\f0c9'; }
-%icon-list-ul { content: '\f0ca'; }
-%icon-list-ol { content: '\f0cb'; }
-%icon-strikethrough { content: '\f0cc'; }
-%icon-underline { content: '\f0cd'; }
-%icon-table { content: '\f0ce'; }
-%icon-magic { content: '\f0d0'; }
-%icon-truck { content: '\f0d1'; }
-%icon-pinterest { content: '\f0d2'; }
-%icon-pinterest-sign { content: '\f0d3'; }
-%icon-google-plus-sign { content: '\f0d4'; }
-%icon-google-plus { content: '\f0d5'; }
-%icon-money { content: '\f0d6'; }
-%icon-caret-down { content: '\f0d7'; }
-%icon-caret-up { content: '\f0d8'; }
-%icon-caret-left { content: '\f0d9'; }
-%icon-caret-right { content: '\f0da'; }
-%icon-columns { content: '\f0db'; }
-%icon-sort { content: '\f0dc'; }
-%icon-sort-down { content: '\f0dd'; }
-%icon-sort-up { content: '\f0de'; }
-%icon-envelope-alt { content: '\f0e0'; }
-%icon-linkedin { content: '\f0e1'; }
-%icon-undo { content: '\f0e2'; }
-%icon-legal { content: '\f0e3'; }
-%icon-dashboard { content: '\f0e4'; }
-%icon-comment-alt { content: '\f0e5'; }
-%icon-comments-alt { content: '\f0e6'; }
-%icon-bolt { content: '\f0e7'; }
-%icon-sitemap { content: '\f0e8'; }
-%icon-umbrella { content: '\f0e9'; }
-%icon-paste { content: '\f0ea'; }
-%icon-user-md { content: '\f200'; }

data/spec/tasks/update_sass_task_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-describe UpdateSassTask do
-  subject(:task) { UpdateSassTask.new }
-
-  def mock_icon(name, hex_code)
-    stub(name: name, hex_code: stub(to_css: "\\#{hex_code}"))
-  end
-
-  describe "#run" do
-    it "writes scss placeholders for icon content" do
-      task.stubs(:puts)
-      FontAwesome::Icon.stubs(:all).returns([mock_icon("pizza", "f00d"), mock_icon("linux", "f055")])
-      task.expects(:open_file).with("app/assets/stylesheets/font-awesome/_icons.scss", "w").yields(mock{
-        expects(:write).with("%icon-pizza { content: '\\f00d'; }\n%icon-linux { content: '\\f055'; }\n")
-      })
-      task.run
-    end
-  end
-end

data/tasks/update/sass.rake

@@ -1,6 +0,0 @@
-namespace :update do
-  task :sass do
-    require_relative "update_sass_task"
-    UpdateSassTask.new.run
-  end
-end

data/tasks/update/update_sass_task.rb

@@ -1,20 +0,0 @@
-require_relative "../task"
-require "font_awesome/icon"
-
-class UpdateSassTask < Task
-  def run
-    puts "* Updating #{path}"
-
-    open_file(path, "w") {|file| file.write contents }
-  end
-
-  def contents
-    FontAwesome::Icon.all.map do |icon|
-      "%icon-#{icon.name} { content: '#{icon.hex_code.to_css}'; }\n"
-    end.join
-  end
-
-  def path
-    "app/assets/stylesheets/font-awesome/_icons.scss"
-  end
-end