icosmith-rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809b309a7de9d2b3c862b8a93edd869d67f3c878
-  data.tar.gz: e47c92f1661ce66e35ce46cd12d28a02c52f0343
+  metadata.gz: b4aa17ef164d9888ca23d79c9913c705e46a06cc
+  data.tar.gz: 43c37f47a4b99826086c7a6f1aa10e9543573626
 SHA512:
-  metadata.gz: 8e68dd7f3c4ddd4df7ffefcb2b869762cac5a487b521205e2170486a921f5c684492fbaf29ba7bfbcfdecc24ba958f3bbb36aa40d64563e403773d934f852be5
-  data.tar.gz: 07ea9142fce61f11d1ccf1ead413183131da55ce734488b223556f190b07c725a3ae3225c31590048e6018297262efb8144479c2a0a0d9b56dfbd08ef68aae6c
+  metadata.gz: 116686f3490dfa7e30c9a165584a088194e801f4a5a5ec0cc5ea6c2413cce0ac1c71d5e5513819f42b9b95cbf4373eef87bd42e72ce2d754722a842300caa2c4
+  data.tar.gz: 36fda53cb0ee075a2425c2a5928d7178f813114c57c2bf75fc14cae645333870b7dcc6a96061c0c4853707b2b57a3409c11cebe2753976cf5768a02b50e456cc

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    icosmith-rails (0.3.0)
+    icosmith-rails (0.3.1)
       rest-client (~> 1.6.7)
-      rubyzip (< 1.0.0)
+      rubyzip
       thor (~> 0.18.1)
 
 GEM
@@ -15,7 +15,7 @@ GEM
     columnize (0.3.6)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.4)
-    mime-types (1.25)
+    mime-types (2.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.13.0)
@@ -26,7 +26,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rubyzip (0.9.9)
+    rubyzip (1.1.0)
     thor (0.18.1)
 
 PLATFORMS

data/icosmith-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "rest-client", "~> 1.6.7"
-  gem.add_dependency "rubyzip",     "< 1.0.0"
+  gem.add_dependency "rubyzip"
   gem.add_dependency "thor",        "~> 0.18.1"
 
   gem.add_development_dependency "rspec"

data/lib/icosmith-rails.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require "zip/zip"
+require "zip"
 require "rest_client"
 require "json"
 require "logger"

data/lib/icosmith-rails/font.rb

@@ -17,7 +17,7 @@ module Icosmith
       FileUtils.rm_f(@svg_zipfile)
 
       log("Compressing SVGs")
-      Zip::ZipFile.open(@svg_zipfile, Zip::ZipFile::CREATE) do |zipfile|
+      Zip::File.open(@svg_zipfile, Zip::File::CREATE) do |zipfile|
         Dir.glob("#{@src_dir}#{File::SEPARATOR}*.svg").each do |filename|
           zipfile.add(filename.split(File::SEPARATOR).last, filename)
         end
@@ -50,12 +50,12 @@ module Icosmith
       log("Replacing files")
       temp_font_path = @fonts_zipfile.gsub(/\.zip$/, '')
       FileUtils.rm_f(temp_font_path)
-      FileUtils.mkdir(temp_font_path)
+      FileUtils.mkdir_p(File.join(temp_font_path, "fonts"))
       FileUtils.mkdir_p(@font_dir)
       FileUtils.mkdir_p(@css_dir)
 
-      unzip @fonts_zipfile, temp_font_path
-      copy_css temp_font_path
+      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)
@@ -88,7 +88,7 @@ module Icosmith
     end
 
     def unzip path, target
-      Zip::ZipFile.open(path) do |zip_file|
+      Zip::File.open(path) do |zip_file|
         zip_file.each do |file|
           zip_file.extract(file, File.join(target, file.name))
         end

data/lib/icosmith-rails/version.rb

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

data/spec/lib/icosmith-rails/config_spec.rb

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+require 'yaml'
+
+describe Icosmith::Config do
+  subject do
+    Icosmith::Config.new
+  end
+
+  describe "accessors for keys" do
+    [:svg_dir, :font_dir, :fonts, :css_dir, :manifest_dir, :generate_fonts_url, :use_sass].each do |key|
+      it "creates an acessor for #{key} key" do
+        subject.should respond_to(key)
+      end
+    end
+  end
+
+  describe ".load" do
+    let!(:root_path) do
+      Dir.mktmpdir
+    end
+
+    before do
+      File.write("#{root_path}/config.yml", "css_dir: path/to/css\nuse_sass: true")
+    end
+
+    after do
+      FileUtils.rm_rf(root_path)
+    end
+
+    it "sets the configuration values from a file" do
+      config = Icosmith::Config.load("#{root_path}/config.yml")
+
+      config.css_dir.should eql "path/to/css"
+      config.use_sass.should be_true
+    end
+  end
+end
+
+describe Icosmith do
+  describe ".config" do
+    it "returns a new instance of Icosmith::Config" do
+      Icosmith.config.should be_an_instance_of Icosmith::Config
+    end
+  end
+
+  describe ".logger" do
+    it "returns a logger with a configured formatter" do
+      logger = Icosmith.logger
+      logger_message = logger.formatter.call(:error, Time.now, nil, "error message")
+      logger_message.should eql " - error message\n"
+    end
+  end
+
+  describe ".configure" do
+    it "yields a configuration block to config method" do
+      expect do |block|
+        Icosmith.configure(&block)
+      end.to yield_with_args(Icosmith.config)
+    end
+  end
+end

data/spec/lib/icosmith-rails/font_spec.rb

@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+require 'tmpdir'
+require 'zip'
+
+describe Icosmith::Font do
+  let!(:root_path) do
+    Dir.mktmpdir
+  end
+
+  before do
+    Icosmith.logger.stub(:info)
+  end
+
+  after do
+    FileUtils.rm_rf(root_path)
+  end
+
+  describe "#create_svg_zipfile" do
+    before do
+      FileUtils.mkdir_p("#{root_path}/manifest/my-font")
+      FileUtils.touch("#{root_path}/manifest/my-font/manifest.json")
+
+      FileUtils.mkdir_p("#{root_path}/svgs/my-font")
+      FileUtils.touch("#{root_path}/svgs/my-font/icon1.svg")
+      FileUtils.touch("#{root_path}/svgs/my-font/icon2.svg")
+    end
+
+    subject do
+      Icosmith::Font.new(root_path, config, "my-font")
+    end
+
+    let(:config) do
+      double("config", manifest_dir: "manifest", svg_dir: "svgs", css_dir: "stylesheets", font_dir: "fonts")
+    end
+
+    it "creates a zip file with the font .svg files and manifest.json" do
+      subject.create_svg_zipfile
+
+      Zip::File.open("#{root_path}/tmp/icosmith/my-font/svg.zip") do |zip_file|
+        zip_file.map(&:name).should eql %w{icon1.svg icon2.svg manifest.json}
+      end
+    end
+  end
+
+  describe "#generate_font" do
+    subject do
+      Icosmith::Font.new(root_path, config, "my-font")
+    end
+
+    let(:config) do
+      double("config", generate_fonts_url: "/url", manifest_dir: "manifest", svg_dir: "svgs", css_dir: "stylesheets", font_dir: "fonts")
+    end
+
+    let(:fontfile_contents) do
+      double("font", headers: {content_disposition: 'filename="file.zip"'})
+    end
+
+    before do
+      FileUtils.mkdir_p("#{root_path}/manifest/my-font")
+      FileUtils.touch("#{root_path}/manifest/my-font/manifest.json")
+
+      file = double("svg.zip")
+      File.stub(:new).and_return(file)
+      RestClient.stub(:post).with("/url", file: file).and_return(fontfile_contents)
+
+      subject.generate_font
+    end
+
+    it "saves the server response to a local file" do
+      fontfile = "#{root_path}/tmp/icosmith/my-font/file.zip"
+      File.read(fontfile).should eql fontfile_contents.to_s
+    end
+
+    it "removes the svg zip file" do
+      File.exists?("#{root_path}/tmp/icosmith/my-font/svg.zip").should be_false
+    end
+  end
+
+  describe "#extract_font" do
+    subject do
+      Icosmith::Font.new(root_path, config, "my-font")
+    end
+
+    let(:config) do
+      double("config", use_sass: false, manifest_dir: "manifest", svg_dir: "svgs", css_dir: "stylesheets", font_dir: "fonts")
+    end
+
+    before do
+      FileUtils.mkdir_p("#{root_path}/manifest/my-font")
+      FileUtils.touch("#{root_path}/manifest/my-font/manifest.json")
+
+      fontfile = "#{root_path}/tmp/icosmith/my-font/file.zip"
+      subject.instance_variable_set(:@fonts_zipfile, fontfile)
+      FileUtils.mkdir_p("#{root_path}/tmp/icosmith/my-font/fonts")
+
+      fontfiles = []
+      %w{ttf woff svg eot afm}.each do |extension|
+        fontfiles << "#{root_path}/tmp/icosmith/my-font/fonts/my-font.#{extension}"
+      end
+      otherfiles = []
+      otherfiles << "#{root_path}/tmp/icosmith/my-font/manifest.json"
+      otherfiles << "#{root_path}/tmp/icosmith/my-font/my-font.css"
+      Zip::File.open("#{root_path}/tmp/icosmith/my-font/file.zip", Zip::File::CREATE) do |zipfile|
+        fontfiles.each do |filename|
+          FileUtils.touch(filename)
+          zipfile.add("fonts/"+filename.split(File::SEPARATOR).last, filename)
+        end
+
+        otherfiles.each do |filename|
+          FileUtils.touch(filename)
+          zipfile.add(filename.split(File::SEPARATOR).last, filename)
+        end
+      end
+
+      subject.extract_font
+    end
+
+    it "moves css file to css_dir" do
+      File.exists?("#{root_path}/stylesheets/my-font.css").should be_true
+    end
+
+    it "moves font files to font_dir" do
+      %w{ttf woff svg eot afm}.each do |extension|
+        File.exists?("#{root_path}/fonts/my-font.#{extension}").should be_true
+      end
+    end
+
+    it "moves manifest.json file to manifest_dir" do
+      File.exists?("#{root_path}/manifest/my-font/manifest.json").should be_true
+    end
+  end
+end

data/spec/lib/icosmith-rails/generator_spec.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+
+describe Icosmith::Generator do
+  describe "#setup_fonts" do
+    before do
+      Icosmith::Config.should_receive(:load).
+        with("path/config/icosmith/icosmith.yml").and_return(config)
+    end
+
+    subject do
+      Icosmith::Generator.new("path")
+    end
+
+    context "without fonts key configured" do
+      let(:config) do
+        double("config", fonts: nil)
+      end
+
+      before do
+        Icosmith::Font.should_receive(:new).with("path", config)
+      end
+
+      it "returns an array with a single Icosmith::Font instance" do
+        subject.setup_fonts.size.should eql 1
+      end
+    end
+
+    context "with fonts key configured" do
+      let(:config) do
+        double("config", fonts: %w{font1 font2 font3})
+      end
+
+      before do
+        Icosmith::Font.should_receive(:new).with("path", config, "font1")
+        Icosmith::Font.should_receive(:new).with("path", config, "font2")
+        Icosmith::Font.should_receive(:new).with("path", config, "font3")
+      end
+
+      it "returns an array with an Icosmith::Font instance for each font" do
+        subject.setup_fonts.size.should eql 3
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,4 +12,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
+  config.color_enabled = true
+  config.formatter = :documentation
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icosmith-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - tulios
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -29,16 +29,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,9 @@ files:
 - lib/icosmith-rails/railtie.rb
 - lib/icosmith-rails/tasks/icosmith.rake
 - lib/icosmith-rails/version.rb
+- spec/lib/icosmith-rails/config_spec.rb
+- spec/lib/icosmith-rails/font_spec.rb
+- spec/lib/icosmith-rails/generator_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/tulios/icosmith-rails
 licenses:
@@ -135,4 +138,7 @@ signing_key:
 specification_version: 4
 summary: Rails integration with an icosmith server
 test_files:
+- spec/lib/icosmith-rails/config_spec.rb
+- spec/lib/icosmith-rails/font_spec.rb
+- spec/lib/icosmith-rails/generator_spec.rb
 - spec/spec_helper.rb