pdf-wrapper 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.3.3 (7th September 2010)
+- fix loading of poppler lib to work when no xsession is available
+
 v0.3.2 (6th September 2010)
 - fix importing of PDF files as images
   - always imports the first page, currently no support for importing the

data/Rakefile

@@ -8,7 +8,7 @@ require 'spec/rake/spectask'
 require 'roodi'
 require 'roodi_task'
 
-PKG_VERSION = "0.3.2"
+PKG_VERSION = "0.3.3"
 PKG_NAME = "pdf-wrapper"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 

data/lib/pdf/wrapper/loading.rb

@@ -5,8 +5,10 @@ module PDF
     # its own classes and constants. A small amount of documentation is available at
     # http://ruby-gnome2.sourceforge.jp/fr/hiki.cgi?Cairo%3A%3AContext#Pango+related+APIs
     def load_libpango
+      return if @context.respond_to? :create_pango_layout
+
       begin
-        require 'pango' unless @context.respond_to? :create_pango_layout
+        require 'pango'
       rescue LoadError
         raise LoadError, 'Ruby/Pango library not found. Visit http://ruby-gnome2.sourceforge.jp/'
       end
@@ -16,8 +18,10 @@ module PDF
     # This will add some methods to the cairo Context class in addition to providing
     # its own classes and constants.
     def load_libpixbuf
+      return if @context.respond_to? :set_source_pixbuf
+
       begin
-        require 'gdk_pixbuf2' unless @context.respond_to? :set_source_pixbuf
+        require 'gdk_pixbuf2'
       rescue LoadError
         raise LoadError, 'Ruby/GdkPixbuf library not found. Visit http://ruby-gnome2.sourceforge.jp/'
       end
@@ -27,8 +31,16 @@ module PDF
     # This will add some methods to the cairo Context class in addition to providing
     # its own classes and constants.
     def load_libpoppler
+      return if @context.respond_to? :render_poppler_page
+
+      begin
+        require 'gtk2'
+      rescue Gtk::InitError
+        # ignore this error, it's thrown when gtk2 is loaded with no xsession available.
+        # as advised at http://www.ruby-forum.com/topic/182949
+      end
       begin
-        require 'poppler' unless @context.respond_to? :render_poppler_page
+        require 'poppler'
       rescue LoadError
         raise LoadError, 'Ruby/Poppler library not found. Visit http://ruby-gnome2.sourceforge.jp/'
       end
@@ -40,13 +52,13 @@ module PDF
     # There's a *little* bit of documentation at:
     # http://ruby-gnome2.sourceforge.jp/fr/hiki.cgi?Cairo%3A%3AContext#render_rsvg_handle
     def load_librsvg
+      return if @context.respond_to? :render_svg_handle
+
       begin
-        require 'rsvg2' unless @context.respond_to? :render_svg_handle
+        require 'rsvg2'
       rescue LoadError
         raise LoadError, 'Ruby/RSVG library not found. Visit http://ruby-gnome2.sourceforge.jp/'
       end
     end
-
-
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdf-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - James Healy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +10:00
+date: 2010-09-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency