prawn-icon 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8889719da10fa88779b85044ad4e21cefba4b626
-  data.tar.gz: 538526d331c869244c668b9f4646d16cc8072028
+  metadata.gz: 60c827fe1c0063f5a64c2d1a4f19df456880b407
+  data.tar.gz: 7e4d155380ff3e6266d78ecb35532b29d05f3afd
 SHA512:
-  metadata.gz: 4c8c174bc49dbbb3ab8ca16755b932f483cdbe50539d55b8705c6a79c0ad466bcf6c7a5ef9d61d1aea827bc037e7f2a838e12841a0afb5d3ae2bdc1a6464cf6d
-  data.tar.gz: d3960939db1027e38f079a31bde2eac6d9d70d4ea05045e2a2e7447cfd1c17c5cb299285d863ae6986dfe4f2c38eb73ac023d5a26dc3374de562f1a276b31b66
+  metadata.gz: b27500edce7d1a45e4a51dfd135d3de5212a662509ffaff488aa7a9ec7dd99f7a8643f0da34e272cdb7bd97a6b2c69a14512e628fab6397c0e0bbc6f581529c2
+  data.tar.gz: d85b373423054100048ac6e9113f589a13e2de5563d2115a98457fc426206ac07a2b34326c169de4dc1bd40bccb3007400e4429ec2bb1cd10c8c938989debd35

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.0 - March 16, 2016
+
+- Update FontAwesome from v4.4.0 to v4.5.0. See [changelog](http://fontawesome.io/icons#new).
+- Refactor specs to use `expect(foo).to be true` over `expect(foo).to be_true`.
+- Update development dependencies to latest.
+
 # 1.0.0 - September 9, 2015
 
 - *(breaking change)* Updated Octicons from v2.4.1 to v3.1.0.

data/data/fonts/fa/fa.yml

@@ -75,6 +75,8 @@ fa:
   bitbucket-square: "\uf172"
   bitcoin: "\uf15a"
   black-tie: "\uf27e"
+  bluetooth: "\uf293"
+  bluetooth-b: "\uf294"
   bold: "\uf032"
   bolt: "\uf0e7"
   bomb: "\uf1e2"
@@ -153,6 +155,7 @@ fa:
   code: "\uf121"
   code-fork: "\uf126"
   codepen: "\uf1cb"
+  codiepie: "\uf284"
   coffee: "\uf0f4"
   cog: "\uf013"
   cogs: "\uf085"
@@ -171,6 +174,7 @@ fa:
   copyright: "\uf1f9"
   creative-commons: "\uf25e"
   credit-card: "\uf09d"
+  credit-card-alt: "\uf283"
   crop: "\uf125"
   crosshairs: "\uf05b"
   css3: "\uf13c"
@@ -193,6 +197,7 @@ fa:
   dribbble: "\uf17d"
   dropbox: "\uf16b"
   drupal: "\uf1a9"
+  edge: "\uf282"
   edit: "\uf044"
   eject: "\uf052"
   ellipsis-h: "\uf141"
@@ -264,6 +269,7 @@ fa:
   fonticons: "\uf280"
   forumbee: "\uf211"
   forward: "\uf04e"
+  fort-awesome: "\uf286"
   foursquare: "\uf180"
   frown-o: "\uf119"
   futbol-o: "\uf1e3"
@@ -308,6 +314,7 @@ fa:
   hand-scissors-o: "\uf257"
   hand-spock-o: "\uf259"
   hand-stop-o: "\uf256"
+  hashtag: "\uf292"
   hdd-o: "\uf0a0"
   header: "\uf1dc"
   headphones: "\uf025"
@@ -407,8 +414,10 @@ fa:
   minus-circle: "\uf056"
   minus-square: "\uf146"
   minus-square-o: "\uf147"
+  mixcloud: "\uf289"
   mobile: "\uf10b"
   mobile-phone: "\uf10b"
+  modx: "\uf285"
   money: "\uf0d6"
   moon-o: "\uf186"
   mortar-board: "\uf19d"
@@ -435,11 +444,14 @@ fa:
   paragraph: "\uf1dd"
   paste: "\uf0ea"
   pause: "\uf04c"
+  pause-circle: "\uf28b"
+  pause-circle-o: "\uf28c"
   paw: "\uf1b0"
   paypal: "\uf1ed"
   pencil: "\uf040"
   pencil-square: "\uf14b"
   pencil-square-o: "\uf044"
+  percent: "\uf295"
   phone: "\uf095"
   phone-square: "\uf098"
   photo: "\uf03e"
@@ -461,6 +473,7 @@ fa:
   plus-square-o: "\uf196"
   power-off: "\uf011"
   print: "\uf02f"
+  product-hunt: "\uf288"
   puzzle-piece: "\uf12e"
   qq: "\uf1d6"
   qrcode: "\uf029"
@@ -473,6 +486,7 @@ fa:
   rebel: "\uf1d0"
   recycle: "\uf1b8"
   reddit: "\uf1a1"
+  reddit-alien: "\uf281"
   reddit-square: "\uf1a2"
   refresh: "\uf021"
   registered: "\uf25d"
@@ -497,6 +511,7 @@ fa:
   safari: "\uf267"
   save: "\uf0c7"
   scissors: "\uf0c4"
+  scribd: "\uf28a"
   search: "\uf002"
   search-minus: "\uf010"
   search-plus: "\uf00e"
@@ -514,6 +529,8 @@ fa:
   shield: "\uf132"
   ship: "\uf21a"
   shirtsinbulk: "\uf214"
+  shopping-bag: "\uf290"
+  shopping-basket: "\uf291"
   shopping-cart: "\uf07a"
   sign-in: "\uf090"
   sign-out: "\uf08b"
@@ -561,6 +578,8 @@ fa:
   sticky-note: "\uf249"
   sticky-note-o: "\uf24a"
   stop: "\uf04d"
+  stop-circle: "\uf28d"
+  stop-circle-o: "\uf28e"
   street-view: "\uf21d"
   strikethrough: "\uf0cc"
   stumbleupon: "\uf1a4"
@@ -631,6 +650,7 @@ fa:
   unlock-alt: "\uf13e"
   unsorted: "\uf0dc"
   upload: "\uf093"
+  usb: "\uf287"
   usd: "\uf155"
   user: "\uf007"
   user-md: "\uf0f0"

data/lib/prawn/icon.rb

@@ -78,9 +78,7 @@ module Prawn
       #   inline_format: true
       #
       def icon(key, opts = {})
-        i = make_icon(key, opts)
-        i.render
-        i
+        make_icon(key, opts).tap(&:render)
       end
 
       # Initialize a new icon object, but do

data/lib/prawn/icon/font_data.rb

@@ -79,14 +79,12 @@ module Prawn
       end
 
       def unicode(key)
-        char = yaml[specifier][key]
-
-        unless char
-          raise Prawn::Errors::IconNotFound,
-                "Key: #{specifier}-#{key} not found"
+        yaml[specifier][key].tap do |char|
+          unless char
+            raise Prawn::Errors::IconNotFound,
+                  "Key: #{specifier}-#{key} not found"
+          end
         end
-
-        char
       end
 
       def keys

data/lib/prawn/icon/parser.rb

@@ -49,77 +49,69 @@ module Prawn
           icons   = keys_to_unicode(document, content, config)
           tags    = icon_tags(icons)
 
-          string.gsub(TAG_REGEX).with_index do |_, i|
-            tags[i]
-          end
+          string.gsub(TAG_REGEX).with_index { |_, i| tags[i] }
         end
 
         def config_from_tokens(tokens)
-          array = []
-
-          tokens.each do |token|
-            # Skip the closing tag
-            next if token =~ /<\/icon>/i
-            icon = {}
-
-            # Convert [[1,2], [3,4]] to { :1 => 2, :3 => 4 }
-            attrs = token.scan(ATTR_REGEX).inject({}) do |k, v|
-              val = attr_hash(v)
-              k.merge!(val)
+          [].tap do |array|
+            tokens.each do |token|
+              # Skip the closing tag
+              next if token =~ /<\/icon>/i
+              icon = {}
+
+              # Convert [[1,2], [3,4]] to { :1 => 2, :3 => 4 }
+              attrs = token.scan(ATTR_REGEX).inject({}) do |k, v|
+                val = attr_hash(v)
+                k.merge!(val)
+              end
+
+              icon.merge!(attrs)
+              array << icon
             end
-
-            icon.merge!(attrs)
-            array << icon
           end
-
-          array
         end
 
         def icon_tags(icons)
-          tags = []
+          [].tap do |tags|
+            icons.each do |icon|
+              # Mandatory
+              content = icon[:content]
+              set     = icon[:set]
 
-          icons.each do |icon|
-            # Mandatory
-            content = icon[:content]
-            set     = icon[:set]
+              # Optional
+              color = icon[:color]
+              size  = icon[:size]
 
-            # Optional
-            color = icon[:color]
-            size  = icon[:size]
+              opening = "<font name=\"#{set}\""
 
-            opening = "<font name=\"#{set}\""
+              unless color || size
+                tags << "#{opening}>#{content}</font>"
+                next
+              end
 
-            unless color || size
-              tags  << "#{opening}>#{content}</font>"
-              next
-            end
+              opening += " size=\"#{size}\"" if size
+              content = "<color rgb=\"#{color}\">#{content}</color>" if color
 
-            opening += " size=\"#{size}\"" if size
-            content = "<color rgb=\"#{color}\">#{content}</color>" if color
-
-            opening += '>'
-            tags << "#{opening}#{content}</font>"
+              opening += '>'
+              tags << "#{opening}#{content}</font>"
+            end
           end
-
-          tags
         end
 
         def keys_to_unicode(document, content, config)
-          icons = []
-
-          content.each_with_index do |icon, index|
-            options ||= {}
-            options = config[index] if config.any?
-            info = {
-              set:     FontData.specifier_from_key(icon),
-              size:    options[:size],
-              color:   options[:color],
-              content: FontData.unicode_from_key(document, icon)
-            }
-            icons << info
+          [].tap do |icons|
+            content.each_with_index do |icon, index|
+              options ||= {}
+              options = config[index] if config.any?
+              info = {
+                set:     FontData.specifier_from_key(icon),
+                size:    options[:size],
+                color:   options[:color],
+                content: FontData.unicode_from_key(document, icon)
+              }
+              icons << info
+            end
           end
-
-          icons
         end
 
         private

data/lib/prawn/icon/version.rb

@@ -8,6 +8,6 @@
 
 module Prawn
   class Icon
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/prawn-icon.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |spec|
   spec.platform = Gem::Platform::RUBY
   spec.summary  = 'Provides icon fonts for PrawnPDF'
   spec.files    =  Dir.glob('{lib,spec,data,examples}/**/**/*') +
-    %w(prawn-icon.gemspec Gemfile Rakefile) +
-    %w(README.md CHANGELOG.md) +
-    %w(COPYING LICENSE GPLv2 GPLv3)
+                   %w(prawn-icon.gemspec Gemfile Rakefile) +
+                   %w(README.md CHANGELOG.md) +
+                   %w(COPYING LICENSE GPLv2 GPLv3)
 
   spec.require_path              = 'lib'
   spec.required_ruby_version     = '>= 1.9.3'
@@ -24,13 +24,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('prawn', '>= 1.1.0', '< 3.0.0')
 
-  spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
-  spec.add_development_dependency('rspec', '~>2.14.1')
-  spec.add_development_dependency('rubocop', '~>0.27.0')
+  spec.add_development_dependency('pdf-inspector', '~> 1.2.1')
+  spec.add_development_dependency('rspec', '~> 3.4.0')
+  spec.add_development_dependency('rubocop', '~> 0.38.0')
   spec.add_development_dependency('mocha')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('simplecov')
-  spec.add_development_dependency('pdf-reader', '~>1.2')
+  spec.add_development_dependency('pdf-reader', '~> 1.4')
 
   spec.description = <<-END_DESC
   Prawn::Icon provides various icon fonts including

data/spec/integration/icon_spec.rb

@@ -120,7 +120,7 @@ describe Prawn::Icon::Interface do
 
         expect(icon.class).to eq(Hash)
         expect(icon[:content]).to eq('<font name="fa"></font>')
-        expect(icon[:inline_format]).to be_true
+        expect(icon[:inline_format]).to be true
       end
 
       it 'should ignore all other tags' do
@@ -130,7 +130,7 @@ describe Prawn::Icon::Interface do
 
         expect(icon.class).to eq(Hash)
         expect(icon[:content]).to eq(a[0])
-        expect(icon[:inline_format]).to be_true
+        expect(icon[:inline_format]).to be true
       end
 
       context 'multiple icons' do
@@ -142,7 +142,7 @@ describe Prawn::Icon::Interface do
 
           expect(icon.class).to eq(Hash)
           expect(icon[:content]).to eq(out)
-          expect(icon[:inline_format]).to be_true
+          expect(icon[:inline_format]).to be true
         end
       end
     end

data/spec/unit/font_data_spec.rb

@@ -60,7 +60,7 @@ describe Prawn::Icon::FontData do
       unicode = Prawn::Icon::FontData.unicode_from_key(pdf, 'fa-arrows')
       valid = unicode.force_encoding('UTF-8').valid_encoding?
 
-      expect(valid).to be_true
+      expect(valid).to be true
     end
   end
 
@@ -95,7 +95,7 @@ describe Prawn::Icon::FontData do
       data = Prawn::Icon::FontData.new(pdf)
       version = data.font_version
 
-      expect(version.is_a? String).to be_true
+      expect(version.is_a? String).to be true
     end
   end
 
@@ -116,7 +116,7 @@ describe Prawn::Icon::FontData do
       data = Prawn::Icon::FontData.new(pdf)
       ret_val = data.load_fonts(pdf)
 
-      expect(ret_val.is_a? Prawn::Icon::FontData).to be_true
+      expect(ret_val.is_a? Prawn::Icon::FontData).to be true
     end
   end
 
@@ -148,7 +148,7 @@ describe Prawn::Icon::FontData do
       unicode = data.unicode('arrows')
       valid = unicode.force_encoding('UTF-8').valid_encoding?
 
-      expect(valid).to be_true
+      expect(valid).to be true
     end
 
     it 'should raise an error if unable to match a key' do
@@ -167,7 +167,7 @@ describe Prawn::Icon::FontData do
       keys = data.keys
 
       expect(keys).not_to be_empty
-      expect(keys.first.is_a? String).to be_true
+      expect(keys.first.is_a? String).to be true
     end
 
     it 'should not contain the version as a key' do
@@ -175,7 +175,7 @@ describe Prawn::Icon::FontData do
       data = Prawn::Icon::FontData.new(pdf, set: :fa)
       keys = data.keys
 
-      expect(keys.include?('__font_version__')).to be_false
+      expect(keys.include?('__font_version__')).to be false
     end
   end
 
@@ -190,11 +190,11 @@ describe Prawn::Icon::FontData do
       inner_value = mapping.values.last
       proc = Proc.new { inner_value.force_encoding('UTF-8').valid_encoding? }
 
-      expect(yaml.is_a? Hash).to be_true
+      expect(yaml.is_a? Hash).to be true
       expect(key).to eq('fa')
-      expect(inner_key.is_a? String).to be_true
-      expect(inner_value.is_a? String).to be_true
-      expect(proc).to be_true
+      expect(inner_key.is_a? String).to be true
+      expect(inner_value.is_a? String).to be true
+      expect(proc.call).to be true
     end
   end
 end

data/spec/unit/icon_spec.rb

@@ -98,7 +98,7 @@ describe Prawn::Icon do
         pdf = create_pdf
         icon = Prawn::Icon.new 'fa-arrows', pdf
 
-        expect(valid_unicode?(icon.unicode)).to be_true
+        expect(valid_unicode?(icon.unicode)).to be true
       end
     end
 

data/spec/unit/parser_spec.rb

@@ -137,7 +137,7 @@ describe Prawn::Icon::Parser do
       icons = Prawn::Icon::Parser.keys_to_unicode(pdf, content, config)
       icon = icons.first[:content]
 
-      expect(valid_unicode?(icon)).to be_true
+      expect(valid_unicode?(icon)).to be true
     end
 
     it 'should return a single array containing attr hash of defaults' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-icon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jesse Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -36,42 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 description: |2
     Prawn::Icon provides various icon fonts including
     FontAwesome, Foundation Icons and GitHub Octicons
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Provides icon fonts for PrawnPDF