icosmith-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c134aac66158b8042802c93fc56787d41d6b1c4
-  data.tar.gz: ced08eb6800f49061cc9663325ae2e43be58c1ae
+  metadata.gz: 809b309a7de9d2b3c862b8a93edd869d67f3c878
+  data.tar.gz: e47c92f1661ce66e35ce46cd12d28a02c52f0343
 SHA512:
-  metadata.gz: 1356a401150207942c900bffd347dbc90104a6aefb10cf6b3e71b65fd82d53d6989e48e592509ac1e9e760264215ca8e9cc8ac00ac112954c9578eba566b6dd8
-  data.tar.gz: 323097275afec4011d0b579de0f8cd54c93f572c5fba22f31808cc8669044b072fd2f75dcb27a1a22b9638c0ed1e6d225556551279c1ec818cb2c8ba73e77bbe
+  metadata.gz: 8e68dd7f3c4ddd4df7ffefcb2b869762cac5a487b521205e2170486a921f5c684492fbaf29ba7bfbcfdecc24ba958f3bbb36aa40d64563e403773d934f852be5
+  data.tar.gz: 07ea9142fce61f11d1ccf1ead413183131da55ce734488b223556f190b07c725a3ae3225c31590048e6018297262efb8144479c2a0a0d9b56dfbd08ef68aae6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    icosmith-rails (0.2.0)
+    icosmith-rails (0.3.0)
       rest-client (~> 1.6.7)
       rubyzip (< 1.0.0)
       thor (~> 0.18.1)

data/README.md

@@ -53,6 +53,51 @@ You can also configure each parameter individually. Just call `Icosmith.configur
   end
 ```
 
+### Multiple fonts
+
+If you want to use multiple fonts, change the following configurations:
+
+- Edit your `icosmith.yml` file and add a `fonts` parameter, with a list of font names:
+
+```yml
+use_sass: true
+svg_dir: app/assets/svgs
+font_dir: app/assets/fonts
+css_dir: app/assets/stylesheets
+manifest_dir: config/icosmith
+generate_fonts_url: http://icosmith.com/generate_font
+fonts:
+  - my-font1
+  - my-font2
+```
+
+- Create a `manifest.json` file for each font, inside a subdirectory with the font name:
+
+```sh
+config
+└── icosmith
+    ├── my-font1
+    │   └── manifest.json
+    ├── my-font2
+    │   └── manifest.json
+    └── icosmith.yml
+```
+
+- Move each font`s SVG files to a subdirectory with the font name:
+
+```sh
+app/svgs/
+├── my-font1
+│   ├── icon1.svg
+│   ├── icon2.svg
+│   ├── icon3.svg
+│   ├── icon4.svg
+└── my-font2
+    ├── icon5.svg
+    ├── icon6.svg
+    └── icon7.svg
+```
+
 ## Usage
 
     rake icosmith:generate

data/lib/icosmith-rails.rb

@@ -16,5 +16,6 @@ end
 
 require "icosmith-rails/version"
 require "icosmith-rails/config"
+require "icosmith-rails/font"
 require "icosmith-rails/generator"
 require "icosmith-rails/railtie" if defined?(Rails)

data/lib/icosmith-rails/config.rb

@@ -5,7 +5,7 @@ module Icosmith
   MANIFEST_FILENAME = "manifest.json"
 
   class Config
-    KEYS = [:svg_dir, :font_dir, :css_dir, :manifest_dir, :generate_fonts_url, :use_sass]
+    KEYS = [:svg_dir, :font_dir, :fonts, :css_dir, :manifest_dir, :generate_fonts_url, :use_sass]
 
     KEYS.each do |key|
       attr_accessor key

data/lib/icosmith-rails/font.rb

@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+
+module Icosmith
+  class Font
+    SVG_ZIPFILENAME   = "svg.zip"
+    FONTS_ZIPFILENAME = "fonts.zip"
+
+    def initialize root_path, config, font_name = ""
+      @root_path = root_path
+      @config = config
+      @font_name = font_name
+      setup_parameters
+    end
+
+    def create_svg_zipfile
+      create_directories
+      FileUtils.rm_f(@svg_zipfile)
+
+      log("Compressing SVGs")
+      Zip::ZipFile.open(@svg_zipfile, Zip::ZipFile::CREATE) do |zipfile|
+        Dir.glob("#{@src_dir}#{File::SEPARATOR}*.svg").each do |filename|
+          zipfile.add(filename.split(File::SEPARATOR).last, filename)
+        end
+
+        zipfile.add(Icosmith::MANIFEST_FILENAME, @manifest_full_path) if File.exists?(@manifest_full_path)
+      end
+    end
+
+    def generate_font
+      create_directories
+
+      log("Sending files to #{@config.generate_fonts_url}")
+      fontfile_contents = RestClient.post(@config.generate_fonts_url, file: File.new(@svg_zipfile))
+      filename = fontfile_contents.headers[:content_disposition].scan(/filename="([^"]+)"/).flatten.first
+      filename ||= FONTS_ZIPFILENAME
+
+      @fonts_zipfile = File.join(@temp_dir, filename)
+
+      log("Writing #{filename}")
+      File.open(@fonts_zipfile, "w:binary") do |f|
+        f.write(fontfile_contents)
+      end
+
+      FileUtils.rm_f(@svg_zipfile)
+    end
+
+    def extract_font
+      create_directories
+
+      log("Replacing files")
+      temp_font_path = @fonts_zipfile.gsub(/\.zip$/, '')
+      FileUtils.rm_f(temp_font_path)
+      FileUtils.mkdir(temp_font_path)
+      FileUtils.mkdir_p(@font_dir)
+      FileUtils.mkdir_p(@css_dir)
+
+      unzip @fonts_zipfile, temp_font_path
+      copy_css temp_font_path
+
+      Dir.glob("#{temp_font_path}#{File::SEPARATOR}fonts#{File::SEPARATOR}*.{ttf,woff,svg,eot,afm}").each do |file|
+        FileUtils.mv(file, @font_dir)
+      end
+
+      FileUtils.mv(File.join(temp_font_path, Icosmith::MANIFEST_FILENAME), @manifest_full_path)
+      FileUtils.remove_dir(@base_temp_dir)
+    end
+
+    private
+    def copy_css temp_font_path
+      css_path = Dir.glob("#{temp_font_path}#{File::SEPARATOR}*.css").first
+
+      if @config.use_sass
+        scss_path = generate_scss(css_path)
+        FileUtils.mv(scss_path, @css_dir)
+      else
+        FileUtils.mv(css_path, @css_dir)
+      end
+    end
+
+    def generate_scss path
+      scss_path = "#{path}.scss"
+      log("Generating #{scss_path}")
+
+      css_content = File.read path
+      css_content.gsub!(/url\('fonts\//, "font-url('")
+      File.open(scss_path, 'w') {|out| out << css_content}
+      scss_path
+    end
+
+    def unzip path, target
+      Zip::ZipFile.open(path) do |zip_file|
+        zip_file.each do |file|
+          zip_file.extract(file, File.join(target, file.name))
+        end
+      end
+    end
+
+    def setup_parameters
+      @manifest_full_path = File.join(@root_path, @config.manifest_dir, @font_name, Icosmith::MANIFEST_FILENAME)
+      unless File.readable?(@manifest_full_path)
+        puts "Error trying to load manifest file at #{@manifest_full_path}"
+        exit 1
+      end
+
+      @src_dir = File.join(@root_path, @config.svg_dir, @font_name)
+      @base_temp_dir = File.join(@root_path, "tmp", "icosmith")
+      @temp_dir = File.join(@base_temp_dir, @font_name)
+      @svg_zipfile = File.join(@temp_dir, SVG_ZIPFILENAME)
+      @css_dir = File.join(@root_path, @config.css_dir)
+      @font_dir = File.join(@root_path, @config.font_dir)
+    end
+
+    def create_directories
+      FileUtils.mkdir_p(@temp_dir)
+      FileUtils.mkdir_p(@css_dir)
+      FileUtils.mkdir_p(@font_dir)
+    end
+
+    def log message, level = :info
+      message = "[#{@font_name}] #{message}" unless @font_name.empty?
+      Icosmith.logger.send(level, message)
+    end
+  end
+end

data/lib/icosmith-rails/generator.rb

@@ -2,94 +2,26 @@
 
 module Icosmith
   class Generator
-    SVG_ZIPFILENAME   = "svg.zip"
-    FONTS_ZIPFILENAME = "fonts.zip"
-
     def initialize(root_path)
       @root_path = root_path
       load_config
-      setup_parameters
-      create_directories
     end
 
-    def create_svg_zipfile
-      FileUtils.rm_f(@svg_zipfile)
+    def setup_fonts
+      fonts = []
 
-      Icosmith.logger.info "Compressing SVGs"
-      Zip::ZipFile.open(@svg_zipfile, Zip::ZipFile::CREATE) do |zipfile|
-        Dir.glob("#{@src_dir}#{File::SEPARATOR}*.svg").each do |filename|
-          zipfile.add(filename.split(File::SEPARATOR).last, filename)
+      if @config.fonts
+        @config.fonts.each do |font_name|
+          fonts << Icosmith::Font.new(@root_path, @config, font_name)
         end
-
-        zipfile.add(Icosmith::MANIFEST_FILENAME, @manifest_full_path) if File.exists?(@manifest_full_path)
-      end
-    end
-
-    def generate_font
-      Icosmith.logger.info "Sending files to #{@config.generate_fonts_url}"
-      fontfile_contents = RestClient.post(@config.generate_fonts_url, file: File.new(@svg_zipfile))
-      filename = fontfile_contents.headers[:content_disposition].scan(/filename="([^"]+)"/).flatten.first
-      filename ||= FONTS_ZIPFILENAME
-
-      @fonts_zipfile = File.join(@temp_dir, filename)
-
-      Icosmith.logger.info "Writing #{filename}"
-      File.open(@fonts_zipfile, "w:binary") do |f|
-        f.write(fontfile_contents)
-      end
-
-      FileUtils.rm_f(@svg_zipfile)
-    end
-
-    def extract_font
-      Icosmith.logger.info "Replacing files"
-      temp_font_path = @fonts_zipfile.gsub(/\.zip$/, '')
-      FileUtils.rm_f(temp_font_path)
-      FileUtils.mkdir(temp_font_path)
-      FileUtils.mkdir_p(@font_dir)
-      FileUtils.mkdir_p(@css_dir)
-
-      unzip @fonts_zipfile, temp_font_path
-      copy_css temp_font_path
-
-      Dir.glob("#{temp_font_path}#{File::SEPARATOR}fonts#{File::SEPARATOR}*.{ttf,woff,svg,eot,afm}").each do |file|
-        FileUtils.mv(file, @font_dir)
-      end
-
-      FileUtils.mv(File.join(temp_font_path, Icosmith::MANIFEST_FILENAME), @manifest_full_path)
-      FileUtils.remove_dir(@temp_dir)
-    end
-
-    private
-    def copy_css temp_font_path
-      css_path = Dir.glob("#{temp_font_path}#{File::SEPARATOR}*.css").first
-
-      if @config.use_sass
-        scss_path = generate_scss(css_path)
-        FileUtils.mv(scss_path, @css_dir)
       else
-        FileUtils.mv(css_path, @css_dir)
+        fonts << Icosmith::Font.new(@root_path, @config)
       end
-    end
-
-    def generate_scss path
-      scss_path = "#{path}.scss"
-      Icosmith.logger.info "Generating #{scss_path}"
 
-      css_content = File.read path
-      css_content.gsub!(/url\('fonts\//, "font-url('")
-      File.open(scss_path, 'w') {|out| out << css_content}
-      scss_path
-    end
-
-    def unzip path, target
-      Zip::ZipFile.open(path) do |zip_file|
-        zip_file.each do |file|
-          zip_file.extract(file, File.join(target, file.name))
-        end
-      end
+      fonts
     end
 
+    private
     def load_config
       config_filename = File.join(@root_path, "config", "icosmith", Icosmith::CONFIG_FILENAME)
       begin
@@ -98,26 +30,6 @@ module Icosmith
         puts "Error trying to load icosmith configuration file: #{e.message}"
         exit 1
       end
-
-      @manifest_full_path = File.join(@root_path, @config.manifest_dir, Icosmith::MANIFEST_FILENAME)
-      unless File.readable?(@manifest_full_path)
-        puts "Error trying to load manifest file at #{@manifest_full_path}"
-        exit 1
-      end
-    end
-
-    def setup_parameters
-      @src_dir = File.join(@root_path, @config.svg_dir)
-      @temp_dir = File.join(@root_path, "tmp", "icosmith")
-      @svg_zipfile = File.join(@temp_dir, SVG_ZIPFILENAME)
-      @css_dir = File.join(@root_path, @config.css_dir)
-      @font_dir = File.join(@root_path, @config.font_dir)
-    end
-
-    def create_directories
-      FileUtils.mkdir_p(@temp_dir)
-      FileUtils.mkdir_p(@css_dir)
-      FileUtils.mkdir_p(@font_dir)
     end
   end
 end

data/lib/icosmith-rails/tasks/icosmith.rake

@@ -3,24 +3,34 @@ require "icosmith-rails"
 
 namespace :icosmith do
   desc "Generates font files with an icosmith server from svg files and organizes in the project"
-  task generate: [:create_svg_zipfile, :download_and_extract] do
-    icosmith_generator.extract_font
+  task :generate do
+    icosmith_fonts.each do |font|
+      font.create_svg_zipfile
+      font.generate_font
+      font.extract_font
+    end
   end
 
   desc "Generates font files with an icosmith server from svg files and stores the package at tmp/icosmith"
-  task download_and_extract: [:create_svg_zipfile] do
-    icosmith_generator.generate_font
+  task :download_and_extract do
+    icosmith_fonts.each do |font|
+      font.create_svg_zipfile
+      font.generate_font
+    end
   end
 
+  desc "Creates a zip file with a manifest and svg files"
   task :create_svg_zipfile do
-    icosmith_generator.create_svg_zipfile
+    icosmith_fonts.each do |font|
+      font.create_svg_zipfile
+    end
   end
 
-  def icosmith_generator
-    @generator ||= Icosmith::Generator.new(root_path)
+  private
+  def icosmith_fonts
+    @fonts ||= Icosmith::Generator.new(root_path).setup_fonts
   end
 
-  private
   def root_path
     defined?(Rails) ? Rails.root : Dir.getwd
   end

data/lib/icosmith-rails/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Icosmith
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icosmith-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tulios
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,6 +104,7 @@ files:
 - lib/generators/icosmith/setup/templates/manifest.json
 - lib/icosmith-rails.rb
 - lib/icosmith-rails/config.rb
+- lib/icosmith-rails/font.rb
 - lib/icosmith-rails/generator.rb
 - lib/icosmith-rails/railtie.rb
 - lib/icosmith-rails/tasks/icosmith.rake
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Rails integration with an icosmith server