fontello_rails_converter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abdcf7343cc9d7f66ce7ce34fb21014f55ff4a51
-  data.tar.gz: e58cdb33a77d9dbda843378079739c3429f5081f
+  metadata.gz: a5afdb7c6c5608e0f122a1499f94627629404fdd
+  data.tar.gz: 609b452ae1eb3c22a070bd33f2a9552375de9e9d
 SHA512:
-  metadata.gz: bc89a7f0563e879ceb8fa214890500ff92e1d4c3df0d3b9e8011393aa06b0cf52c2e06c8eebfdb987135297f0494c8897a29af8320fd6a07010a74f4a2706115
-  data.tar.gz: 5e84b26ebfc5a64b4094dd0a335ddac451c0d41fea50c7dc29a3187d668f9507c3fa94e1ce8ee9903a7fbc23671be27dc70484d9ae290114c3ecb0dcbae472aa
+  metadata.gz: 899b64f286cb557adad4f8686755daa6210f49ef17ca28bcf7179c291d5b3c7f783427787972d6f9f36d8231a42077aee13656c62b6ba607bf44d26a23396f00
+  data.tar.gz: 0d9de066d925af2234362a9f5e9b6ab6dc2809f51e23b428b8acdd6205304fdd1360345e522f8d6820f12fd467fca7582f8c97c2511ff774240bb41978cac72a

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.2
 bundler_args: --without development

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+# 0.4.1
+
+* [bugfix] for case where font name in `config.json` is empty #30
+
 # 0.4.0
 
 * added new `copy` command for cases where you don't want to convert assets
+* gem now depends on Ruby 2.x
 
 # 0.3.3
 

data/README.md

@@ -16,6 +16,8 @@ Main features:
 
 Add the gem to your Gemfile `gem 'fontello_rails_converter'` and run `bundle install`
 
+Read the [note](https://github.com/railslove/fontello_rails_converter#gemfile-environment) below to decide whether to put the gem into the `production` or `development` group in your Gemfile.
+
 #### Get your icon font
 
 1. Download your initial `.zip` file from [http://fontello.com](http://fontello.com) and save it to `myapp/tmp/fontello.zip`

data/fontello_rails_converter.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency "rubyzip", "~> 1.0"
   spec.add_runtime_dependency "launchy"
   spec.add_runtime_dependency "rest-client"

data/lib/fontello_rails_converter/cli.rb

@@ -183,7 +183,7 @@ module FontelloRailsConverter
 
       def fontello_name
         @_fontello_name ||= if config_file_exists?
-          JSON.parse(File.read(@options[:config_file]))['name']
+          JSON.parse(File.read(@options[:config_file]))['name'].presence || 'fontello'
         end
       end
   end

data/lib/fontello_rails_converter/version.rb

@@ -1,3 +1,3 @@
 module FontelloRailsConverter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/cli_spec.rb

@@ -29,21 +29,29 @@ describe FontelloRailsConverter::Cli do
   end
 
   describe '#fontello_name' do
-    context 'no config_file set' do
+    context 'no config_file specified' do
       let(:cli) { described_class.new({}) }
       specify do
         expect(cli.send(:fontello_name)).to eql nil
       end
     end
 
-    context 'config file doesnt exist' do
+    context 'specified config file doesnt exist' do
       let(:cli) { described_class.new(config_file: 'foo') }
       specify do
         expect(cli.send(:fontello_name)).to eql nil
       end
     end
 
+    context 'name is empty' do
+      let(:cli) { described_class.new(config_file: 'spec/fixtures/empty_name_config.json') }
+      it 'should fall back to "fontello"' do
+        expect(cli.send(:fontello_name)).to eql 'fontello'
+      end
+    end
+
     context 'correct config file' do
+
       specify do
         expect(cli.send(:fontello_name)).to eql 'makerist'
       end

data/spec/fixtures/empty_name_config.json

@@ -0,0 +1,3 @@
+{
+  "name": ""
+}

data/spec/fontello_api_spec.rb

@@ -5,23 +5,23 @@ describe FontelloRailsConverter::FontelloApi do
     subject { described_class.new config_file: File.expand_path('../fixtures/minimal-config.json', __FILE__), fontello_session_id_file: File.expand_path('../fixtures/fontello_session_id_persisted', __FILE__) }
 
     before do
-      subject.stub(:persist_session)
+      allow(subject).to receive(:persist_session)
     end
 
     describe '#new_session_from_config' do
       before do
-        RestClient.should_receive(:post).and_return 'NEWIDFROMCONFIG'
+        expect(RestClient).to receive(:post).and_return 'NEWIDFROMCONFIG'
       end
 
       specify do
-        subject.should_receive(:persist_session)
+        expect(subject).to receive(:persist_session)
         expect(subject.new_session_from_config).to eql 'NEWIDFROMCONFIG'
       end
     end
 
     describe '#session_url' do
       before do
-        subject.should_receive(:session_id).and_return "12345"
+        expect(subject).to receive(:session_id).and_return "12345"
       end
 
       specify do
@@ -43,7 +43,7 @@ describe FontelloRailsConverter::FontelloApi do
     describe '#session_id' do
       context 'session_id NOT set on initialization' do
         specify do
-          subject.should_receive(:read_or_create_session).and_return 'foo'
+          expect(subject).to receive(:read_or_create_session).and_return 'foo'
           expect(subject.send(:session_id)).to eql 'foo'
         end
       end
@@ -60,7 +60,7 @@ describe FontelloRailsConverter::FontelloApi do
     describe '#read_or_create_session' do
       context 'read from existing file' do
         specify do
-          subject.should_not_receive(:new_session_from_config)
+          expect(subject).not_to receive(:new_session_from_config)
           expect(subject.send(:read_or_create_session)).to eql 'MYPERSISTEDSESSION'
         end
       end
@@ -71,7 +71,7 @@ describe FontelloRailsConverter::FontelloApi do
         end
 
         specify do
-          subject.should_receive(:new_session_from_config).and_return 'NEWSESSION'
+          expect(subject).to receive(:new_session_from_config).and_return 'NEWSESSION'
           expect(subject.send(:read_or_create_session)).to eql 'NEWSESSION'
         end
       end
@@ -82,7 +82,7 @@ describe FontelloRailsConverter::FontelloApi do
         end
 
         specify do
-          subject.should_receive(:new_session_from_config).and_return 'NEWSESSION'
+          expect(subject).to receive(:new_session_from_config).and_return 'NEWSESSION'
           expect(subject.send(:read_or_create_session)).to eql 'NEWSESSION'
         end
       end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'fontello_rails_converter'
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.raise_errors_for_deprecations!
 
   config.order = 'random'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontello_rails_converter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jakob Hilden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -137,6 +137,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/fixtures/config.json
 - spec/fixtures/converted/fontello-demo.html
+- spec/fixtures/empty_name_config.json
 - spec/fixtures/fontello-demo.html
 - spec/fixtures/fontello_session_id_changing
 - spec/fixtures/fontello_session_id_empty
@@ -154,9 +155,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -215,6 +216,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/fixtures/config.json
 - spec/fixtures/converted/fontello-demo.html
+- spec/fixtures/empty_name_config.json
 - spec/fixtures/fontello-demo.html
 - spec/fixtures/fontello_session_id_changing
 - spec/fixtures/fontello_session_id_empty