font-awesome-sass 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ad1ab856c67caf3605b0763be27cbe2854da3b
-  data.tar.gz: fd4c2e8bb2ef057ae1774e69705c1e6a81b80b5d
+  metadata.gz: 96b3620e085f2ee618e5b57e44ce13c67b7167dc
+  data.tar.gz: 9cb2eb66b7211fd65f7c86bd105a29da258428c0
 SHA512:
-  metadata.gz: a7d5a580854d64caa2ffd6da64f0cbc3053610be05fde05de7eb66f484983226da957b251892fd0ae759c141231f9c66736b22bd4c2dd7711bc19d13852fa944
-  data.tar.gz: cf9dc067f40468f29aa52291f03405d09a820db150f83ae57900d7dd5b7fd37de2f802fa8510fbbbb059b55f4e729266aa2a862ad912b61ba07fe4c6efe3403a
+  metadata.gz: fe7a439d9d38a95512b8b57bde5ad857baf97e8d3ca8a4ef06727d07673deb9cd8ec4acc1efd3d0745ec67c84a6535c91e53228163f147c1b9f3af447bf93379
+  data.tar.gz: 61b5690489f806518c64c6797a4d42d3e1bb347d99aff711807f92234ba98629807e36bf69d362167ca908dab268dce0c899951ee1f8e0eedb0da80d8356a337

data/README.md

@@ -1,6 +1,6 @@
 # Font::Awesome::Sass
 
-Font-Awesome SASS gem for use in Ruby/Rails projects
+Font-Awesome SASS gem for use in Ruby projects
 
 ## Installation
 
@@ -18,4 +18,35 @@ Or install it yourself as:
 
 If you use Rails/Sprockets, add this to e.g. application.css.scss:
 
-    *= require font-awesome
+    *= require font-awesome
+
+## Upgrading from 3.*
+
+Prepend the `fa` class to existing icons:
+
+    3.* Syntax
+    <i class="icon-github"></i>
+
+    4.* Syntax
+    <i class="fa fa-github"></i>
+
+## Rails Helper usage
+
+In your view:
+
+  ```ruby
+  icon('flag')
+  # => <i class="fa fa-flag"></i>
+  ```
+
+  ```ruby
+  icon('flag', '', class: 'strong')
+  # => <i class="fa fa-flag strong"></i>
+  ```
+
+  ```ruby
+  icon('flag', 'Font Awesome', id: 'my-icon', class: 'strong')
+  # => <i id="my-icon" class="fa fa-flag strong"></i> Font Awesome
+  ```
+
+Note: the icon helper can take a hash of options that will be passed to the content_tag helper

data/font-awesome-sass.gemspec

@@ -1,25 +1,28 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'font/awesome/sass/version'
+
+require 'font_awesome/sass/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "font-awesome-sass"
-  spec.version       = Font::Awesome::Sass::VERSION
-  spec.authors       = ["Travis Chase"]
-  spec.email         = ["travis@travischase.me"]
-  spec.description   = "Font-Awesome SASS gem for use in Ruby/Rails projects"
-  spec.summary       = "Font-Awesome SASS"
-  spec.homepage      = "https://github.com/FortAwesome/font-awesome-sass"
-  spec.license       = "MIT"
+  spec.name          = 'font-awesome-sass'
+  spec.version       = FontAwesome::Sass::VERSION
+  spec.authors       = ['Travis Chase']
+  spec.email         = ['travis@travischase.me']
+  spec.description   = 'Font-Awesome SASS gem for use in Ruby projects'
+  spec.summary       = 'Font-Awesome SASS'
+  spec.homepage      = 'https://github.com/FortAwesome/font-awesome-sass'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'sass-rails'
+  spec.add_development_dependency 'compass'
 
-  spec.add_runtime_dependency 'sass-rails', '>= 3.1.1'
+  spec.add_runtime_dependency 'sass', '~> 3.2'
 end

data/lib/font-awesome-sass.rb

@@ -0,0 +1 @@
+require 'font_awesome/sass'

data/lib/font_awesome/sass.rb

@@ -0,0 +1,58 @@
+module FontAwesome
+  module Sass
+    class << self
+      def load!
+        if rails?
+          register_rails_engine
+        end
+
+        if compass?
+          register_compass_extension
+        end
+      end
+
+      def gem_path
+        @gem_path ||= File.expand_path('..', File.dirname(__FILE__))
+      end
+
+      def stylesheets_path
+        File.join(assets_path, 'stylesheets')
+      end
+
+      def fonts_path
+        File.join(assets_path, 'fonts')
+      end
+
+      def assets_path
+        @assets_path ||= File.join(gem_path, 'vendor', 'assets')
+      end
+
+      def compass?
+        defined?(::Compass)
+      end
+
+      def rails?
+        defined?(::Rails)
+      end
+
+      private
+
+      def register_compass_extension
+        ::Compass::Frameworks.register(
+          'font-awesome',
+          path: gem_path,
+          stylesheets_directory: stylesheets_path,
+          templates_directory: File.join(gem_path, 'templates')
+        )
+      end
+
+      def register_rails_engine
+        require 'sass-rails'
+        require 'font_awesome/sass/rails/engine'
+        require 'font_awesome/sass/rails/railtie'
+      end
+    end
+  end
+end
+
+FontAwesome::Sass.load!

data/lib/{font/awesome/sass → font_awesome/sass/rails}/engine.rb

@@ -1,6 +1,6 @@
-module Font
-  module Awesome
-    module Sass
+module FontAwesome
+  module Sass
+    module Rails
       class Engine < ::Rails::Engine
         initializer 'font-awesome-sass.assets.precompile' do |app|
           app.config.assets.precompile += %w(
@@ -10,4 +10,4 @@ module Font
       end
     end
   end
-end
+end

data/lib/font_awesome/sass/rails/helpers.rb

@@ -0,0 +1,17 @@
+module FontAwesome
+  module Sass
+    module Rails
+      module ViewHelpers
+        def icon(icon, text="", html_options={})
+          content_class = "fa fa-#{icon}"
+          content_class << " #{html_options[:class]}" if html_options.key?(:class)
+          html_options[:class] = content_class
+
+          html = content_tag(:i, nil, html_options)
+          html << " #{text}" unless text.blank?
+          html.html_safe
+        end
+      end
+    end
+  end
+end

data/lib/font_awesome/sass/rails/railtie.rb

@@ -0,0 +1,13 @@
+require "font_awesome/sass/rails/helpers"
+
+module FontAwesome
+  module Sass
+    module Rails
+      class Railtie < ::Rails::Railtie
+       initializer "font-awesome-sass.view_helpers" do
+          ActionView::Base.send :include, ViewHelpers
+        end
+      end
+    end
+  end
+end

data/lib/font_awesome/sass/version.rb

@@ -0,0 +1,5 @@
+module FontAwesome
+  module Sass
+    VERSION = '4.0.3'
+  end
+end

data/vendor/assets/stylesheets/font-awesome.scss

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.0.1
+ *  Font Awesome 4.0.3
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be
@@ -21,9 +21,13 @@
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
  *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 
+//= depend_on_asset "fontawesome-webfont.eot"
+//= depend_on_asset "fontawesome-webfont.svg"
+//= depend_on_asset "fontawesome-webfont.ttf"
+//= depend_on_asset "fontawesome-webfont.woff"
+
 @import "font-awesome/variables";
 @import "font-awesome/mixins";
 @import "font-awesome/path";

data/vendor/assets/stylesheets/font-awesome/_path.scss

@@ -3,11 +3,11 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: font-url('fontawesome-webfont.eot?v=#{$fa-version}');
-  src: font-url('fontawesome-webfont.eot?v=#{$fa-version}#iefix') format('embedded-opentype'),
-    font-url('fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
-    font-url('fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
-    font-url('fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
+  src: url('./fontawesome-webfont.eot?v=#{$fa-version}');
+  src: url('./fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+    url('./fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    url('./fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    url('./fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/vendor/assets/stylesheets/font-awesome/_variables.scss

@@ -1,7 +1,8 @@
 // Variables
 // --------------------------
+
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.0.2" !default;
+$fa-version:          "4.0.3" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:        (30em / 14) !default;
@@ -375,4 +376,3 @@ $fa-var-wheelchair: "\f193";
 $fa-var-vimeo-square: "\f194";
 $fa-var-try: "\f195";
 $fa-var-plus-square-o: "\f196";
-

metadata

@@ -1,73 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: font-awesome-sass
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Travis Chase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
-description: Font-Awesome SASS gem for use in Ruby/Rails projects
+        version: '3.2'
+description: Font-Awesome SASS gem for use in Ruby projects
 email:
 - travis@travischase.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - font-awesome-sass.gemspec
-- lib/font/awesome/sass.rb
-- lib/font/awesome/sass/engine.rb
-- lib/font/awesome/sass/version.rb
+- lib/font-awesome-sass.rb
+- lib/font_awesome/sass.rb
+- lib/font_awesome/sass/rails/engine.rb
+- lib/font_awesome/sass/rails/helpers.rb
+- lib/font_awesome/sass/rails/railtie.rb
+- lib/font_awesome/sass/version.rb
 - vendor/assets/fonts/fontawesome-webfont.eot
 - vendor/assets/fonts/fontawesome-webfont.svg
 - vendor/assets/fonts/fontawesome-webfont.ttf
@@ -97,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Font-Awesome SASS

data/lib/font/awesome/sass.rb

@@ -1,8 +0,0 @@
-module Font
-  module Awesome
-    module Sass
-      require 'font/awesome/sass/engine'
-      require 'font/awesome/sass/version'
-    end
-  end
-end

data/lib/font/awesome/sass/version.rb

@@ -1,7 +0,0 @@
-module Font
-  module Awesome
-    module Sass
-      VERSION = '4.0.2'
-    end
-  end
-end