poppler 3.1.9-x64-mingw32 → 3.2.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27cee135e8542fc26755848bd13bf9f3ba0f4e6
-  data.tar.gz: 5c61caf127fd6dd4cf0cba0fb879b7807e640b6f
+  metadata.gz: 48259e119a6ab1d97eac74c64efc493c8279f51a
+  data.tar.gz: b5f8759425e729b803ac7e4f98f7b0bbf25440f0
 SHA512:
-  metadata.gz: 59e0f276936badfe553bfd1884b1d700d256a431612fea614d9bdc5b75f55e7dfa05d0020baeff40eac1c4422087f53608ece647763e402672a76ee81be3f7e5
-  data.tar.gz: 7a4d3007878178507ad083a61809fe74cd7fc6d3f88ddb3dc60ac23a2903219add3d08c922214d1fbccf97d7a50a887bf46a742929de86d6d6bbf70a0ac26bb3
+  metadata.gz: 24701e666c2169c41093d947bbe88d989199be988b4b746c8ca16829923fbfa922771a5c4c0e0038e378d723d5f57c13a236d9b0331459617115e2ae7326ef55
+  data.tar.gz: 09a020bf3444d40bed1e2dc07f8a5ed9011c8c8500f871f51ea5320819572c4d78ff1a51ba179972511f37d75b7d13921fbdc91301d5a5c9b1077077a31ce58d

data/Rakefile

@@ -22,16 +22,21 @@ require 'gnome2-raketask'
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/Poppler is a Ruby binding of poppler-glib."
   package.description = "Ruby/Poppler is a Ruby binding of poppler-glib."
-  package.dependency.gem.runtime = [["cairo", ">= 1.14.0"], "gdk_pixbuf2"]
+  package.dependency.gem.runtime = [
+    "cairo-gobject",
+    "gio2",
+  ]
   package.windows.packages = []
   package.windows.dependencies = []
   package.windows.build_dependencies = [
     "glib2",
     "gobject-introspection",
-    "gdk_pixbuf2",
+    "gio2",
+    "cairo-gobject",
   ]
   package.windows.gobject_introspection_dependencies = [
-    "gdk_pixbuf2",
+    "gio2",
+    "cairo-gobject",
   ]
   package.external_packages = [
     {

data/lib/poppler/document.rb

@@ -22,48 +22,63 @@ module Poppler
     def initialize(*args)
       if args.size == 1 and args[0].is_a?(Hash)
         options = args[0]
-        data = options[:data]
-        uri = options[:uri]
-        path = options[:path]
-        stream = options[:stream]
-        length = options[:length]
-        file = options[:file]
-        password = options[:password]
-
-        if data
-          initialize_new_from_data(data, password)
-        elsif uri
-          initialize_new_from_file(uri, password)
-        elsif path
-          uri = ensure_uri(path)
-          initialize_new_from_file(uri, password)
-        elsif stream
-          if length.nil?
-            raise(ArgumentError,
-                  "must specify :length for :stream: #{options.inspect}")
-          end
-          initialize_new_from_stream(stream, length, password)
-        elsif file
-          if file.is_a?(String)
-            initialize(path: file, password: password)
-          else
-            initialize_new_from_gfile(file, password)
-          end
-        else
-          message =
-            "must specify one of :data, :uri, :path, :stream or :file: " +
-            options.inspect
-          raise(ArgumentError, message)
-        end
       else
         uri_or_data, password = args
         if pdf_data?(uri_or_data)
-          initialize_new_from_data(uri_or_data, password)
+          options = {
+            :data => uri_or_data,
+            :password => password
+          }
         else
-          uri = ensure_uri(uri_or_data)
-          initialize_new_from_file(uri, password)
+          options = {
+            :uri => ensure_uri(uri_or_data),
+            :password => password
+          }
         end
       end
+
+      data = options[:data]
+      uri = options[:uri]
+      path = options[:path]
+      stream = options[:stream]
+      length = options[:length]
+      file = options[:file]
+      password = options[:password]
+
+      if data
+        # Workaround: poppler_document_new_from_data()'s .gir
+        # accepts PDF data as UTF-8 string. PDF data is not UTF-8
+        # string. So UTF-8 validation is failed.
+        #
+        # TODO: Enable the following:
+        # initialize_new_from_data(data, password)
+
+        @bytes = GLib::Bytes.new(data)
+        @stream = Gio::MemoryInputStream.new(@bytes)
+        initialize_new_from_stream(@stream, data.bytesize, password)
+      elsif uri
+        initialize_new_from_file(uri, password)
+      elsif path
+        uri = ensure_uri(path)
+        initialize_new_from_file(uri, password)
+      elsif stream
+        if length.nil?
+          raise(ArgumentError,
+                "must specify :length for :stream: #{options.inspect}")
+        end
+        initialize_new_from_stream(stream, length, password)
+      elsif file
+        if file.is_a?(String)
+          initialize(path: file, password: password)
+        else
+          initialize_new_from_gfile(file, password)
+        end
+      else
+        message =
+          "must specify one of :data, :uri, :path, :stream or :file: " +
+          options.inspect
+        raise(ArgumentError, message)
+      end
     end
 
     alias_method :[], :get_page
@@ -90,6 +105,10 @@ module Poppler
       IndexIter.new(self)
     end
 
+    alias_method :size, :n_pages
+
+    alias_method :pages, :to_a
+
     private
     def pdf_data?(data)
       data.start_with?("%PDF-1.")

data/test/test-document.rb

@@ -1,4 +1,17 @@
 class TestDocument < Test::Unit::TestCase
+  sub_test_case("#initialize") do
+    def test_data
+      pdf = StringIO.new
+      surface = Cairo::PDFSurface.new(pdf, 100, 100)
+      context = Cairo::Context.new(surface)
+      context.show_text("Hello")
+      surface.finish
+
+      document = Poppler::Document.new(:data => pdf.string)
+      assert_equal("Hello", document[0].text)
+    end
+  end
+
   def test_save
     saved_pdf = File.join(tmp_dir, "saved.pdf")
     FileUtils.rm_f(saved_pdf)
@@ -45,6 +58,17 @@ class TestDocument < Test::Unit::TestCase
                  document.collect(&:text))
   end
 
+  def test_size
+    document = Poppler::Document.new(multiple_pages_pdf)
+    assert_equal(2, document.size)
+  end
+
+  def test_pages
+    document = Poppler::Document.new(multiple_pages_pdf)
+    assert_equal(["The first page", "The second page"],
+                 document.pages.collect(&:text))
+  end
+
   private
   def find_first_text_field(document)
     document.each do |page|

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: poppler
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.2.0
 platform: x64-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cairo
+  name: cairo-gobject
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: gdk_pixbuf2
+  name: gio2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.9
+        version: 3.2.0
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []