cjk-subsetter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c12a9b32b801801da765babd0edf4e4f6f064e42
-  data.tar.gz: 7ad44799b33606fc4a8df72aa2fdd5f474456e79
+  metadata.gz: 8357489133e8160fb56635f18577855b918d79dd
+  data.tar.gz: b49c453c2e97b7cfdd4b2da5f5e8cd049556aa4b
 SHA512:
-  metadata.gz: 305a2cd05ac25a473a08a5b50782b7f2fc12fd9b96aefb592323e283e61ecae4a31cd04990d1e7f8221fd51a29e49eb4efe50c06621bae339dc73a9d522aa212
-  data.tar.gz: 4acd54f28c119332eb4eba9fe9f941aaf226a0c52ef3419871897f5766e70d4797c89e2e55e2db9b5b50644b9402dd14c334e843a11063cc0704db2c4d55d43b
+  metadata.gz: efbd59f6907c83f2d63afe97014d5590d3a0996b0a6420c9b577660fe4ceadcc2f6ab4c75d7087e9fc18ffa839852c20351483bf7ea27f775d59521590d8d1eb
+  data.tar.gz: 0b28530f575f313437a600ec1752c0bbd3a8e6e5ac14c73ae1bf89f8b1c594221db9cc4ec6226d70412f165ce3ad607a8c36ef527695e98b837e55249de88a05

data/README.md

@@ -1,5 +1,7 @@
 = subsetter
 
+![Logo](https://raw.github.com/hxgdzyuyi/AlexPic/master/skin/alexpic_m.png)
+
 可以在网页中使用中文字体的 Rack 程序。
 
 === 原理
@@ -8,10 +10,17 @@
 
 === 依赖
 
-- java 环境
+- Java 环境
 - Ruby
 
 === 感谢以下开源项目
 
 - sfntly https://code.google.com/p/sfntly/
 
+=== 不同浏览器下的表现
+
+目前不支持 IE(eot), 因为只会生成 ttf 字体
+
+http://www.browserstack.com/screenshots/d4d8917bd06dcddd17be4706ff4508e5842e5078
+
+[![Build Status](https://secure.travis-ci.org/hxgdzyuyi/cjk-subsetter.png)](http://travis-ci.org/hxgdzyuyi/cjk-subsetter)

data/lib/rack/subsetter.rb

@@ -44,9 +44,9 @@ module Rack
       headers['Content-Type'] =~ /html/
     end
 
-    def create_path(string, font_name)
+    def create_path(string, font_name, file_type)
       filename = Digest::SHA1.hexdigest(string + font_name)
-      @font_dist + '/' + filename + '.ttf'
+      @font_dist + '/' + filename + file_type
     end
 
     def call(env)
@@ -70,19 +70,31 @@ module Rack
       @subset_string_map.each do |font_key, chars_map|
         subset_string = chars_map.map { |key, value| key }.join
         font_name = @font_map[font_key].join
-        file_path = create_path(subset_string, font_name)
 
-        unless ::File.exist? file_path
-          ::File.open(file_path, 'w+')
-          child = POSIX::Spawn::Child.new('java', "-jar", "#{@sfnttool}", "-s", \
-            "#{subset_string}", "#{@font_source}/#{font_name}", "#{file_path}")
-        end
+        ['.ttf', '.eot'].each do |file_type|
+          file_path = create_path(subset_string, font_name, file_type)
+          file_is_eot = file_type == '.eot'
+
+          unless ::File.exist? file_path
+            ::File.open(file_path, 'w+')
+            args = ["java", "-jar", "#{@sfnttool}"]
+
+            if file_is_eot
+              args.push "-e"
+            end
 
-        p_output = Pathname.new file_path
-        font_url = @relative_url_root + \
-          p_output.relative_path_from(p_public).to_s
-        klass = '.%s-' % @prefix + font_key
-        new_body.gsub!(%r{</head>}, template.result(binding) + "</head>")
+            args.concat ["-s", "#{subset_string}",
+              "#{@font_source}/#{font_name}", "#{file_path}"]
+
+            child = POSIX::Spawn::Child.new(*args)
+          end
+
+          p_output = Pathname.new file_path
+          font_url = @relative_url_root + \
+            p_output.relative_path_from(p_public).to_s
+          klass = '.%s-' % @prefix + font_key
+          new_body.gsub!(%r{</head>}, template.result(binding) + "</head>")
+        end
       end
 
       response.write new_body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cjk-subsetter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hxgdzyuyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-cache
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.2.0
 description: You can use chinese webfont
 email: hxgdzyuyi@gmail.com
 executables: []
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: You can use chinese webfont