fontello_rails_converter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRhYmE3Yjk3NTEzNDRiOWM5ZGQ4M2Q4NTRlMTU0YzFmNGYyMzI1OQ==
+    YzdhMjhjZGZjMjE1NDNjYmYxNzQ3NjIwZDMyYTI1YjA5Y2FjMGRhMw==
   data.tar.gz: !binary |-
-    NmMxMmZmOGVjYjkwMGQyNjAwMzdhOTVmMDFhMGZjYmViOGYwYmVjNQ==
+    Y2NlYTNmNWFjMTAyMjVmN2IzNGVlN2YxYmM1ZjFjZDc5NjcwYThkNw==
 SHA512:
   metadata.gz: !binary |-
-    ZWViZjFmYjUzNWM0YjkwZTUxY2JkN2YwN2I4Y2NhNjI5MjFkYTQ4OGNhZDJh
-    NjM0YzMxMWRkNmVhMzgzN2EzMjRjMTNiZTk0NDMxYmQ1OWM1NWY2MTY0MDNk
-    M2EwMTgzNzI3Yzg0NWEwZGI5NGY1YTEzNGJhNTBjMmYyMTRjYTU=
+    M2VkZGMxNmQ4MDljOTIwZWE4YjdiYjJmOTY1ZTJmNjIwY2FlNTc2ZThhNzcz
+    OWQzNzYzMmYxOWFlYjllYjI3OGE3ODU5NTQwNjA0MTZkNGEzMmMzMzQ4YTk3
+    OGI5ZTM3MGZiZTE4Mjc2OTYyYjI3ZGY1NjI2YWI1MTU3OTliYTc=
   data.tar.gz: !binary |-
-    NDZjYzIyZDcxNmZiZTc0MGFhNjJlMzRmNmY3MDliM2Q4ZjI3NjZjNTQyY2M3
-    YjYwMDBjZGMwMTM5NDYzM2U3ZDllNTRiYmE1MTUxMjI5ZjM3ZTMxMjQ5YWI0
-    ZDBjNjNmMzY2NTMzZjNmMGJiM2Q0MTA0MmU0MmNjZjEwZjgwNDU=
+    MGZiZTUzOTVjMWYwNTAyZTc3MTY3NDZhYTBhZDhlZTNkOGUzNTEzMTBjOWIw
+    YWUzNDk3YmJhMjhkZWQwMjVkZTUyZDQwNGVhN2RlYTYyNzM2YTRiOWU5ODli
+    ODAwYmJmYzE4YWQ0MmYyZWQ2NWU2NjBjYThkMjk3NjRiNjM0MTc=

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.3.0
+
+* allow setting global options using a .yml file (e.g. /rails_root/config/fontello_rails_converter.yml)
+* allow configuration of the stylesheet extension for the SCSS files (`.css.scss` or `.scss`)
+* fail gracefully when there is no config file yet (90ec5942383cc5558a097aa78c4adcc809ab6a0e)
+* fixes for 2 encoding issues #11 and #12 by @hqm42
+
 ### 0.2.0
 
 * removed deprecated rake task

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails-dummy'
-gem 'rails'
+gem 'rails', '~> 4.0'
 gem 'sqlite3' # dummy app dependency

data/README.md

@@ -1,5 +1,7 @@
 ## fontello_rails_converter
 
+[![Build Status](https://travis-ci.org/railslove/fontello_rails_converter.png?branch=master)](https://travis-ci.org/railslove/fontello_rails_converter)
+
 CLI gem for comfortably working with icon fonts from [http://fontello.com](http://fontello.com) for usage in Rails apps.
 
 Main features:

data/bin/fontello

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'yaml'
 require "fontello_rails_converter"
 command = ARGV[0]
 
@@ -9,19 +10,34 @@ if ARGV[0].nil?
   exit
 end
 
-def options_based_on_rails_root(options)
+def set_options_based_on_rails_root(options)
   options[:asset_dir] = "#{options[:rails_root_dir]}/vendor/assets"
   options.merge!({
     stylesheet_dir: "#{options[:asset_dir]}/stylesheets",
     font_dir: "#{options[:asset_dir]}/fonts",
     zip_file: "#{options[:rails_root_dir]}/tmp/fontello.zip",
     config_file: "#{options[:asset_dir]}/fonts/config.json",
-    fontello_session_id_file: "#{options[:rails_root_dir]}/tmp/fontello_session_id"
+    fontello_session_id_file: "#{options[:rails_root_dir]}/tmp/fontello_session_id",
+    options_file: "#{options[:rails_root_dir]}/config/fontello_rails_converter.yml"
   })
 end
 
-options = { rails_root_dir: "." } # default
-options = options_based_on_rails_root(options)
+def set_options_from_file(options)
+  if File.exist?(options[:options_file])
+    options_from_file = YAML.load_file options[:options_file]
+    options_from_file.each do |key, value|
+      options[key.to_sym] = value  if options.keys.include?(key.to_sym)
+    end
+  end
+end
+
+# defaults
+options = {
+  rails_root_dir: '.',
+  stylesheet_extension: '.css.scss'
+}
+set_options_based_on_rails_root(options)
+set_options_from_file(options)
 
 OptionParser.new do |opts|
   opts.banner = "Usage: fontello COMMAND [options]\n\n"
@@ -30,6 +46,11 @@ OptionParser.new do |opts|
 
   opts.separator "Global options:"
 
+  opts.on("-o", "--options-file [PATH]", "options .yml file (default: /rails_root/config/fontello_rails_converter.yml)") do |opt|
+    options[:options_file] = opt
+    set_options_from_file(options)
+  end
+
   opts.on("-i", "--fontello-session-id [ID]", "Pass in session ID from fontello.com (e.g. fb235ab72cad01d2b46aaa023ab4abbd) otherwise it will be taken from session-id-file\n\n") do |opt|
     options[:fontello_session_id] = opt
   end
@@ -42,7 +63,11 @@ OptionParser.new do |opts|
 
   opts.separator "`convert` options:"
 
-  opts.on("-n", "--no-download", "Converts existing .zip file without automatically downloading a new one\n\n") do |opt|
+  opts.on("-n", "--no-download", "Converts existing .zip file without automatically downloading a new one") do |opt|
+    options[:no_download] = true
+  end
+
+  opts.on("--stylesheet-extension", "Pick between e.g. '.css.scss' or '.scss'\n\n") do |opt|
     options[:no_download] = true
   end
 
@@ -56,7 +81,7 @@ OptionParser.new do |opts|
 
   opts.on("-r", "--rails-root [PATH]", "Rails root path (default: current location)") do |opt|
     options[:rails_root_dir] = opt
-    options = options_based_on_rails_root(options)
+    set_options_based_on_rails_root(options)
   end
 
   opts.on("-c", "--config-file [PATH]", "config.json file (default: /rails_root/vendor/assets/fonts/config.json)") do |opt|

data/lib/fontello_rails_converter/cli.rb

@@ -12,8 +12,14 @@ module FontelloRailsConverter
     end
 
     def open
-      @fontello_api.new_session_from_config  unless @options[:open_existing] == true
-      Launchy.open @fontello_api.session_url
+      if config_file_exists?
+        @fontello_api.new_session_from_config  unless @options[:open_existing] == true
+        Launchy.open @fontello_api.session_url
+      else
+        puts red("there's no config file yet!")
+        puts red("follow these instructions: https://github.com/railslove/fontello_rails_converter#initial-usage")
+        puts red("to setup your project")
+      end
     end
 
     def download
@@ -34,12 +40,12 @@ module FontelloRailsConverter
           # stylesheets
           if filename.end_with? '.css'
             # extract stylesheet to target location
-            target_file = File.join @options[:stylesheet_dir], "#{filename}.scss"
+            target_file = File.join @options[:stylesheet_dir], filename.gsub('.css', @options[:stylesheet_extension])
             zipfile.extract(file, target_file) { true }
             puts green("copied #{target_file}")
 
             if !filename.end_with? "animation.css", "-ie7.css", "-codes.css", "-ie7-codes.css", "-embedded.css"
-              converted_css = self.convert_main_stylesheet File.read(target_file)
+              converted_css = self.convert_main_stylesheet File.read(target_file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
               File.open(target_file, 'w') { |f| f.write(converted_css) }
               puts green("converted #{target_file} for Sass & asset pipeline")
             end

data/lib/fontello_rails_converter/fontello_api.rb

@@ -24,7 +24,7 @@ module FontelloRailsConverter
 
     def download_zip_body
       response = RestClient.get "#{session_url}/get"
-      response.body
+      response.body.force_encoding("UTF-8")
     end
 
     private
@@ -46,4 +46,4 @@ module FontelloRailsConverter
         File.open(@fontello_session_id_file, 'w+') { |f| f.write @session_id }
       end
   end
-end
+end

data/lib/fontello_rails_converter/version.rb

@@ -1,3 +1,3 @@
 module FontelloRailsConverter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontello_rails_converter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jakob Hilden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip