cjk-subsetter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8357489133e8160fb56635f18577855b918d79dd
-  data.tar.gz: b49c453c2e97b7cfdd4b2da5f5e8cd049556aa4b
+  metadata.gz: ce301c2cc33eb446ed7e7ea98db2750c2929fa7f
+  data.tar.gz: 4c10cd516d6658dea61c6ec2860e7bc3ab93d22d
 SHA512:
-  metadata.gz: efbd59f6907c83f2d63afe97014d5590d3a0996b0a6420c9b577660fe4ceadcc2f6ab4c75d7087e9fc18ffa839852c20351483bf7ea27f775d59521590d8d1eb
-  data.tar.gz: 0b28530f575f313437a600ec1752c0bbd3a8e6e5ac14c73ae1bf89f8b1c594221db9cc4ec6226d70412f165ce3ad607a8c36ef527695e98b837e55249de88a05
+  metadata.gz: ff327850d2fd7ddd47e459566059e182863acf1df4e3b11399d00e82e167b4e3933bc813a3bf0d13b0b91c795ccf070ec5e32c9cf735ae272aa14dc9bc9bd02e
+  data.tar.gz: 1e3a8b92349a302ef91fa1c46ecd99e408fb7af1ab16771c10621bb40981aef34ce74389f1fa89aa0904ae6c33ed816d45b18775b385a7d9d59395002959cd5c

data/lib/rack/style.erb

@@ -2,7 +2,8 @@
   @font-face
   {
     font-family: <%= font_key %>;
-    src: url('<%= font_url %>');
+    src: url("<%= font_url['.woff'] %>") format("woff"),
+    url("<%= font_url['.ttf'] %>") format("truetype");
   }
   <%= klass %> { font-family: <%= font_key %>; }
 </style>

data/lib/rack/subsetter.rb

@@ -70,8 +70,10 @@ 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
+        klass = '.%s-' % @prefix + font_key
+        font_url = {}
 
-        ['.ttf', '.eot'].each do |file_type|
+        ['.ttf', '.woff'].each do |file_type|
           file_path = create_path(subset_string, font_name, file_type)
           file_is_eot = file_type == '.eot'
 
@@ -80,7 +82,7 @@ module Rack
             args = ["java", "-jar", "#{@sfnttool}"]
 
             if file_is_eot
-              args.push "-e"
+              args.push "-w"
             end
 
             args.concat ["-s", "#{subset_string}",
@@ -90,11 +92,10 @@ module Rack
           end
 
           p_output = Pathname.new file_path
-          font_url = @relative_url_root + \
+          font_url[file_type] = @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
+        new_body.gsub!(%r{</head>}, template.result(binding) + "</head>")
       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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - hxgdzyuyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri