fontrobot 0.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8c132e3d05391e3f79679bd1c384e7478ce27dcd
+  data.tar.gz: 3cf9b0c033571fcf21c68c9d8ea441af98a5a68c
+SHA512:
+  metadata.gz: 8addd02091a2d6ee8126ad6a4021bec6be65ee1eb85d4823bc46f4a1b9d8636e64485094f2d76f956fda2e9a2f813f3e408aefefa5e5205cc9ff7ebbbc925638
+  data.tar.gz: 916d7bb981eb0fcb7359097ed5ccd0be8e91e155135c90e05dfc2551c7c7aa14fa0705a9c1b714aa9ee376d16b66983f5e10a57a9b20dc9610ed635eab114ea0

data/LICENSES.txt

@@ -1,6 +1,7 @@
-fontrobot
+fontcustom
 
     Copyright (c) 2013 Tim Barkow
+    Copyright (c) 2012 Yifei Zhang, Joshua Gross
 
     MIT License
 

data/README.md

@@ -1,11 +1,17 @@
-FontRobot v0.1
+FontRobot v0.1.1
 ==========
 
 **Generate custom icon webfonts from the comfort of the command line.**
 
-This is a fork of Fontcustom, required so I could make changes and update the gem in a timely fashion. FontRobot extends Fontcustom, adding more control over how the @fontface declaration is created. See command-line options below for more details.
+This is a fork of Fontcustom. I needed a quick fork to work out the kinks using this gem in a large-scale production Rails environment. I'm testing it live every day. :) I hope to merge my changes upstream to Fontcustom soon (Just FYI).
 
-[Fontcustom documentation](http://fontcustom.github.com/fontcustom/)
+FontRobot is primarily designed to add more control over how the @fontface declaration is created. See command-line options below for more details.
+
+Fontrobot allows you specify the font order in @font-face, to inline font(s) as a data-uri, and creates an IE-compatible @font-face declaration. 
+
+Data-uri fonts are nice because they circumvent some browser's origin policies and they load fast. For best performance, make sure your server gzips all served assets.
+
+[Original Fontcustom documentation](http://fontcustom.github.com/fontcustom/)
 
 
 Installation
@@ -38,7 +44,7 @@ Command-line options
 --font_path, -f   => Specify a path for fonts in css @font-face declaration. Default: none
 
 --order, -r       => Specify font order in css @font-face. Default: "eot,ttf,woff,svg"
---inline, -i      => Include specified font fomats as data-uri in @font-face. Default: none. Format: "eot,ttf,woff,svg"
+--inline, -i      => Specify fonts to include as data-uri's in @font-face. Default: none. Format: "ttf,svg" One is enough though.
 
 --nohash          => (boolean) Disable filename hashes. Default: false
 --debug           => (boolean) Display debug messages. Default: false

data/{fontcustom.gemspec → fontrobot.gemspec}

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Generate custom icon webfonts from the command line.}
   gem.description   = %q{Transforms EPS and SVG vectors into icon webfonts. Generates Bootstrap compatible CSS for easy inclusion in your projects.}
   gem.homepage      = "http://robotloveskitten.github.com/fontrobot/"
+  gem.licenses      = ["MIT", "MPL 1.1/GPL 2.0/LGPL 2.1"]
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fontrobot/generator.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'thor/group'
 require 'base64'
+require 'zlib'
 
 module Fontrobot
   class Generator < Thor::Group
@@ -9,13 +10,11 @@ module Fontrobot
     desc 'Generates webfonts from given directory of vectors.'
 
     argument :input, :type => :string
-    class_option :output, :aliases => '-o'
-    class_option :name, :aliases => '-n'
-    class_option :font_path, :aliases => '-f'
-
+    class_option :output,     :aliases => '-o'
+    class_option :name,       :aliases => '-n'
+    class_option :font_path,  :aliases => '-f'
     class_option :order,      :aliases => '-r' # 'Specify font order in css @font-face. Default: "eot,ttf,woff,svg"'
     class_option :inline,     :aliases => '-i' # 'Inline font as data-uri in @font-face. Default: none. Format: "eot,ttf,woff,svg"'
-
     class_option :nohash,     :type => :boolean, :default => false
     class_option :debug,      :type => :boolean, :default => false
     class_option :html,       :type => :boolean, :default => false
@@ -46,17 +45,19 @@ module Fontrobot
     end
 
     def normalize_name
-      @name = if options.name
-        options.name.gsub(/\W/, '-').downcase
-      else
-        'fontrobot'
-      end
+      @name = (options.name) ? options.name.gsub(/\W/, '-').downcase : 'fontrobot'
     end
 
     def cleanup_output_dir
-      # simpler: how about we just delete everything in the dir?
-      old_files = Dir[File.join(@output, '*')]
-      old_files.each {|file| remove_file file }
+      old_files = ['fontrobot.css','fontrobot-ie7.css','test.html']
+      old_name = 'fontrobot'
+      css = File.join(@output, old_files[0])
+      if File.exists?(css)
+         line = IO.readlines(css)[3]
+         old_name = line.match(/Path:([^-]+)/)[1].downcase
+       end
+      old_files.concat(Dir[File.join(@output, old_name + '-*.{woff,ttf,eot,svg}')])
+      old_files.each { |file| remove_file File.join(@output, file) }
     end
 
 
@@ -78,7 +79,6 @@ module Fontrobot
     def show_paths
       file = Dir[File.join(@output, @name + '*.ttf')].first
       @path = file.chomp('.ttf')
-
       ['woff','ttf','eot','svg'].each do |type|
         say_status(:create, @path + '.' + type)
       end
@@ -86,8 +86,11 @@ module Fontrobot
 
 
     def fontface_sources
-      order = (options.order) ? options.order.split(",") : ['eot','ttf','woff','svg']
+      @inline_sources = false
+      fonts = (options.order) ? options.order.split(",") : ['eot','ttf','woff','svg']
       inline = (options.inline) ? options.inline.split(",") : []
+      zip = (options.zip.empty?) ? options.zip.split(",") : []
+      
       reorder = {}
       longtype = {
         'woff' => 'woff',
@@ -96,6 +99,7 @@ module Fontrobot
         'svg' => 'svg'
       }
 
+      # set url path for font files
       if(!options.font_path.nil?)
         font_path = (options.font_path) ? options.font_path : ''
         @path = File.join(font_path, File.basename(@path))
@@ -103,26 +107,33 @@ module Fontrobot
         @path = File.basename(@path)
       end
 
-      @fontface = {
-        :eot  => "url(\"#{@path}.eot?#iefix\") format(\"embedded-opentype\")",
-        :woff => "url(\"#{@path}.woff\") format(\"woff\")",
-        :ttf  => "url(\"#{@path}.ttf\") format(\"truetype\")",
-        :svg  => "url(\"#{@path}.svg##{@name}\") format(\"svg\")"
+      fontface_strings = {
+        :eot  => "url('#{@path}.eot?#iefix') format('embedded-opentype')",
+        :woff => "url('#{@path}.woff') format('woff')",
+        :ttf  => "url('#{@path}.ttf') format('truetype')",
+        :svg  => "url('#{@path}.svg##{@name}') format('svg')"
       }
 
-      # reorder the fontface hash
-      order.each do |type|
+      # if we're inlining we need to make 2 font-face declarations
+      # http://www.fontspring.com/blog/the-new-bulletproof-font-face-syntax
+      if(inline.any?)
+        @inline_sources = true
+        fonts.delete('eot') # can't ever inline an eot
+      end
+
+      # order the fontface hash
+      @font_sources = []
+      fonts.each do |type|
         if(inline.include?(type))
           fontpath = File.expand_path(File.join(@output, File.basename(@path)+"."+type))
-          contents = File.read(fontpath)
-          encoded_contents = Base64.encode64(contents).gsub(/\n/, '') # encode and remove newlines, 1.8.7 compat
-          fontstring = "url(data:application/x-font-#{type};charset=utf-8;base64," + encoded_contents +") format('#{longtype[type]}')"
+          encoded_contents = Base64.encode64(File.read(fontpath)).gsub(/\n/, '') # encode and remove newlines, 1.8.7 compat
+          src = "url(data:application/x-font-#{type};charset=utf-8;base64," + encoded_contents +") format('#{longtype[type]}')"
         else
-          fontstring = @fontface[type.to_sym]
+          src = fontface_strings[type.to_sym]
         end
-        reorder[type.to_sym] = fontstring
+        @font_sources << src;
       end
-      @fonturls = reorder.map{|k,v| v }.join(",\n");
+      @font_sources = @font_sources.join(', ');
     end
 
 

data/lib/fontrobot/templates/fontrobot.css

@@ -1,10 +1,19 @@
 /*
-  Font Custom - icon webfonts made simple
+Font Robot CSS
+DO NOT EDIT THIS COMMENT BLOCK. IT'S REQUIRED BY THE GENERATOR. THX, FONTROBOT
+Path:<%= @path %>
 */
-
+ 
+<% if @inline_sources %>
+@font-face {
+  font-family: "<%= @name %>";
+  src: url("<%= @path %>.eot?#iefix") format("embedded-opentype");
+}
+ 
+<% end %>
 @font-face {
   font-family: "<%= @name %>";
-  src: <%= @fonturls %>;
+  src: <%= @font_sources %>;
   font-weight: normal;
   font-style: normal;
 }

data/lib/fontrobot/version.rb

@@ -1,3 +1,3 @@
 module Fontrobot
-  VERSION = "0.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,137 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: fontrobot
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Tim Barkow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70295096519860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295096519860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70295096517940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295096517940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &70295096510920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295096510920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70295096508960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295096508960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70295096506800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295096506800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295096505020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295096505020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70295096503960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295096503960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70295096503140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295096503140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70295092408240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295092408240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70295092404300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295092404300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70295092403120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70295092403120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: Transforms EPS and SVG vectors into icon webfonts. Generates Bootstrap
   compatible CSS for easy inclusion in your projects.
 email:
@@ -150,7 +182,7 @@ files:
 - README.md
 - Rakefile
 - bin/fontrobot
-- fontcustom.gemspec
+- fontrobot.gemspec
 - lib/fontrobot.rb
 - lib/fontrobot/cli.rb
 - lib/fontrobot/generator.rb
@@ -171,28 +203,29 @@ files:
 - spec/fontrobot/watcher_spec.rb.off
 - spec/spec_helper.rb
 homepage: http://robotloveskitten.github.com/fontrobot/
-licenses: []
+licenses:
+- MIT
+- MPL 1.1/GPL 2.0/LGPL 2.1
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate custom icon webfonts from the command line.
 test_files:
 - spec/fixtures/empty/no_vectors_here.txt