clamsy 0.0.1 → 0.0.2

data/HISTORY.txt

@@ -1,3 +1,9 @@
+=== 0.0.2 (Apr 22, 2010)
+
+= 2nd official (yet still as embarrassing) release
+
+* instead of using system ps2pdf & pdf2ps commands, we use rghost gem to take care of ps/pdf conversions [#ngty]
+
 === 0.0.1 (Apr 21, 2010)
 
 = 1st official (yet embarrassing) release

data/README.rdoc

@@ -11,7 +11,7 @@ Ruby wrapper for generating a single pdf for multiple contexts from an odt templ
                 (how bad it is depends on ur platform) & even manual setting up of
                 cups printer is needed
 
-== Using It
+== Using It (sorry, still WIP for more decent examples)
 
 #1. Generating single context pdf:
 
@@ -53,10 +53,9 @@ Ruby wrapper for generating a single pdf for multiple contexts from an odt templ
 
 * add support for configuration, eg. Clamsy.configure {|config| ... }
 
-* implement strategy to check for missing commands & prompt user to install packages
+* automate cups-pdf printer setup
 
-* instead of using system to call the various commands, maybe we write extensions
-  for these foreign function calls (eg. using ffi ??)
+* avoid making system call to 'ooffice'
 
 == Note on Patches/Pull Requests
 

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.homepage = "http://github.com/ngty/clamsy"
     gem.authors = ["NgTzeYang"]
     gem.add_dependency "rubyzip", "= 0.9.4"
+    gem.add_dependency "rghost", "= 0.8.7.2"
     gem.add_development_dependency "bacon", ">= 1.1.0"
-    gem.add_development_dependency "differ", ">= 0.1.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/clamsy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clamsy}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-04-22}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
   s.extra_rdoc_files = [
@@ -54,17 +54,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubyzip>, ["= 0.9.4"])
+      s.add_runtime_dependency(%q<rghost>, ["= 0.8.7.2"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_development_dependency(%q<differ>, [">= 0.1.1"])
     else
       s.add_dependency(%q<rubyzip>, ["= 0.9.4"])
+      s.add_dependency(%q<rghost>, ["= 0.8.7.2"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_dependency(%q<differ>, [">= 0.1.1"])
     end
   else
     s.add_dependency(%q<rubyzip>, ["= 0.9.4"])
+    s.add_dependency(%q<rghost>, ["= 0.8.7.2"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
-    s.add_dependency(%q<differ>, [">= 0.1.1"])
   end
 end
 

data/lib/clamsy.rb

@@ -3,9 +3,12 @@ require 'digest/md5'
 require 'tempfile'
 require 'zip/zip'
 require 'clamsy/tenjin'
+require 'rghost'
 
 module Clamsy
 
+  class MissingFileError < Exception ; end
+
   class << self
 
     def process(contexts, template_odt, final_pdf)
@@ -28,7 +31,7 @@ module Clamsy
         (@trashable_tmp_files || []).select {|f| f.path }.map(&:unlink)
       end
 
-      def get_tmp_file(file_name)
+      def tmp_file(file_name)
         ((@trashable_tmp_files ||= []) << Tempfile.new(file_name))[-1]
       end
 
@@ -57,7 +60,7 @@ module Clamsy
         def working_odt
           (@working_odts ||= {})[@context_id] ||=
             begin
-              dest_odt = get_tmp_file(@context_id)
+              dest_odt = tmp_file(@context_id)
               File.copy(@template_odt, dest_odt.path) ; dest_odt
             end
         end
@@ -66,7 +69,7 @@ module Clamsy
           lambda do |entry|
             (@workers ||= {})[entry.to_s] ||=
               begin
-                tmp_file = get_tmp_file("#{@context_id}.#{File.basename(entry.to_s)}")
+                tmp_file = tmp_file("#{@context_id}.#{File.basename(entry.to_s)}")
                 tmp_file.write(entry.get_input_stream.read)
                 tmp_file.close
                 Tenjin::Template.new(tmp_file.path)
@@ -86,24 +89,16 @@ module Clamsy
       # to be set up in cups.
       ODT_TO_PDF_CMD = "ooffice -norestore -nofirststartwizard -nologo -headless -pt Cups-PDF"
 
-      # PDF to PS & vice versa
-      PDF_TO_PS_CMD = "pdf2ps"
-      PS_TO_PDF_CMD = "ps2pdf"
-
-      # Misc commands
-      CAT_CMD = 'cat'
-
       class << self
 
         include HasTrashableTempFiles
 
         def print_odts_to_pdf(from_odts, to_pdf)
           begin
-            tmp_ps = get_tmp_file(File.basename(to_pdf, '.pdf')).path
-            system([
-              "#{CAT_CMD} #{convert_odts_to_pss(from_odts).join(' ')} > #{tmp_ps}",
-              "#{PS_TO_PDF_CMD} #{tmp_ps} #{to_pdf}"
-            ].join(' && '))
+            tmp_ps = tmp_file(File.basename(to_pdf, '.pdf'))
+            from_odts.map {|odt| tmp_ps << odt_to_ps_stream(odt) }
+            tmp_ps.close
+            gs_convert(:pdf, tmp_ps.path, to_pdf)
           ensure
             trash_tmp_files
           end
@@ -111,16 +106,23 @@ module Clamsy
 
         private
 
-          def convert_odts_to_pss(odts)
-            odts.map(&:path).map do |odt_file|
-              ps_file = get_tmp_file(basename = File.basename(odt_file, '.odt')).path
-              pdf_file = File.join(PDF_OUTPUT_DIR, basename) + '.pdf'
-              system("#{ODT_TO_PDF_CMD} #{odt_file}")
-              # Abit clumsy ... but prevents occasional error for subsequent PDF_TO_PS_CMD
-              0.upto(10) {|_| File.exists?(pdf_file) ? break : sleep(1) }
-              system("#{PDF_TO_PS_CMD} #{pdf_file} #{ps_file}")
-              ps_file
-            end
+          def odt_to_ps_stream(odt)
+            ensure_file_exists!(odt_path = odt.path)
+            pdf_path = File.join(PDF_OUTPUT_DIR, File.basename(odt_path, '.odt')) + '.pdf'
+            system("#{ODT_TO_PDF_CMD} #{odt_path}")
+            gs_convert(:ps, pdf_path)
+          end
+
+          def gs_convert(format, src_path, dest_path=nil)
+            ensure_file_exists!(src_path)
+            method, opts = dest_path ? [:path, {:filename => dest_path}] : [:read, {}]
+            RGhost::Convert.new(src_path).to(format, opts).send(method)
+          end
+
+          def ensure_file_exists!(file_path)
+            exist_flg = false
+            0.upto(10) {|i| File.exists?(file_path) ? (exist_flg = true; break) : sleep(1) }
+            exist_flg or raise MissingFileError.new(file_path)
           end
 
       end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bacon'
 require 'differ'
 require 'tempfile'
+require 'digest/md5'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -19,7 +20,7 @@ shared 'has standard files support' do
       data_file("#{name}_example.pdf")
     end
     def comparable_content(file)
-      `pdf2ps #{file} -`.grep(/^[^%][^%]?/).
+      RGhost::Convert.new(file).to(:ps).read.grep(/^[^%][^%]?/).
         reject {|line| line =~ /^q\[\-?\d+( \-?\d+){5}\]concat\n$/ }
     end
     def trash_tmp_files

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - NgTzeYang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +08:00
+date: 2010-04-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,31 +32,32 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: rghost
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 1
         - 0
-        version: 1.1.0
-  type: :development
+        - 8
+        - 7
+        - 2
+        version: 0.8.7.2
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: differ
+  name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
         - 1
         - 1
-        version: 0.1.1
+        - 0
+        version: 1.1.0
   type: :development
   version_requirements: *id003
 description: ""