eideticpdf 0.9.9 → 1.0.0

data/lib/epdfafm.rb

@@ -15,12 +15,20 @@ module EideticPDF
     FontPath = [File.join(File.dirname(__FILE__), '..', 'fonts')]
 
     class Codepoints
-      def self.for_encoding(encoding)
-        require 'iconv'
-        encoding = 'CP1252' if encoding == 'WinAnsiEncoding'
-        @@codepoints_by_encoding ||= {}
-        @@codepoints_by_encoding[encoding] ||= Iconv.open("UCS-2BE//IGNORE", encoding) do |ic|
-          (0..255).map { |c| ic.iconv(c.chr) }.map { |s| s.unpack('n') }.map { |a| a.first }
+      if ''.respond_to?(:encoding) # Ruby 1.9+
+        def self.for_encoding(encoding)
+          encoding = 'CP1252' if encoding == 'WinAnsiEncoding'
+          @@codepoints_by_encoding ||= {}
+          @@codepoints_by_encoding[encoding] ||= (0..255).inject('') { |m, n| m << n.chr }.encode('UCS-2BE', encoding, :undef => :replace).unpack('n*')
+        end
+      else
+        def self.for_encoding(encoding)
+          require 'iconv'
+          encoding = 'CP1252' if encoding == 'WinAnsiEncoding'
+          @@codepoints_by_encoding ||= {}
+          @@codepoints_by_encoding[encoding] ||= Iconv.open("UCS-2BE//IGNORE", encoding) do |ic|
+            (0..255).map { |c| ic.iconv(c.chr) }.map { |s| s.unpack('n') }.map { |a| a.first }
+          end
         end
       end
     end

data/lib/epdfk.rb

@@ -2818,7 +2818,7 @@ module EideticPDF
       0x002F => 'slash',
       0x263A => 'smileface',
       0x0020 => 'space',
-      0x00A0 => 'space',
+      0x00A0 => 'nbsp',
       0x2660 => 'spade',
       0xF6F2 => 'ssuperior',
       0x00A3 => 'sterling',

data/lib/epdfpw.rb

@@ -1542,7 +1542,11 @@ module EideticPDF
         end
       end
       unless text_encoding.nil? or (font.encoding == 'StandardEncoding') or (font.encoding == text_encoding)
-        @ic = Iconv.new(iconv_encoding(font.encoding)+'//IGNORE', iconv_encoding(text_encoding))
+        if ''.respond_to?(:encoding) # Ruby 1.9+
+          @ic = FakeIconv.new(iconv_encoding(font.encoding), iconv_encoding(text_encoding))
+        else
+          @ic = Iconv.new(iconv_encoding(font.encoding)+'//IGNORE', iconv_encoding(text_encoding))
+        end
       end
       font.widths, font.ascent, font.descent = metrics.widths, metrics.ascent, metrics.descent
       font.height = font.ascent + font.descent.abs

data/lib/epdfs.rb

@@ -76,7 +76,9 @@ module EideticPDF
   module JpegInfo # :nodoc:
     def jpeg?(image)
       # image[0, 2] == "\xFF\xD8"
-      image[0, 2].hash == "\xFF\xD8".hash
+      # image[0, 2].hash == "\xFF\xD8".hash
+      # String#bytes requires Ruby 1.8.7+
+      image.bytes.first(2) == [0xFF, 0xD8]
     end
 
     def jpeg_dimensions(image)
@@ -98,4 +100,14 @@ module EideticPDF
     
     module_function :jpeg?, :jpeg_dimensions
   end
+
+  class FakeIconv
+    def initialize(to, from)
+      @to, @from = to, from
+    end
+
+    def iconv(text)
+      text.encode(@to, @from, :invalid => :replace, :undef => :replace)
+    end
+  end
 end

data/test/test.rb

@@ -569,6 +569,8 @@ def text_encodings(w)
     ['Symbol', 'StandardEncoding'], 
     ['ZapfDingbats', 'StandardEncoding']
   ]
+  fonts.delete(['Helvetica', 'ISO-8859-16']) if ''.respond_to?(:encoding) # Ruby 1.9+
+  fonts.delete(['Courier', 'Macintosh']) if ''.respond_to?(:encoding) # Ruby 1.9+
   fonts.each do |name, encoding|
     w.page(:units => :in, :margins => 0.5) do |p|
       p.print "#{name} - #{encoding}", :underline => true

data/test/test_epdfafm.rb

@@ -197,6 +197,10 @@ class AdobeFontMetricsTestCases < Test::Unit::TestCase
     assert_equal(278, fm.widths[32])
     assert_equal(722, fm.widths[65])
     assert_not_nil(fm.differences)
-    assert_equal(77, fm.differences.values.size)
+    if ''.respond_to?(:encoding) # Ruby 1.9+
+      assert_equal(83, fm.differences.values.size)
+    else
+      assert_equal(77, fm.differences.values.size)
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eideticpdf
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
-  - 9
-  version: 0.9.9
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Brent Rowland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-13 00:00:00 -07:00
+date: 2013-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- Ruby 1.8.x
+- Ruby 1.8.7 or 1.9.3
 rubyforge_project: eideticpdf
 rubygems_version: 1.4.2
 signing_key: