fontello_rails_converter 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ffcba90c308427abde64ffabd37fc72b39c555
-  data.tar.gz: 7b2292e0122adfbc695039f20558e1f2cd5ec05d
+  metadata.gz: 020ee67bca377d279123901d2a0c72642cb04ff9
+  data.tar.gz: a5af04e53fd60d44265346d4a72e951a8405f9c7
 SHA512:
-  metadata.gz: 42ab2f6280d8460addcb86bf702dcf257b304056b1b1e475f2679ae92a6309bde3ae68557ec082f64c43abcc45f487357fb097e0c6a2407be481e7476a56506f
-  data.tar.gz: 28bb7cbdf35d770864090aa6a53400834cf0128c9dcfa3c586d5deeaafb22a3d7f7d16517345e670a099205d071c2bf9823c5db2d8fdd43a069d68dd54d53464
+  metadata.gz: 6cbb068f5f071070e9a26733e506cf1d56330bc1767f73bc269881b01df9df8819b9976d58fb04b777de9bc176d83cba729a3c940fc3f9977be7efc24f06f02d
+  data.tar.gz: e66f51934877c30dba2831ddcc89dfe65d90dd534c521d184c18f1b03db8c3e2dca9dc0050e4a08357e4b8f2cf021e43b45c6cca999141c3d841cd4c3eb1ba44

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.6
+
+* [feature] added new `--webpack` option to convert stylesheets for use with webpack. #45
+* [bugfix] fixed compatibility with Rails 5 #44
+
 # 0.4.5
 
 * [bugfix] embedded base64 fonts (using `url()`) were not decoded correctly #43

data/README.md

@@ -41,6 +41,10 @@ Next you click the 'Save session' button on the fontello website. After that you
 
 Alternatively, you can download & save the `.zip` file just like in the initial setp and run `bundle exec fontello convert --no-download` to use the manually downloaded file instead of pulling it down from fontello.
 
+## Options
+
+* `--webpack` [command: `convert`]: generate the stylesheets for use with webpack, prefixing the font file names with the tilde (~). Es: `src: url('~fontello.eot?99999999');`. See [Webpack](#webpack).
+
 ## More help
 
 For more help run `fontello --help`
@@ -49,9 +53,36 @@ For more help run `fontello --help`
 
 The conversion process will do a couple of things to make working with the main fontello stylesheet easier in Rails/Sass:
 
-* It will convert font paths to use `font-url`
+* It will convert font paths to use `font-url` (unless you use the `--webpack` option)
 * It will create [Sass placeholder selectors](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_) (e.g. `%icon-foo` for all the icons) so you have the choice to use the CSS classes in your markup or to `@extend` the placeholders in your Sass code
 
+## Webpack
+
+You can convert the fontello stylesheets for use with Webpack instead of Sprockets.
+
+If you have not alreday done it, you must add the vendor paths to the resolve roots of Webpack, as well as all the extensions of the font files.
+
+```javascript
+[...]
+const path = require("path")
+const railsRoot = path.join(__dirname, ".")
+[...]
+module.exports = {
+  [...]
+  resolve: {
+    root: [
+      [...]
+      path.join(railsRoot, './vendor/assets/javascripts'),
+      path.join(railsRoot, './vendor/assets/stylesheets'),
+      path.join(railsRoot, './vendor/assets/fonts'),
+    ],
+
+    extensions: [ [...] '.woff', '.woff2', '.eot']
+    [...]
+},
+
+```
+
 ## Misc
 
 #### Additional fontello stylesheets
@@ -64,4 +95,4 @@ If you don't want to load this gem in your app's production environment to save
 
 #### Configuration file
 
-By default the gem will look in `Rails.root.join("config", "fontello_rails_converter.yml")` for configuration options.  You can use this to set default options for the tool.
+By default the gem will look in `Rails.root.join("config", "fontello_rails_converter.yml")` for configuration options.  You can use this to set default options for the tool.

data/bin/fontello

@@ -73,6 +73,10 @@ OptionParser.new do |opts|
     options[:stylesheet_extension] = opt
   end
 
+  opts.on("--webpack", "Generate for webpack") do |opt|
+    options[:webpack] = true
+  end
+
   opts.separator "`download` options:"
 
   opts.on("-u", "--use-config", "Uses existing config.json instead of persisted or passed in fontello session ID\n\n") do |opt|

data/lib/fontello_rails_converter/cli.rb

@@ -59,7 +59,7 @@ module FontelloRailsConverter
       copy
 
       puts "---- convert -----"
-      convert_stylesheets
+      convert_stylesheets(@options[:webpack])
       convert_icon_guide
 
     end
@@ -73,7 +73,7 @@ module FontelloRailsConverter
         FileUtils.mkdir_p @options[:icon_guide_dir]
       end
 
-      def convert_stylesheets
+      def convert_stylesheets(webpack)
         ['', '-embedded'].each do |stylesheet_postfix|
           source_file = stylesheet_file(postfix: stylesheet_postfix)
           content = File.read(source_file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
@@ -81,8 +81,13 @@ module FontelloRailsConverter
           content = sass_enhance(content)
           puts "enhancing with Sass placeholder selectors"
 
-          content = convert_for_asset_pipeline(content)
-          puts "converting for asset pipeline"
+          if webpack
+            content = convert_for_webpack(content)
+            puts "converting for webpack"
+          else
+            content = convert_for_asset_pipeline(content)
+            puts "converting for asset pipeline"
+          end
 
           target_file = stylesheet_file(postfix: stylesheet_postfix, extension: @options[:stylesheet_extension])
           File.open(target_file, 'w') { |f| f.write(content) }
@@ -101,6 +106,18 @@ module FontelloRailsConverter
         end
       end
 
+      def convert_for_webpack(content)
+        content.gsub! /\.\.\/font\//, ""
+        content.gsub!(/url\(([^\(]+)\)/) do |m|
+          replace = if $1[0] == "'"
+                      "'~#{$1[1..-1]}"
+                    else
+                      "~#{$1}"
+                    end
+          $1.include?("application/octet-stream") ? "url(#{$1})" : "url(#{replace})"
+        end
+      end
+
       def sass_enhance(content)
         # turn icon base class into placeholder selector
         content.gsub! /\[class\^="icon-[^\{]+{/m, "%icon-base {"

data/lib/fontello_rails_converter/railtie.rb

@@ -2,8 +2,10 @@ module FontelloRailsConverter
   class Railtie < Rails::Railtie
 
     initializer "fontello_rails_converter.setup" do |app|
-      app.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
-      app.config.assets.precompile << /\.(?:svg|eot|woff|woff2|ttf)$/
+      if app.config.respond_to? (:assets)
+        app.config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
+        app.config.assets.precompile << /\.(?:svg|eot|woff|woff2|ttf)$/
+      end
     end
 
   end

data/lib/fontello_rails_converter/version.rb

@@ -1,3 +1,3 @@
 module FontelloRailsConverter
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/cli_spec.rb

@@ -39,6 +39,18 @@ describe FontelloRailsConverter::Cli do
       expect(cli.send(:convert_for_asset_pipeline, "url(/this/is/a/link)")).to eql 'font-url(/this/is/a/link)'
     end
 
+    specify do
+      expect(cli.send(:convert_for_webpack, "url(/this/is/a/link)")).to eql 'url(~/this/is/a/link)'
+    end
+
+    specify do
+      expect(cli.send(:convert_for_webpack, "url('/this/is/a/link')")).to eql %q[url('~/this/is/a/link')]
+    end
+
+    specify do
+      expect(cli.send(:convert_for_webpack, "url(data:application/octet-stream;base64,FFF)")).to eql 'url(data:application/octet-stream;base64,FFF)'
+    end
+
     specify do
       expect(cli.send(:convert_for_asset_pipeline, "url(data:application/octet-stream;base64,FFF)")).to eql 'url(data:application/octet-stream;base64,FFF)'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontello_rails_converter
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Jakob Hilden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip