fontcustom 1.3.4 → 1.3.5.pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTRkNmEyNmI5ZTFhNjhhMTVmZTdlOTlkYzRiZTRhYWY2OGFkOGNkZg==
-  data.tar.gz: !binary |-
-    MGUzYTA4ZGNiZjBjN2M1NGJlY2ZkZWQxZDgwZjY3YzNiZjIzZjM3NQ==
+SHA1:
+  metadata.gz: 03162e2e3d2f981836841779efa778ea14db503b
+  data.tar.gz: ee716312d19ebe9444301e1915388ca8e94748cc
 SHA512:
-  metadata.gz: !binary |-
-    ZWVjYTY1N2Q4NWRkNzY0ZTFlMzY1ZGFmZTc1ZmNkZGJjZTM1YmYyMjA4NDc1
-    ZjI4MmY0NzJlODRjOWVhNTkxMTc2YTE4NTRmZWM4OWE0N2FiNWM5ZGM5N2E3
-    OWQ2NjlkYTBkMGRhODhmZjljYTMzYzUyZGE2MWVhOGIzOTk0MDg=
-  data.tar.gz: !binary |-
-    OWY3MTM5OWE1ZWMxMGVkMDFjNTExNGIzMTVjM2VmZjE3NDY3YTZjODhjMTI4
-    ZTQ4NGI0OWZiYWQzMGEwYzg0NTBmZjQ2N2RlYjgxNGIwMzFlY2ZhMzk5ZTNj
-    MTA0OGE2YzFiMWJiMGZlZmEwYzE4MTE1NDhhZjIyMjJiNzMxOGM=
+  metadata.gz: 5b44778820e39ae89a45f682e799894357c29a6e12ea90d312a7585c31672ddd9a670558b0383714cd61ad5eaae12769e960c7c0bfee969b49b0f97f0d2b296a
+  data.tar.gz: fc12e842ed7b575721ca81d9dc08036545e45843464ebdc3c714b05575a3347a8e6c369ce6a178737d72522ecce5d6df2051f7ac512bf94b3273de8b316c0967

data/.gitignore

@@ -16,5 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 spec/fixtures/sandbox/*
+spec/fixtures/.fontcustom-manifest.json
 .DS_Store
 .ruby-version

data/CONTRIBUTING.md

@@ -47,5 +47,5 @@ Some helpful links:
 That's all there is to it. Thanks again, and please don't hesitate to reach out:
 
 [Github Issues](https://github.com/FontCustom/fontcustom/issues)<br>
-[@ezYZ](https://twitter.com/ezYZ)<br>
+[@kaizau](https://twitter.com/kaizau)<br>
 [@endtwist](https://twitter.com/endtwist)

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/fontcustom.png)](http://badge.fury.io/rb/fontcustom)
 [![Build Status](https://api.travis-ci.org/FontCustom/fontcustom.png)](https://travis-ci.org/FontCustom/fontcustom)
-[![Code Quality](https://codeclimate.com/github/FontCustom/fontcustom.png)](https://codeclimate.com/github/FontCustom/fontcustom)
+[![Code Quality](https://codeclimate.com/github/FontCustom/fontcustom.png)](https://codeclimate.com/github/FontCustom/fontcustom) [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=32953)](https://www.bountysource.com/trackers/32953-endtwist-fontcustom?utm_source=32953&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 
 ## Font Custom
 
@@ -18,7 +18,8 @@ Requires **Ruby 1.9.2+**, **FontForge** with Python scripting.
 
 ```sh
 # On Mac
-brew install fontforge eot-utils
+brew install fontforge --with-python
+brew install eot-utils
 gem install fontcustom
 
 # On Linux
@@ -101,6 +102,8 @@ Custom templates have access to `@options`, `@manifest`, and the following ERB h
 
 * `font_name` 
 * `font_face`: FontSpring's [Bulletproof @font-face syntax](http://www.fontspring.com/blog/further-hardening-of-the-bulletproof-syntax)
+  - Font paths can be modified by passing a hash. `font_face(url: "font-url", path: @font_path_alt)`
+  - The `preview`, `scss`, and `scss-rails` templates use modified font paths. Compass users should use the `scss-rails` template.
 * `glyph_selectors`: comma-separated list of all selectors
 * `glyphs`: all selectors and their codepoint assignments (`.icon-example:before { content: "\f103"; }`)
 
@@ -118,4 +121,4 @@ Custom templates have access to `@options`, `@manifest`, and the following ERB h
 
 [Licenses](https://github.com/FontCustom/fontcustom/blob/master/LICENSES.txt)
 
-Brought to you by [@endtwist](https://github.com/endtwist) and [@ezYZ](https://github.com/ezYZ)
+Brought to you by [@endtwist](https://github.com/endtwist) and [@kaizau](https://github.com/kaizau)

data/gemfiles/Gemfile.listen_1

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in fontcustom.gemspec
-gemspec
+# Specify your gem"s dependencies in fontcustom.gemspec
+gemspec :path => ".."
 
-gem "listen", "~>1.0"
+gem "listen", "~>1.0"

data/lib/fontcustom/generator/template.rb

@@ -114,17 +114,23 @@ module Fontcustom
         @options[:font_name]
       end
 
-      def font_face(style = :normal)
-        case style
-        when :preprocessor
-          url = "font-url"
-          path = @font_path_alt
-        when :preview
-          url = "url"
-          path = @font_path_preview
+      def font_face(style = {})
+        if style.is_a?(Symbol)
+          if style == :preprocessor
+            url = "font-url"
+            path = @font_path_alt
+          elsif style == :preview
+            url = "url"
+            path = @font_path_preview
+          else
+            url = "url"
+            path = @font_path
+          end
+          say_message :warn, "`font_face(:#{style})` is deprecated. Use `font_face(url:'url', path:'path')` instead."
         else
-          url = "url"
-          path = @font_path
+          style = {:url => "url", :path => @font_path}.merge(style)
+          url = style[:url]
+          path = style[:path]
         end
 %Q|@font-face {
   font-family: "#{font_name}";

data/lib/fontcustom/templates/_fontcustom-rails.scss

@@ -2,7 +2,7 @@
 // Icon Font: <%= font_name %>
 //
 
-<%= font_face(:preprocessor) %>
+<%= font_face(url: "font-url", path: @font_path_alt) %>
 
 [data-icon]:before { content: attr(data-icon); }
 

data/lib/fontcustom/templates/_fontcustom.scss

@@ -2,7 +2,7 @@
 // Icon Font: <%= font_name %>
 //
 
-<%= font_face(:preprocessor) %>
+<%= font_face(path: @font_path_alt) %>
 
 [data-icon]:before { content: attr(data-icon); }
 

data/lib/fontcustom/templates/fontcustom-preview.html

@@ -121,7 +121,7 @@
 
       /* Icon Font: <%= font_name %> */
 
-      <%= font_face(:preview) %>
+      <%= font_face(path: @font_path_preview) %>
 
       [data-icon]:before { content: attr(data-icon); }
 

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.3.4"
+  VERSION = "1.3.5.pre"
 end

data/spec/fontcustom/watcher_spec.rb

@@ -70,7 +70,7 @@ describe Fontcustom::Watcher do
     end
 
     it "should call generators when custom templates change" do
-      expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
+      expect_any_instance_of(Fontcustom::Base).to receive(:compile)
 
       w = watcher(
         :input => {:vectors => "shared/vectors", :templates => "shared/templates"},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5.pre
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,7 +43,7 @@ dependencies:
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
     - - <
@@ -53,7 +53,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
     - - <
@@ -63,42 +63,42 @@ dependencies:
   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: bundler
   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: rspec
   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: Font Custom makes using vector icons easy. Generate icon fonts and supporting
@@ -119,7 +119,6 @@ files:
 - LICENSES.txt
 - README.md
 - Rakefile
-- TODO.md
 - bin/fontcustom
 - fontcustom.gemspec
 - gemfiles/Gemfile.listen_1
@@ -180,25 +179,24 @@ files:
 homepage: http://fontcustom.com
 licenses: []
 metadata: {}
-post_install_message: ! '>> Thanks for installing Font Custom! Please ensure that
-  fontforge is installed before compiling any icons. Visit <http://fontcustom.com>
-  for instructions.'
+post_install_message: '>> Thanks for installing Font Custom! Please ensure that fontforge
+  is installed before compiling any icons. Visit <http://fontcustom.com> for instructions.'
 rdoc_options: []
 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Generate icon fonts from the command line.

data/TODO.md

@@ -1,20 +0,0 @@
-## TODO
-
-### 1.3.0
-
-* redirect fontcustom.com to github repo (use wiki for documentation)
-
-### Future
-
-* Include fontcustom version in manifest / checksum
-* Error message if using the wrong version of ruby
-* Add more travis CLI rubies / thor versions?
-* Detect old manifest / show error message
-* Template helper that returns a hash of glyphs and pre-formatted codes
-* conserve code points: http://stackoverflow.com/questions/8794430/ruby-finding-lowest-free-id-in-an-id-array
-* strip /fill: rgba(...)/ from SVGs so that transparent SVGs don't fail
-* more flexible input/ouput hashes (regex or file extensions)
-* sass template with variables
-* less template with variables
-* more robust fontforge check than `which`
-* remove redundant requires