compass-fontcustom 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0812751debead28ea3d4591379fee7e0583fbc
-  data.tar.gz: 029b22c2336088adab8a978424fc3010ea114544
+  metadata.gz: ea8fcaf8c9cf900531ee2cac60cc449e8a00ede5
+  data.tar.gz: fbaa31bc881a18dd35e367311ffc77abe4d66e33
 SHA512:
-  metadata.gz: 2902fae6a25bde6f8943acecdb39e2ea5dc7d85e4f2a1724c23bc2517cb1ff04b60901ad8f585ef5907e67ef09ff45aab27c47f20eb1f241827dc5008257b406
-  data.tar.gz: 985c8f266cd4c3833e54cedd7c01259893977627a4564c801dc635f74e45274b5baa991459051736c9bc4f69a81719d032fabecdfdfca1255fa16bfb4b136041
+  metadata.gz: 4e1095302fad3596b4b5d8c5ed102888f3188375730fa93fc604f17f94412f09e58f6fb939071149a236ac64fd1a5a16f432ff245f170d0bff4b1477577ac868
+  data.tar.gz: 45ac78f054e80a76419ea92665a25141ce58f5669b0eae8a79e1446bb004b1d58de243697b7d018798095484ced1b13d1accaa299fe723125360f656c5cb50b2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+**1.3.0** Major release
+
+ - Bundles Fontcustom 1.3.0 -- #10
+ - Fixes an issue where fonts are not regenerated -- #11
+ - Adds Compass configuration option `fontcustom_input_paths` -- #12
+ - Adds Compass configuration option `fontcustom_fonts_path` -- #13
+ - Officially supporting Compass 1.0
+
 **1.2.0** Major release
 
  - Bundles Fontcustom 1.2.0

data/Gemfile

@@ -7,5 +7,5 @@ gem 'coveralls', :require => false
 group :development do
 	gem 'autotest-standalone'
 	gem 'autotest-growl' if RUBY_PLATFORM =~ /darwin/
-	gem 'autotest-fsevent'
+	gem 'autotest-fsevent', '>= 0.2.9'
 end

data/README.md

@@ -3,13 +3,14 @@
 [![Build Status](https://travis-ci.org/glaszig/compass-fontcustom.png?branch=master)](https://travis-ci.org/glaszig/compass-fontcustom)
 [![Gem Version](https://badge.fury.io/rb/compass-fontcustom.png)](http://badge.fury.io/rb/compass-fontcustom)
 [![Test Coverage](https://coveralls.io/repos/glaszig/compass-fontcustom/badge.png?branch=master)](https://coveralls.io/r/glaszig/compass-fontcustom)
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/glaszig/compass-fontcustom/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 [![endorse](https://api.coderwall.com/glaszig/endorsecount.png)](https://coderwall.com/glaszig)
 
 This is my attempt of integrating [Font Custom](http://fontcustom.com) with [Compass](http://compass-style.org).
 
 ## Requirements
 
-Made for ruby 1.9+. Tested on 1.9.3 and 2.0.0.  
+Made for ruby 1.9+. Tested on 1.9.3, 2.0.0 and 2.1.3.  
 You'll need to have fontforge and the [WOFF font toolset](http://people.mozilla.com/~jkew/woff) installed as outlined in the Font Custom [installation instructions](http://fontcustom.com/#installation).
 
 ## Installation
@@ -26,6 +27,18 @@ And then execute:
 
     $ bundle
 
+## Configuration
+
+Compass::Fontcustom adds the following configuration options to Compass.  
+Just add these to your project's `config/compass.rb`.
+
+- `fontcustom_hash`  
+  Enables/disables Fontcustom file name hashing.
+- `fontcustom_input_paths`  
+  Array of paths where to search for SVG files to build custom fonts from.
+- `fontcustom_fonts_path`  
+  Path to put generated font files in.
+
 ## Usage
 
 Syntactically it works like Compass' sprites feature.  
@@ -63,19 +76,6 @@ which will result into CSS along the lines of:
 > Generated CSS class names will be normalized and reserved characters removed.  
 > That means if you have a glyph file name of `a_R3ally-eXotic f1Le+Name.svg` the generated class name will be `.icon-myfont-a_R3ally-eXotic-f1Le-Name`.
 
-## Configuration options
-
-### Filename hashing
-
-You can choose to disable file name hashes if you're already using an asset pipeline which handles this for you:
-Use the `fontcustom_hash` option in `config.rb`
-
-```ruby
-compass_config do |config|
-  config.fontcustom_hash = false
-end
-```
-
 ## Contributing
 
 1. Fork it
@@ -89,3 +89,6 @@ end
 [MIT](https://raw.github.com/glaszig/compass-fontcustom/master/LICENSE)
 
 [![githalytics.com alpha](https://cruel-carlota.pagodabox.com/233dd6a31787ce3672d5e92e97a76965 "githalytics.com")](http://githalytics.com/glaszig/compass-fontcustom)
+
+
+

data/compass-fontcustom.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency "compass"
-  spec.add_dependency "fontcustom", "~> 1.2.0"
+  spec.add_dependency "compass", "~> 1.0.1"
+  spec.add_dependency "fontcustom", "~> 1.3.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/compass/fontcustom.rb

@@ -1,5 +1,6 @@
 require "compass"
 require "compass/fontcustom/version"
+require "compass/fontcustom/compass"
 require "compass/fontcustom/sass_extensions"
 require "compass/fontcustom/glyph_map"
 require "compass/fontcustom/font_importer"
@@ -15,8 +16,18 @@ module Compass
       true
     end
 
+    Compass::Configuration.add_configuration_property(:fontcustom_input_paths, "Array of paths where to search for SVG files to build custom fonts from") do
+      if defined? Rails
+        Rails.application.config.assets.paths
+      else
+        [Compass.configuration.images_path.to_s]
+      end
+    end
+
+    Compass::Configuration.add_configuration_property(:fontcustom_fonts_path, "Path to put generated font files in") do
+      Compass.configuration.fonts_path.to_s
+    end
+
     Sass.load_paths << FontImporter.new
   end
-end
-
-require "compass/fontcustom/rails" if defined?(Rails)
+end

data/lib/compass/fontcustom/compass.rb

@@ -0,0 +1,11 @@
+require 'compass/configuration'
+
+# https://github.com/Compass/compass/issues/802
+
+module Compass
+  module Configuration
+    def self.strip_trailing_separator(*args)
+      Data.strip_trailing_separator(*args)
+    end
+  end
+end

data/lib/compass/fontcustom/font_importer.rb

@@ -2,7 +2,7 @@ require 'erb'
 require 'tempfile'
 require 'fontcustom/error'
 require 'fontcustom/options'
-require 'fontcustom/util'
+require 'fontcustom/utility'
 require 'fontcustom/generator/font'
 
 module Compass
@@ -55,21 +55,20 @@ module Compass
         end
 
         def search_paths
-          [Compass.configuration.images_path.to_s]
+          Compass.configuration.fontcustom_input_paths.to_a
         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)
-          files = []
-          search_paths.each { |p| files.concat Dir[File.join(p, uri)] }
+          images = files(uri).sort
 
-          if files.empty?
+          if images.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] }
+          images.map { |f| File.basename(f)[0..-5] }
         end
 
         # Returns `Sass::Engine` options with defaults
@@ -118,8 +117,9 @@ module Compass
         # @param uri [String] the uri to glob files from
         # @return [Array]
         def files(uri)
-          [].tap do |files|
-            search_paths.each { |p| files.concat Dir[File.join p, uri] }
+          [].tap do |ary|
+            ary.concat Dir[uri]
+            search_paths.each { |p| ary.concat Dir[File.join p, uri] }
           end
         end
 

data/lib/compass/fontcustom/glyph_map.rb

@@ -1,5 +1,6 @@
 require 'fontcustom'
 require 'compass/fontcustom/configurable'
+require 'thor'
 
 module Compass
   module Fontcustom
@@ -38,17 +39,16 @@ module Compass
 
       # Starts the Fontcustom font generator to write font files to disk.
       def generate
-        unless exists?
-          args = self.class.config.generator_options || {}
-          args.merge!(
-            :input     => path,
-            :output    => output_dir,
-            :font_name => @name,
-            :no_hash   => !Compass.configuration.fontcustom_hash,
-            :quiet     => true
-          )
-          ::Fontcustom::Generator::Font.start [::Fontcustom::Options.new(args)]
-        end
+        args = self.class.config.generator_options || {}
+        args.merge!(
+          :input     => path,
+          :output    => output_dir,
+          :font_name => @name,
+          :no_hash   => !Compass.configuration.fontcustom_hash,
+          :quiet     => true,
+          :fonts     => []
+        )
+        ::Fontcustom::Base.new(args).compile
       end
 
       def filename
@@ -56,12 +56,8 @@ module Compass
         File.basename file, File.extname(file)
       end
 
-      def exists?
-        not glob.empty?
-      end
-
       def output_dir
-        Compass.configuration.fonts_path.to_s
+        Compass.configuration.fontcustom_fonts_path
       end
 
       def to_s

data/lib/compass/fontcustom/version.rb

@@ -1,5 +1,5 @@
 module Compass
   module Fontcustom
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/test/unit/font_importer_test.rb

@@ -26,6 +26,7 @@ class FontImporterTest < Test::Unit::TestCase
   def teardown
     Compass.reset_configuration!
     FileUtils.rm_r @output_path
+    FileUtils.rm_r '.fontcustom-manifest.json'
   end
 
   def render(scss)

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: compass-fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - glaszig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: fontcustom
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.3
 - !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: pry
   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'
 description: Fontcustom for Compass
@@ -94,10 +94,10 @@ files:
 - Rakefile
 - compass-fontcustom.gemspec
 - lib/compass/fontcustom.rb
+- lib/compass/fontcustom/compass.rb
 - 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
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Integrates Fontcustom with Compass

data/lib/compass/fontcustom/rails.rb

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