prawn-icon 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b72801a22245be5c21023bc4dd96f34a9888c3b
-  data.tar.gz: 43384f7f447921f7ff5a4dae77fe1aaf4e5ee369
+  metadata.gz: 80513979342022341bfa4034755c950f119733f0
+  data.tar.gz: 22f383bfd1061435dc1174a04c2513dcce1020ef
 SHA512:
-  metadata.gz: b83ad4e37b575f040ca394ccbb0378bdeef0671ee5106a775ae57bda71113eb85bd0cf000a465f52d56669bd118d77059b33971f921e6f774ea8d0a69bf3bc14
-  data.tar.gz: 9cf1c9a029f4487ba0551e9a16c8138e91c39d1c9498b7d9a72a189518e14af2605976f836f1f17193063a9521dc93310e4a62f571c9384ee90e26b408c81333
+  metadata.gz: 97d67837e38a0fb9b2756700c0dd79e2f8418c2ef7f2537820f560f06e67c768526897d2443dc8f4232d2921918ca007d1225b84c6e9d01b1ec078eab6e84245
+  data.tar.gz: ab151bd81b30919fd63b7b28e0da33dfa93815bc23aae9103b7e2c66c340af8719d90326ccbce01f451bbcfaaca692a5706f8ccbee4a4df82267d1011275ae81

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Rakefile

@@ -9,8 +9,9 @@ Bundler.setup
 
 require 'rake'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => [:spec]
+task :default => [:spec, :rubocop]
 
 desc 'Run all rspec files'
 RSpec::Core::RakeTask.new('spec') do |c|
@@ -28,3 +29,6 @@ task :legend do
   end
   puts 'All Done!'
 end
+
+RuboCop::RakeTask.new
+

data/examples/fontawesome.rb

@@ -1,6 +1,5 @@
 # All example code may be executed by calling `rake legend`
 
-require 'prawn'
 require_relative '../lib/prawn/icon'
 require_relative 'example_helper'
 

data/examples/foundation_icons.rb

@@ -1,6 +1,5 @@
 # All example code may be executed by calling `rake legend`
 
-require 'prawn'
 require_relative '../lib/prawn/icon'
 require_relative 'example_helper'
 

data/examples/octicons.rb

@@ -1,6 +1,5 @@
 # All example code may be executed by calling `rake legend`
 
-require 'prawn'
 require_relative '../lib/prawn/icon'
 require_relative 'example_helper'
 

data/lib/prawn/icon.rb

@@ -6,6 +6,7 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
+require 'prawn'
 require_relative 'icon/font_data'
 require_relative 'icon/parser'
 

data/lib/prawn/icon/parser.rb

@@ -39,6 +39,8 @@ module Prawn
 
       TAG_REGEX     = /<icon[^>]*>[^<]*<\/icon>/mi
 
+      ATTR_REGEX    = /(?<attr>[a-zA-Z]*)=["|'](?<val>(\w*[^["|']]))["|']/mi
+
       class << self
         def format(document, string)
           tokens  = string.scan(PARSER_REGEX)
@@ -58,16 +60,15 @@ module Prawn
           tokens.each do |token|
             # Skip the closing tag
             next if token =~ /<\/icon>/i
-
             icon = {}
 
-            # TODO: Only support double quotes?
-            size  = /size="([^"]*)"/i.match(token)
-            color = /color="([^"]*)"/i.match(token)
-
-            icon[:size]  = size[1].to_f if size
-            icon[:color] = color[1] if color
+            # 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
 
@@ -120,6 +121,18 @@ module Prawn
 
           icons
         end
+
+        private
+
+        def attr_hash(value) #:nodoc:
+          # If attr == size, we must cast value to float,
+          # else symbolize the key and map it to value
+          if value[0] =~ /size/i
+            { size: value[1].to_f }
+          else
+            { value[0].to_sym => value[1] }
+          end
+        end
       end
     end
   end

data/lib/prawn/icon/version.rb

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

data/prawn-icon.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.platform = Gem::Platform::RUBY
   spec.summary = 'Provides icon fonts for PrawnPDF'
   spec.files =  Dir.glob('{lib,spec,fonts,examples}/**/**/*') +
-                ['prawn-icon.gemspec', 'Gemfile', 'Rakefile',
-                 'COPYING', 'LICENSE', 'GPLv2', 'GPLv3']
+    ['prawn-icon.gemspec', 'Gemfile', 'Rakefile',
+     'COPYING', 'LICENSE', 'GPLv2', 'GPLv3']
   spec.require_path = 'lib'
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.6'
@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
   spec.email = ['jdoyle@ualberta.ca']
   spec.licenses = ['RUBY', 'GPL-2', 'GPL-3']
 
-  spec.add_development_dependency('prawn', '~> 1.3')
+  spec.add_dependency('prawn', '>= 1.3.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('rspec', '~>2.14.1')
+  spec.add_development_dependency('rubocop', '~>0.27.0')
   spec.add_development_dependency('mocha')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('simplecov')

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@
 require "bundler"
 Bundler.setup
 
-require "prawn"
 require "prawn/icon"
 require 'pdf/inspector'
 require "rspec"

data/spec/unit/parser_spec.rb

@@ -55,6 +55,34 @@ describe Prawn::Icon::Parser do
   end
 
   describe '::config_from_tokens' do
+    it 'should handle attrs with double quotes' do
+      string = '<icon size="20">fa-arrows</icon>'
+      tokens = tokenize_string(string)
+      config = Prawn::Icon::Parser.config_from_tokens(tokens)
+      inner = config.first
+
+      expect(inner[:size]).to eq(20.0)
+    end
+
+    it 'should handle attrs with single quotes' do
+      string = "<icon size='20'>fa-arrows</icon>"
+      tokens = tokenize_string(string)
+      config = Prawn::Icon::Parser.config_from_tokens(tokens)
+      inner = config.first
+
+      expect(inner[:size]).to eq(20.0)
+    end
+
+    it 'should handle both single/double quotes in same string' do
+      string = '<icon color="0099FF" size=\'20\'>fa-arrows</icon>'
+      tokens = tokenize_string(string)
+      config = Prawn::Icon::Parser.config_from_tokens(tokens)
+      inner = config.first
+
+      expect(inner[:size]).to eq(20.0)
+      expect(inner[:color]).to eq('0099FF')
+    end
+
     it 'should return an array containing only an empty hash' do
       string = '<icon>fa-arrows</icon>'
       tokens = tokenize_string(string)

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: prawn-icon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jesse Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +48,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.27.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement