fontcustom 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85393f70ef9449d5090ffb19a913dabe764fb59b
-  data.tar.gz: 781c8c82bfb28d11cd367432e800c224e211f075
+  metadata.gz: c735f457e4f3c87c9fe6a4bfb96a838ceb41e5ed
+  data.tar.gz: 9cb39edaaed9d22c46cc5293de50659c5d259544
 SHA512:
-  metadata.gz: e38e9a78191b62c3ca1b9c4feff9ba819ab7306f448719a5572f7be3e61212408a1f6402afc6128ea94117d4c55f30cbb96f4eb515f6eec8a8c43a8187902ee8
-  data.tar.gz: f8c94493f73344e717ae7862fddf0348d71c6c806fbafd11f24d23028e2523fe7a1bfa0dec1e1155901a3b3c438e6ba251c01234c1ace92b51eefd96a7c95056
+  metadata.gz: 4a01dd169d606ae246fe0b31cca4c511f9b2d13364f9cb22253912c28fd0ca14c4e8de3623016c3cc67a545e2f51191e9cd53e0278ea445cfe93b63e20e428b0
+  data.tar.gz: 315d840c2ffb6d314a9e0db5df8f852c6cc47ea5d22e627974769504523b86524b8cbde3be92f2420027058f0f25578870813a2b8171e727c5ca0c860e6ce243

data/.gitignore

@@ -15,6 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-spec/fixtures/fontcustom/*
+spec/fixtures/sandbox/*
 .DS_Store
 .ruby-version

data/.travis.yml

@@ -6,6 +6,7 @@ before_install:
   - unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
   - bundle
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.2 (1/31/2014)
+
+* Fixes `preprocessor_path` for Rails asset pipeline / Sprockets ([#162](https://github.com/FontCustom/fontcustom/pull/162), [#167](https://github.com/FontCustom/fontcustom/pull/167))
+* Fixes bug where `preprocessor_path` was ignored by the scss template ([#171](https://github.com/FontCustom/fontcustom/issues/171))
+* Fixes bug where relative output paths containing ".." would fail to compile
+
 ## 1.3.1 (12/28/2013)
 
 * Fixes syntax error in generate.py that affects Python 2.6

data/README.md

@@ -85,6 +85,7 @@ templates: [ css, preview ]           # List of templates to generate alongside
                                       # Possible values: preview, css, scss, scss-rails
 css_selector: .icon-{{glyph}}         # CSS selector format (`{{glyph}}` is replaced)
 preprocessor_path: ""                 # Font path used in CSS proprocessor templates
+                                      # Set to "" or false to use the bare font name
 
 # Custom templates should live in the `input` 
 # or `input[:templates]` directory and be added

data/lib/fontcustom/generator/template.rb

@@ -32,11 +32,17 @@ module Fontcustom
       def set_relative_paths
         fonts = @manifest.get :fonts
         name = File.basename fonts.first, File.extname(fonts.first)
-        fonts_path = Pathname.new @options[:output][:fonts]
-        css_path = Pathname.new @options[:output][:css]
-        preview_path = Pathname.new @options[:output][:preview]
+        fonts_path = Pathname.new(@options[:output][:fonts]).realdirpath
+        css_path = Pathname.new(@options[:output][:css]).realdirpath
+        preview_path = Pathname.new(@options[:output][:preview]).realdirpath
         @font_path = File.join fonts_path.relative_path_from(css_path).to_s, name
-        @font_path_alt = @options[:preprocessor_path].nil? ? @font_path : File.join(@options[:preprocessor_path], name)
+        @font_path_alt = if @options[:preprocessor_path].nil? 
+          @font_path
+        elsif ! @options[:preprocessor_path] || @options[:preprocessor_path].empty?
+          name
+        else
+          File.join(@options[:preprocessor_path], name)
+        end
         @font_path_preview = File.join fonts_path.relative_path_from(preview_path).to_s, name
       end
 
@@ -109,7 +115,7 @@ module Fontcustom
 
       def font_face(style = :normal)
         case style
-        when :rails
+        when :preprocessor
           url = "font-url"
           path = @font_path_alt
         when :preview

data/lib/fontcustom/templates/_fontcustom-rails.scss

@@ -2,7 +2,7 @@
 // Icon Font: <%= font_name %>
 //
 
-<%= font_face(:rails) %>
+<%= font_face(:preprocessor) %>
 
 [data-icon]:before { content: attr(data-icon); }
 

data/lib/fontcustom/templates/_fontcustom.scss

@@ -2,7 +2,7 @@
 // Icon Font: <%= font_name %>
 //
 
-<%= font_face %>
+<%= font_face(:preprocessor) %>
 
 [data-icon]:before { content: attr(data-icon); }
 

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spec/fontcustom/generator/template_spec.rb

@@ -24,28 +24,38 @@ describe Fontcustom::Generator::Template do
     it "should assign @font_path, @font_path_alt, and @font_path_preview" do
       gen = Fontcustom::Generator::Template.new fixture("generators/.fontcustom-manifest.json")
       options = gen.instance_variable_get :@options
-      options[:output] = {:fonts => fixture("foo/fonts"), :css => fixture("output/css"), :preview => fixture("views/")}
+      options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
 
       gen.send :set_relative_paths
-      gen.instance_variable_get(:@font_path).should match("../../foo/fonts")
-      gen.instance_variable_get(:@font_path_alt).should match("../../foo/fonts")
-      gen.instance_variable_get(:@font_path_preview).should match("../foo/fonts")
+      gen.instance_variable_get(:@font_path).should match("../fonts")
+      gen.instance_variable_get(:@font_path_alt).should match("../fonts")
+      gen.instance_variable_get(:@font_path_preview).should match(".")
     end
 
-    it "should assign @font_path_alt if :preprocessor_font_path is set" do
+    it "should assign @font_path_alt if :preprocessor_path is set" do
       gen = Fontcustom::Generator::Template.new fixture("generators/.fontcustom-manifest.json")
       options = gen.instance_variable_get :@options
-      options[:preprocessor_font_path] = "fonts/fontcustom"
-      options[:output] = {:fonts => fixture("foo/fonts"), :css => fixture("output/css"), :preview => fixture("views/")}
+      options[:preprocessor_path] = "fonts/fontcustom"
+      options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
 
       gen.send :set_relative_paths
       gen.instance_variable_get(:@font_path_alt).should match("fonts/fontcustom")
     end
 
+    it "should assign @font_path_alt as bare font name if :preprocessor_path is false" do
+      gen = Fontcustom::Generator::Template.new fixture("generators/.fontcustom-manifest.json")
+      options = gen.instance_variable_get :@options
+      options[:preprocessor_path] = false
+      options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
+
+      gen.send :set_relative_paths
+      gen.instance_variable_get(:@font_path_alt).should_not match("../fonts")
+    end
+
     it "should assign '.' when paths are the same" do
       gen = Fontcustom::Generator::Template.new fixture("generators/.fontcustom-manifest.json")
       options = gen.instance_variable_get :@options
-      options[:output] = {:fonts => fixture("foo/fonts"), :css => fixture("foo/fonts"), :preview => fixture("foo/fonts")}
+      options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/fonts"), :preview => fixture("sandbox/test/fonts")}
 
       gen.send :set_relative_paths
       gen.instance_variable_get(:@font_path).should match("./")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -165,7 +165,6 @@ files:
 - spec/fontcustom/cli_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
-- spec/fontcustom/generator/template_spec.rb.off
 - spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
 - spec/fontcustom/utility_spec.rb
@@ -226,7 +225,6 @@ test_files:
 - spec/fontcustom/cli_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
-- spec/fontcustom/generator/template_spec.rb.off
 - spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
 - spec/fontcustom/utility_spec.rb

data/spec/fontcustom/generator/template_spec.rb.off

@@ -1,215 +0,0 @@
-require "spec_helper"
-
-describe Fontcustom::Generator::Template do
-  before(:each) do
-    Fontcustom::Options.any_instance.stub :say_message
-  end
-  
-  def generator(options)
-    opts = Fontcustom::Options.new(options)
-    Fontcustom::Generator::Template.new([opts])
-  end
-
-  context "#get_manifest" do
-    it "should raise error if data file doesn't exist" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :quiet => true
-      )
-      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /\.fontcustom-manifest\.json/
-    end
-
-    it "should assign @data from data file" do
-      gen = generator(
-        :project_root => fixture("generators"),
-        :input => "../shared/vectors",
-        :quiet => true
-      )
-      gen.get_manifest
-      gen.instance_variable_get(:@data)[:templates].should =~ data_file_contents[:templates]
-    end
-  end
-
-  context "#reset_output" do
-    subject do
-      gen = generator(
-        :project_root => fixture("generators"),
-        :input => "../shared/vectors",
-        :output => "mixed-output",
-        :quiet => true
-      )
-      gen.stub :remove_file
-      gen.stub :overwrite_file
-      gen.instance_variable_set(:@data, data_file_contents)
-      gen
-    end
-
-    it "should delete files from @data[:templates]" do
-      subject.should_receive(:remove_file).once.with(/fontcustom\.css/, anything)
-      subject.reset_output
-    end
-
-    it "should not delete non-template files" do
-      subject.should_not_receive(:remove_file).with("dont-delete-me.bro")
-      subject.should_not_receive(:remove_file).with("another-font.ttf")
-      subject.should_not_receive(:remove_file).with(/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e/)
-      subject.reset_output
-    end
-
-    it "should empty @data[:fonts]" do
-      subject.reset_output
-      subject.instance_variable_get(:@data)[:templates].should be_empty
-    end
-
-    it "should update the data file" do
-      file = fixture("generators/.fontcustom-manifest.json")
-      subject.should_receive(:overwrite_file).once.with(file, /"templates":/)
-      subject.reset_output
-    end
-
-    it "should be silent" do
-      stdout = capture(:stdout) { subject.reset_output }
-      stdout.should == ""
-    end
-  end
-
-  context "#make_relative_paths" do
-    it "should assign @font_path, @font_path_alt, and @font_path_preview" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => {:fonts => "foo/fonts", :css => "output/css", :preview => "views/"}
-      )
-      gen.instance_variable_set :@data, data_file_contents
-      gen.make_relative_paths
-      gen.instance_variable_get(:@font_path).should match("../../foo/fonts")
-      gen.instance_variable_get(:@font_path_alt).should match("../../foo/fonts")
-      gen.instance_variable_get(:@font_path_preview).should match("../foo/fonts")
-    end
-
-    it "should assign @font_path_alt if :preprocessor_font_path is set" do
-      gen = generator(
-        :project_root => fixture,
-        :preprocessor_font_path => "fonts/fontcustom",
-        :input => "shared/vectors",
-        :output => {:fonts => "foo/bar/fonts", :css => "output/css", :preview => ""}
-      )
-      gen.instance_variable_set "@data", data_file_contents
-      gen.make_relative_paths
-      gen.instance_variable_get(:@font_path_alt).should match("fonts/fontcustom")
-    end
-
-    it "should assign '.' when paths are the same" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output"
-      )
-      gen.instance_variable_set "@data", data_file_contents
-      gen.make_relative_paths
-      gen.instance_variable_get(:@font_path).should match("./")
-    end
-  end
-
-  context "#generate" do
-    subject do
-      gen = generator(
-        :project_root => fixture("generators"),
-        :input => {:vectors => "../shared/vectors", :templates => "../shared/templates"},
-        :output => "mixed-output",
-        :templates => %W|scss css custom.css|,
-        :quiet => true
-      )
-      gen.instance_variable_set :@data, data_file_contents
-      gen.stub :template
-      gen.stub :overwrite_file
-      gen
-    end
-
-    it "should call #template for each template" do
-      subject.should_receive(:template).exactly(3).times do |*args|
-        args[1].should match(/(fontcustom\.css|_fontcustom\.scss|custom\.css)/)
-      end
-      subject.generate
-    end
-
-    it "should update data file with generated templates" do
-      file = fixture("generators/.fontcustom-manifest.json")
-      subject.should_receive(:overwrite_file).once.with do |path, content|
-        path.should == file
-        content.should match(/fontcustom\.css/)
-        content.should match(/_fontcustom\.scss/)
-        content.should match(/custom\.css/)
-      end
-      subject.generate
-    end
-
-    it "should be silent if :quiet is set" do
-      stdout = capture(:stdout) { subject.generate }
-      stdout.should == ""
-    end
-
-    it "should rename stock templates according to opts.font_name" do
-      gen = generator(
-        :project_root => fixture("generators"),
-        :font_name => "Test Font",
-        :input => {:vectors => "../shared/vectors", :templates => "../shared/templates"},
-        :templates => %W|scss css|,
-        :quiet => true
-      )
-      gen.instance_variable_set :@data, data_file_contents
-      gen.stub :template
-      gen.stub :overwrite_file
-      gen.should_receive(:template).exactly(2).times do |*args|
-        args[1].should match(/(Test-Font\.css|_Test-Font\.scss)/)
-      end
-      gen.generate
-    end
-
-    context "when various output locations are given" do
-      subject do
-        gen = generator(
-          :project_root => fixture,
-          :input => {:vectors => "shared/vectors", :templates => "shared/templates"},
-          :output => {:fonts => "output/fonts", :css => "output/css", :preview => "output/views", "custom.css" => "output/custom"},
-          :templates => %W|scss preview css custom.css regular.css|,
-          :quiet => true
-        )
-        gen.instance_variable_set :@data, data_file_contents
-        gen.stub :template
-        gen.stub :overwrite_file
-        gen
-      end
-
-      # 6 times because preview also includes preview-css
-      it "should output custom templates to their matching :output paths" do
-        subject.should_receive(:template).exactly(5).times do |*args|
-          if File.basename(args[0]) == :"custom.css"
-            args[1].should == fixture("output/custom/custom.css")
-          end
-        end
-        subject.generate
-      end
-
-      it "should output css templates into :css" do
-        subject.should_receive(:template).exactly(5).times do |*args|
-          name = File.basename(args[0])
-          if %w|_fontcustom.scss fontcustom.css regular.css|.include? name
-            args[1].should match(/output\/css\/#{name}/)
-          end
-        end
-        subject.generate
-      end
-
-      it "should output fontcustom-preview.html into :preview" do
-        subject.should_receive(:template).exactly(5).times do |*args|
-          if File.basename(args[0]) == "fontcustom-preview.html"
-            args[1].should == fixture("output/views/fontcustom-preview.html")
-          end
-        end
-        subject.generate
-      end
-    end
-  end
-end