jitai 0.3.3 → 0.3.4

data/Rakefile

@@ -19,17 +19,20 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+=begin
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
+=end
 
 task :spec => :check_dependencies
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/jitai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jitai}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kellydunn"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-06-12}
   s.description = %q{CSS custom font consolidator}
   s.email = %q{defaultstring@gmail.com}
   s.extra_rdoc_files = [
@@ -37,6 +37,10 @@ Gem::Specification.new do |s|
     "lib/ttf2eot/ttf2eot",
     "lib/ttf2eot/ttf2eot.cpp",
     "lib/ttf2eot/ttf2eot.o",
+    "public/fonts/gotham_bold.eot",
+    "public/fonts/gotham_bold.ttf",
+    "public/fonts/gotham_light.eot",
+    "public/fonts/gotham_light.ttf",
     "public/fonts/yardsale.eot",
     "public/fonts/yardsale.ttf",
     "public/stylesheets/fonts_ie.css",
@@ -48,16 +52,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kellydunn/jitai}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{CSS custom font consolidator}
-  s.test_files = [
-    "spec/jitai_spec.rb",
-    "spec/rake/jitaitask_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/jitai.rb

@@ -2,11 +2,10 @@ module Jitai
   require 'jitai/railtie.rb' if defined?(Rails)
 
   class FontManager
-    attr_accessor :moz_path, :ie_path, :cwd
+    attr_accessor :css_path, :cwd
     
     def initialize(path= "public")
-      @moz_path = "#{path}/stylesheets/fonts_moz.css"
-      @ie_path = "#{path}/stylesheets/fonts_ie.css"
+      @css_path = "#{path}/stylesheets/fonts.css"
       @cwd = "public/fonts/"
     end
 
@@ -14,6 +13,7 @@ module Jitai
       Dir.mkdir(@cwd) if !(File.directory? @cwd)
       Dir.foreach(@cwd) do |font_file|
         if !(File.directory?(font_file))
+
           # Search for two different formats                                                                                                                           
           conversion_type = (File.extname(font_file).downcase.eql? ".ttf")? ".eot" : ".ttf"
           other_basename = font_file.split(".")[0] + conversion_type
@@ -24,10 +24,8 @@ module Jitai
           if !File.exists?(other_file)
             puts "===== #{conversion_type.upcase} format not found for #{font_file}.  Attempting to convert... ====="
 
-            # TODO fix incredibly bad hack
-            curr_dir = Dir.getwd + "/"
-            ttf2eot_dir = "/usr/lib/ruby/gems/1.8/gems/jitai-0.3.0/lib/ttf2eot/"
-            %x{cd #{ttf2eot_dir} && ./ttf2eot < #{curr_dir + @cwd + font_file} > #{curr_dir + @cwd + font_file.split(".")[0] + conversion_type} && cd #{curr_dir}}
+            # TODO Raise error
+            %x{cd #{ttf2eot_dir} && ttf2eot < #{curr_dir + @cwd + font_file} > #{curr_dir + @cwd + font_file.split(".")[0] + conversion_type} && cd #{curr_dir}}
           end
           
           # Rename files, account for conventions.                                                                                                                   
@@ -50,12 +48,19 @@ module Jitai
     end
 
     def to_css
+      # TODO WOFF url('/fonts/#{@name}.woff') format('woff'), /* Modern Browsers */
+      # TODO SVG  url('/fonts/#{@name}.svg#svgFontName') format('svg'); /* Legacy iOS */
+      
+      css = "@font-face {
+               font-family: '#{@name}';
+               src: url('/fonts/#{@name}.eot'); /* IE9 Compat Modes */
+               src: url('/fonts/#{@name}.eot?iefix') format('eot'), /* IE6-IE8 */
+               url('/fonts/#{@name}.ttf')  format('truetype'), /* Safari, Android, iOS */
+            }"
+
       # TODO make configurable for sinatra apps, etc
-      moz = "@font-face {font-family:'#{@name}'; src:url('/fonts/#{name}.ttf');}"
-      ie = "@font-face {font-family:'#{@name}'; src:url('/fonts/#{name}.eot');}"
       manager = Jitai::FontManager.new
-      find_font(manager.moz_path, moz)
-      find_font(manager.ie_path, ie)
+      find_font(manager.css_path, css)
     end
 
     def find_font(file, search_font)

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'jitai'
-require 'spec'
-# require 'rspec'
+require 'rspec'
 require 'rubygems'
-require 'spec/autorun'
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jitai
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - kellydunn
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,10 @@ files:
 - lib/ttf2eot/ttf2eot
 - lib/ttf2eot/ttf2eot.cpp
 - lib/ttf2eot/ttf2eot.o
+- public/fonts/gotham_bold.eot
+- public/fonts/gotham_bold.ttf
+- public/fonts/gotham_light.eot
+- public/fonts/gotham_light.ttf
 - public/fonts/yardsale.eot
 - public/fonts/yardsale.ttf
 - public/stylesheets/fonts_ie.css
@@ -102,11 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CSS custom font consolidator
-test_files: 
-- spec/jitai_spec.rb
-- spec/rake/jitaitask_spec.rb
-- spec/spec_helper.rb
+test_files: []
+