fontsquirrel-download 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d037a270b55df2a81138ce3bfd72fee4974c73
-  data.tar.gz: 2cd3f7db5705f3cd375266eb0215650cc3e08843
+  metadata.gz: e9f088283e17cc0941631baf6a415ddf60bfc317
+  data.tar.gz: d807825661cb2d784803231bf1f2b5c3615c24ab
 SHA512:
-  metadata.gz: 312d11cdaf3ce8a7b27538a6050b3a2d79af04ba4c6d3556b3b82b3b0165d62e4994861657c7d417db7a7404c2889450e5787b611cc051d96417b0f119704602
-  data.tar.gz: 0e65f09d37c73d0fee541d67253fe3fd479a4b399b5a3a129b5ac3b9b693b3ee270a28bfb0f52bba00f8f03e703c4c950178e49a7649527f8f3c251a0539a527
+  metadata.gz: 2e928c62f5797b742e5c4da87a7f1b5cf4cf180cc19ca5a01ae38e18dd7728e5bc85e781726e2da9f7f54bcfdd471d0dfb81850ece45dc4278896cae3fbd799e
+  data.tar.gz: 538288b460dadedbac435cf0a8a778f5a98482f45673330e47758b418b937eee120924dc7ff3d61ecdd5cf0ca0bbf50a7e086b70b973d221e75b3afad164ede4

data/README.md

@@ -18,7 +18,7 @@ Add to your application.css/application.css.scss:
 //= require fonts
 ```
 
-Because the download will append the necessary changes to ``app/assets/stylesheets/_fonts.css.sass``.
+Because the download will append the necessary changes to ``app/assets/stylesheets/_fonts.scss``.
 
 ## Usage
 
@@ -27,10 +27,10 @@ Because the download will append the necessary changes to ``app/assets/styleshee
 Use Rake task, specify the Font name as written in the URL from font-squirrel, e.g. the well-known LaTeX-Font:
 
 ```bash
-rake font:kit NAME=TeX-Gyre-Bonum
+rake font:download NAME=TeX-Gyre-Bonum
 ```
 
-This will download the fonts to ``app/assets/fonts`` and append the style rules to ``app/assets/stylesheets/_fonts.css.sass``.
+This will download the fonts to ``app/assets/fonts`` and append the style rules to ``app/assets/stylesheets/_fonts.scss``.
 
 After that, you can use that style definition in your css rules, like:
 
@@ -40,13 +40,19 @@ body {
 }
 ```
 
-The names always vary a little, just look them up in the \_fonts.css.sass
+The names always vary a little, just look them up in the \_fonts.scss
 
 
+## Webfont-Kits
 
+You can also create font-kits with Fontsquirrel's great Webfont-generator and extract+apply that zipfile and merge a meaningful scss-file with correct font weight and style:
 
-## Potential ToDo
+```
+rake font:install FILE=/tmp/webfontkit-123.zip
+```
+
+
+## Limitations
 
 * Until know, it will download the normal subset of the font.
   Some fonts have no special chars (like German Umlauts) at all, some have them in a subset. Maybe specifying the subset comes in handy.
-* Downloading not only font-kits but all the other fonts...

data/fontsquirrel-download.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
   gem.version       = FontSquirrel::VERSION
 
-  gem.add_dependency "rubyzip"
   gem.add_dependency "rails", ">= 3.1"
   gem.add_dependency "rubyzip", ">= 1.0"
 end

data/lib/fontsquirrel-download/download.rb

@@ -3,62 +3,95 @@ require "zip"
 module FontSquirrel
   class Download
     TEMPLATE = <<-DOC
-@font-face
-  font-family: "{{name}}"
+@font-face {
+  font-family: "{{name}}";
   {{src}}
-  font-weight: {{weight}}
-  font-style: {{style}}
+  font-weight: {{weight}};
+  font-style: {{style}};
+}
 DOC
 
     # Provide Font-Name as written in URL of font-squirrel,
     # like TeX-Gyre-Bonum
-    def initialize(name,options={})
-      @options=options
+    def initialize(name, options={})
+      @options = options
       @name = name
-      download(name)
       FileUtils.mkdir_p @options[:font_dir]
+      unless File.exists? @options[:font_file]
+        FileUtils.touch @options[:font_file]
+      end
+    end
+
+    def download!
+      download(@name)
+    end
+
+    def extract_and_apply!
       zipfile = nil
       quietly do
         zipfile = Zip::File.open(@options[:tmp_name])
       end
       zipfile.each do |entry|
         case entry.name
-        when %r{/stylesheet.css$}
+        when %r{/stylesheet.css$}, "stylesheet.css"
           append_stylesheet(entry)
         when /ttf|woff|eot|svg/
           extract_font(entry)
+        else
+          puts " skipping #{entry.name}"
         end
       end
 
-      FileUtils.rm @options[:tmp_name].to_s
     ensure
       zipfile.close if zipfile.present?
     end
 
+    def remove_download_file
+      FileUtils.rm @options[:tmp_name].to_s
+    end
+
     private
 
     def name; @name; end
 
     def append_stylesheet(entry)
       content = entry.get_input_stream.read
-      text = Sass::Engine.new(content, syntax: :scss).to_tree.to_sass
+      if content.blank?
+        puts " error: the stylesheets seems to be empty. Check if the font-kit on fontsquirrel has errors, too, and use the ttf-download + Webfont-generator to make a working zip-file"
+        return
+      end
+
+      existing = File.read(@options[:font_file].to_s)
+      text = Sass::Engine.new(content, syntax: :scss).to_tree.to_scss
+      binding.pry
       text.gsub!(/url\(([^\)]+)\)/, "asset-url(\\1, font)")
-      headline =  text.lines.grep(/font-family/).first
-      weight = 'normal'
-      style  = 'normal'
-      if headline[  /italic/ ]
-        style  = 'italic'
+      parts = text.split("@font-face")
+      out_file = ""
+      font_name = text.scan(/font-family: '(.*)'/).flatten.inject{|l,s| l=l.chop while l!=s[0...l.length];l}
+      parts.each do |part|
+        headline =  part.lines.grep(/font-family/).first
+        next if !headline
+        weight = 'normal'
+        style  = 'normal'
+        if headline[  /italic/ ]
+          style  = 'italic'
+        end
+        if headline[ /bold/ ]
+          weight = 'bold'
+        end
+        template = TEMPLATE.
+          gsub('{{name}}', font_name).
+          gsub('{{weight}}', weight).
+          gsub('{{style}}', style).
+          gsub('{{src}}', part.lines.grep(/src:/).join.strip)
+        if !existing.include?(template)
+          out_file += template + "\n"
+        end
       end
-      if headline[ /bold/ ]
-        weight = 'bold'
+      if out_file.present?
+        log "Writing new font-definitions to #{@options[:font_file].to_s} (Font-Family: #{font_name})"
+        File.open(@options[:font_file].to_s, "a") {|f| f.write out_file }
       end
-      template = TEMPLATE.
-        gsub('{{name}}', @name).
-        gsub('{{weight}}', weight).
-        gsub('{{style}}', style).
-        gsub('{{src}}', text.lines.grep(/src:/).join.strip)
-      log "Writing new font-definitions to #{@options[:font_file].to_s} ( Font-Family: #{@name}, #{style}, #{weight})"
-      File.open(@options[:font_file].to_s, "a") {|f| f.write template }
     end
 
     def extract_font(entry)
@@ -68,7 +101,7 @@ DOC
     end
 
     def download(name)
-      url = "http://www.fontsquirrel.com/fontfacekit/#{name}"
+      url = "https://www.fontsquirrel.com/fontfacekit/#{name}"
       log "Downloading #{url}..."
       File.open(@options[:tmp_name], "wb+") { |f| f.write open(url).read }
     end

data/lib/fontsquirrel-download/version.rb

@@ -1,3 +1,3 @@
 module FontSquirrel
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

data/lib/tasks/fontsquirrel-download.rake

@@ -1,17 +1,37 @@
 
 namespace :font do
+  FONT_FILE = 'app/assets/stylesheets/_fonts.scss'
   desc "Download and extract font-squirrel kit. Give Repos with NAME=TeX-Gyre-Bonum"
-  task :kit do
+  task :download do
     name = ENV["NAME"]
     if name.blank?
       puts "give name to font with rake font:kit NAME=TeX-Gyre-Bonum"
       exit 1
     end
     require "fontsquirrel-download/download"
-    FontSquirrel::Download.new name,
+    runner = FontSquirrel::Download.new name,
       tmp_name:  Rails.root.join("tmp/fontsquirrel.zip").to_s,
-      font_file: Rails.root.join("app/assets/stylesheets/_fonts.css.sass"),
+      font_file: Rails.root.join(FONT_FILE),
       font_dir:  Rails.root.join("app/assets/fonts")
+    runner.download!
+    runner.extract_and_apply!
+    runner.remove_download_file
 
   end
+
+  desc "Extract font-squirrel web-fontkit. Takes path to zip-file FILE=/tmp/webfontkit-123.zip"
+  task :install do
+    name = ENV["FILE"]
+    if name.blank?
+      puts "provide the path to the font with rake font:install FILE=/tmp/webfontkit-123.zip"
+      exit 1
+    end
+    path = File.expand_path(name)
+    require "fontsquirrel-download/download"
+    runner = FontSquirrel::Download.new 'webfontkit',
+      tmp_name:  path,
+      font_file: Rails.root.join(FONT_FILE),
+      font_dir:  Rails.root.join("app/assets/fonts")
+    runner.extract_and_apply!
+  end
 end

metadata

@@ -1,66 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: fontsquirrel-download
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-description: ' Download and extract font-kits from fontsquirrel easily with a rake
-  tasks.'
+description: " Download and extract font-kits from fontsquirrel easily with a rake
+  tasks."
 email:
 - stefan.wienert@pludoni.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -81,19 +67,18 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Download and extract font-kits from fontsquirrel easily with a rake tasks.
 test_files: []
-has_rdoc: