compass-fontcustom 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a503c96a46269f387121518502e538e211077cf9
-  data.tar.gz: 76eec2fa2928c3da1f65dd2de53d962be18bef04
+  metadata.gz: 09fd173b97e0decca5edd88875fa5933a0563fbf
+  data.tar.gz: 5aa0dd9935ab4fc1d858ffa79f6069243230addf
 SHA512:
-  metadata.gz: a9a72d46c048d49a2367d352681216441043028770279f571f9c25034ba26cda5fefc60003c6b18eabbdc853033da4a1ee12fb03161d3f81052124fd3e6185d0
-  data.tar.gz: 6a509cec8776ce4592be0832c39c84a0ceba91a6e0b3ab9c7c98f4c5b6165da2169ebdee3e43ef00c5668c89fac15537c2eadd67600eaddbda90eabf3791c8aa
+  metadata.gz: 5927c5e83d08a64cb9c374174a03700b18a9546a1798e84377515d0cf9b6f3ee72f26ac0ab2691b8d2658afeff14d73772a3a41f94c609a0a2af33a70819b872
+  data.tar.gz: 6dbb765920258fafc1bcb9e804e2f7e3a383577cf2cc4d1fb09f7fc89a4f72293de09563e243ce7edb777cbbd7d417e3662f22e6fe7e1a6c1205e2c79e633c2d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+**1.1.0** Minor release
+
+ - Bundles Fontcustom 1.1.0
+ - Adds proper support for Rails' asset pipeline. Should work with Rails >= 3.1, tested with 4.0.
+ - Changes/fixes behavior of naming CSS classes: Special characters, other than a-z and 0-9, are now being stripped when generating class names from glyph file names to prevent CSS from throwing up:  
+
+   File name `google+.svg` becomes class name `.icon-yourfont-google` -- without the `+` sign.
+
 **1.0.0** Feature release
 
  - Adding mixin for generating custom glyph classes

data/compass-fontcustom.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency "compass"
-  spec.add_dependency "fontcustom", "~> 1.0.0"
+  spec.add_dependency "fontcustom", "~> 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/compass/fontcustom.rb

@@ -17,4 +17,6 @@ module Compass
 
     Sass.load_paths << FontImporter.new
   end
-end
+end
+
+require "compass/fontcustom/rails" if defined?(Rails)

data/lib/compass/fontcustom/font_importer.rb

@@ -54,18 +54,22 @@ module Compass
           path
         end
 
+        def search_paths
+          [Compass.configuration.images_path.to_s]
+        end
+
         # Returns all glyph names inside the folder at `uri`.
         # @param uri [String] the uri to glob files from
         # @return [Array]
         def glyph_names(uri)
-          folder = Compass.configuration.images_path.to_s
-          files  = Dir[File.join(folder, uri)]
+          files = []
+          search_paths.each { |p| files.concat Dir[File.join(p, uri)] }
 
           if files.empty?
             raise Compass::SpriteException, %Q{No glyph images were found matching "#{uri}" in the images path. Your current images path is: #{folder}}
           end
 
-          files.map { |f| File.basename(f)[0..-5].gsub(' ', '-') }
+          files.map { |f| File.basename(f)[0..-5].gsub(/[^0-9A-Za-z]/, '') }
         end
 
         # Returns `Sass::Engine` options with defaults
@@ -114,9 +118,9 @@ module Compass
         # @param uri [String] the uri to glob files from
         # @return [Array]
         def files(uri)
-          folder = Compass.configuration.images_path.to_s
-          files = Dir[File.join(folder, uri)]
-          files
+          [].tap do |files|
+            search_paths.each { |p| files.concat Dir[File.join p, uri] }
+          end
         end
 
       end # end class methods

data/lib/compass/fontcustom/glyph_map.rb

@@ -1,4 +1,4 @@
-require 'fontcustom/generator/font'
+require 'fontcustom'
 require 'compass/fontcustom/configurable'
 
 module Compass
@@ -11,10 +11,19 @@ module Compass
       # @param context [Object] usually an instance of FontImporter
       def self.from_uri(uri, context)
         path, name = FontImporter.path_and_name uri
-        glyphs = FontImporter.files(uri).sort.map { |file| File.basename(file)[0..-5] }
+        glyphs = FontImporter.files(uri).sort
+
+        # TODO: improve extraction of aboslute path
+        path = File.dirname glyphs.first
+        glyphs.map! { |file| File.basename(file)[0..-5].gsub(/[^0-9A-Za-z]/, '') }
+
         new glyphs, path, name, context
       end
 
+      # @param glyphs [Array] all the glyphs found at path
+      # @param path [String] the absolute path where glyphs are stored
+      # @param name [String] the name of the glyph font
+      # @param context [Object] the invoking object
       def initialize(glyphs, path, name, context)
         raise StandardError, "No glyphs found at '#{path}'" if glyphs.empty?
         @glyphs = glyphs
@@ -32,13 +41,13 @@ module Compass
         unless exists?
           args = self.class.config.generator_options || {}
           args.merge!(
-            :input     => File.join(Compass.configuration.images_path.to_s, self.path),
+            :input     => path,
             :output    => output_dir,
             :font_name => @name,
-            :file_hash => Compass.configuration.fontcustom_hash,
-            :verbose   => false
+            :no_hash   => !Compass.configuration.fontcustom_hash,
+            :quiet     => true
           )
-          ::Fontcustom::Generator::Font.start [args]
+          ::Fontcustom::Generator::Font.start [::Fontcustom::Options.new(args)]
         end
       end
 

data/lib/compass/fontcustom/rails.rb

@@ -0,0 +1,11 @@
+module Compass
+  module Fontcustom
+
+    class FontImporter
+      def self.search_paths
+        Rails.application.config.assets.paths
+      end
+    end
+
+  end
+end

data/lib/compass/fontcustom/templates/stylesheet.scss.erb

@@ -10,11 +10,11 @@ $<%= name %>-glyphs: glyph-map("<%= uri %>");
 
 @mixin all-<%= name %>-glyphs {
   @include fontcustom-font-face($<%= name %>-glyphs);
-  @include glyphs($<%= name %>-glyphs, <%= glyph_names.join " " %>, $<%= name %>-font-base-class)
+  @include glyphs($<%= name %>-glyphs, <%= glyph_names.map{ |g| "'#{g}'" }.join " " %>, $<%= name %>-font-base-class)
 }
 
 @mixin <%= name %>-glyph($glyph-name) {
   @extend #{$<%= name %>-font-base-class};
-  $index: index(<%= glyph_names.join " " %>, $glyph-name);
+  $index: index(<%= glyph_names.map{ |g| "'#{g}'" }.join " " %>, $glyph-name);
   &:before { content: glyph($index); }
 }

data/lib/compass/fontcustom/version.rb

@@ -1,5 +1,5 @@
 module Compass
   module Fontcustom
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/test/fixtures/myfont/google+.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="415px" height="415px" viewBox="0 0 415 415" enable-background="new 0 0 415 415" xml:space="preserve">
+<g>
+	<polygon points="368.346,131.916 314.569,131.916 314.569,78.139 301.125,78.139 301.125,131.916 247.348,131.916 247.348,145.36 
+		301.125,145.36 301.125,199.137 314.569,199.137 314.569,145.36 368.346,145.36 	"/>
+	<path d="M188.43,232.613c-7.512-5.317-21.877-18.25-21.877-25.851c0-8.908,2.543-13.298,15.951-23.774
+		c13.745-10.74,23.472-25.836,23.472-43.4c0-20.905-9.311-41.283-26.79-48.004h26.352l18.599-13.445c0,0-62.333,0-83.108,0
+		c-37.26,0-72.326,28.228-72.326,60.926c0,33.413,25.398,60.381,63.304,60.381c2.636,0,5.197-0.052,7.705-0.232
+		c-2.46,4.709-4.219,10.015-4.219,15.521c0,9.286,4.995,16.815,11.312,22.96c-4.771,0-9.381,0.138-14.407,0.138
+		c-46.15,0-81.671,29.393-81.671,59.872c0,30.017,38.94,48.795,85.092,48.795c52.613,0,81.672-29.853,81.672-59.872
+		C217.488,262.557,210.387,248.142,188.43,232.613L188.43,232.613z M144.031,190.975L144.031,190.975
+		c-21.414-0.64-41.762-23.955-45.458-52.069c-3.695-28.119,10.661-49.641,32.069-49.001c21.406,0.644,41.763,23.205,45.46,51.32
+		C179.796,169.344,165.436,191.614,144.031,190.975L144.031,190.975z M135.646,333.229L135.646,333.229
+		c-31.898,0-54.938-20.192-54.938-44.449c0-23.773,28.576-43.562,60.475-43.218c7.445,0.079,14.382,1.277,20.681,3.315
+		c17.315,12.042,29.737,18.847,33.241,32.57c0.66,2.784,1.018,5.646,1.018,8.57C196.123,314.273,180.493,333.229,135.646,333.229z"
+		/>
+</g>
+</svg>

data/test/unit/font_importer_test.rb

@@ -50,6 +50,7 @@ class FontImporterTest < Test::Unit::TestCase
     assert css =~ %r{.#{fontname}-font}, "base font class missing"
     assert css =~ %r{.icon-#{fontname}-c}i, "icon c css class missing"
     assert css =~ %r{.icon-#{fontname}-d}i, "icon d css class missing"
+    assert css =~ %r{.icon-#{fontname}-google}i, "icon google+ css class missing"
   end
 
   def test_should_skip_file_name_hashes_if_option_is_set

data/test/unit/glyph_map_test.rb

@@ -16,4 +16,10 @@ class GlyphMapTest < Test::Unit::TestCase
     assert_equal 0, @glyph_map.index_for_glyph('C')
   end
 
+  def test_glyph_name_normalization
+    glyphs = @glyph_map.instance_variable_get(:@glyphs)
+    assert ! glyphs.include?('google+')
+    assert glyphs.include?('google')
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compass-fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - glaszig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/compass/fontcustom/configurable.rb
 - lib/compass/fontcustom/font_importer.rb
 - lib/compass/fontcustom/glyph_map.rb
+- lib/compass/fontcustom/rails.rb
 - lib/compass/fontcustom/sass_extensions.rb
 - lib/compass/fontcustom/templates/stylesheet.scss.erb
 - lib/compass/fontcustom/version.rb
@@ -104,6 +105,7 @@ files:
 - test/fixtures/myfont/C.svg
 - test/fixtures/myfont/D.svg
 - test/fixtures/myfont/a_R3ally-eXotic f1Le Name.svg
+- test/fixtures/myfont/google+.svg
 - test/test_helper.rb
 - test/unit/font_importer_test.rb
 - test/unit/glyph_map_test.rb
@@ -135,6 +137,7 @@ test_files:
 - test/fixtures/myfont/C.svg
 - test/fixtures/myfont/D.svg
 - test/fixtures/myfont/a_R3ally-eXotic f1Le Name.svg
+- test/fixtures/myfont/google+.svg
 - test/test_helper.rb
 - test/unit/font_importer_test.rb
 - test/unit/glyph_map_test.rb