prawn-icon 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3481eee108e9e723fecc26c55cbb230b6bbd0b
-  data.tar.gz: fb577b5eed982b6dc50d1adc0697030cdb9e2e12
+  metadata.gz: 4b72801a22245be5c21023bc4dd96f34a9888c3b
+  data.tar.gz: 43384f7f447921f7ff5a4dae77fe1aaf4e5ee369
 SHA512:
-  metadata.gz: bee190bccfd7d39d325551399ff3124ea13d3b096fd3f30379cad3e9fd3d40236cc278a57bf162bf8666e4df31af1e4e4b10ad916e79fa33f89507e7b40cb787
-  data.tar.gz: 4b805fd0027c95b5476c0d9ed6222c384b9e9a08b398ca2fc76315e6e6a74801d6cce5dd1beca07d69523bbda50a0db2c2b1145a49c2a26f16733371f3c3fcfd
+  metadata.gz: b83ad4e37b575f040ca394ccbb0378bdeef0671ee5106a775ae57bda71113eb85bd0cf000a465f52d56669bd118d77059b33971f921e6f774ea8d0a69bf3bc14
+  data.tar.gz: 9cf1c9a029f4487ba0551e9a16c8138e91c39d1c9498b7d9a72a189518e14af2605976f836f1f17193063a9521dc93310e4a62f571c9384ee90e26b408c81333

data/lib/prawn/icon/font_data.rb

@@ -12,12 +12,13 @@ module Prawn
   class Icon
     class FontData
       class << self
-        # Make a simple cache that contains font
-        # data that has been lazily loaded.
+        # Font data lazy-loader that will initialize
+        # icon fonts by document.
         def load(document, set)
           set = set.to_sym
-          @data      ||= {}
+          @data ||= {}
           @data[set] ||= FontData.new(document, set: set)
+          @data[set].load_fonts(document)
         end
 
         # Release all font references if requested.
@@ -44,9 +45,8 @@ module Prawn
       attr_reader :set
 
       def initialize(document, opts = {})
-        @pdf = document
         @set = opts[:set] || :fa
-        update_document_fonts!
+        load_fonts(document)
       end
 
       def font_version
@@ -57,6 +57,11 @@ module Prawn
         File.join(File.dirname(path), "#{@set}.yml")
       end
 
+      def load_fonts(document)
+        document.font_families[@set.to_s] ||= { normal: path }
+        self
+      end
+
       def path
         ttf   = File.join(Icon::FONTDIR, @set.to_s, '*.ttf')
         fonts = Dir[ttf]
@@ -92,15 +97,6 @@ module Prawn
       def yaml
         @yaml ||= YAML.load_file legend_path
       end
-
-      private
-
-      def update_document_fonts!
-        @pdf.font_families.update(
-        @set.to_s => {
-          normal: path
-        })
-      end
     end
   end
 end

data/lib/prawn/icon/version.rb

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

data/prawn-icon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.6'
 
-  spec.homepage = "https://github.com/jessedoyle/prawn-icon/"
+  spec.homepage = 'https://github.com/jessedoyle/prawn-icon/'
 
   spec.test_files = Dir['spec/*_spec.rb']
   spec.authors = ['Jesse Doyle']

data/spec/integration/icon_spec.rb

@@ -22,14 +22,24 @@ describe Prawn::Icon::Interface do
       context 'inline_format: true' do
         it 'should handle text options (size)' do
           pdf = create_pdf
-          # We need to flush the font cache here...
-          Prawn::Icon::FontData.release_data
           pdf.icon '<icon size="60">fa-arrows</icon>', inline_format: true
           text = PDF::Inspector::Text.analyze(pdf.render)
 
           expect(text.strings.first).to eq("\uf047")
           expect(text.font_settings.first[:size]).to eq(60.0)
         end
+
+        it 'should be able to render on mulitple documents' do
+          pdf1 = create_pdf
+          pdf2 = create_pdf
+          pdf1.icon '<icon>fa-arrows</icon>', inline_format: true
+          pdf2.icon '<icon>fa-arrows</icon>', inline_format: true
+          text1 = PDF::Inspector::Text.analyze(pdf1.render)
+          text2 = PDF::Inspector::Text.analyze(pdf2.render)
+
+          expect(text1.strings.first).to eq("\uf047")
+          expect(text2.strings.first).to eq("\uf047")
+        end
       end
 
       context 'without options' do

data/spec/unit/font_data_spec.rb

@@ -17,7 +17,7 @@ describe Prawn::Icon::FontData do
   end
 
   describe '::load' do
-    it 'should cache font data on a document basis' do
+    it 'should only load a single object for multiple documents' do
       pdf = create_pdf
       data = Prawn::Icon::FontData.load(pdf, 'fa')
       obj_id_1 = data.__id__
@@ -110,6 +110,16 @@ describe Prawn::Icon::FontData do
     end
   end
 
+  describe '#load_fonts' do
+    it 'should return a FontData object' do
+      pdf = create_pdf
+      data = Prawn::Icon::FontData.new(pdf)
+      ret_val = data.load_fonts(pdf)
+
+      expect(ret_val.is_a? Prawn::Icon::FontData).to be_true
+    end
+  end
+
   describe '#path' do
     it 'should have a valid path to a TTF file' do
       pdf = create_pdf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-icon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jesse Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn