zena 1.2.6 → 1.2.7

data/History.txt

@@ -1,11 +1,14 @@
-== 1.2.6
+== 1.2.6, 1.2.7 2013-08-16
 
 * Major changes
   * Support for multiple domains (site alias) for a single site.
+  * Added support for wkhtmltopdf (Thanks Jean-Baptiste).
   
 * Minor changes
   * Added 'cmd' option for pdf brick. <== TODO: Document
   * Added 'local_ips' option to bricks.yml (used when pdf engine cannot render non-public assets). <== TODO: Document
+  * Fixed dependency on newer versions of rails.
+  
 == 1.2.5 2013-07-15
 
 * Major changes

data/bricks/pdf/lib/bricks/pdf.rb

@@ -3,8 +3,8 @@
 
   Examples:
 
-  Bricks::Pdf.engine = 'prince'
-  Bricks::Pdf.cmd    = '/usr/local/bin/prince'
+  Bricks::Pdf.engine = 'wkhtmltopdf'
+  Bricks::Pdf.cmd    = '/usr/local/bin/wkhtmltopdf'
 
   Bricks::Pdf.render_file "myfile.html"                            => STDOUT       (strings)
   Bricks::Pdf.render_file "myfile.html", "out.pdf"                 => out.pdf      (file)
@@ -41,7 +41,6 @@ module Bricks
     def render(options)
       res = nil
 
-      # TODO: redirect error messages...
       IO.popen(command(options), 'w+') do |io|
 
         if data = options[:data]
@@ -117,4 +116,4 @@ module Bricks
     module ZafuMethods
     end # ZafuMethods
   end # Pdf
-end # Bricks
+end # Bricks

data/bricks/pdf/lib/bricks/pdf/engine/wkhtmltopdf.rb

@@ -0,0 +1,43 @@
+module Bricks
+  module Pdf
+    module Engine
+      module Wkhtmltopdf
+        CMD = Bricks::CONFIG['pdf']['cmd'] || 'wkhtmltopdf'
+        def command(opts)
+          cmd = [CMD]
+          {
+            :http_user     => '--username ',
+            :http_password => '--password ',
+            # No base url option in version 0.9.6.
+            # Put a <base href="www.host.com/"/> at the beginning of the page
+            #:baseurl       => '--baseurl='
+          }.each do |key, cmd_key|
+            cmd << "#{cmd_key}#{opts[key]}"
+          end
+
+          if file = opts[:input]
+            cmd << file
+          else
+            cmd << "-"
+          end
+
+          if file = opts[:output]
+            cmd << file
+          else
+            cmd << "-"
+          end
+
+          # FIXME: find a way to redirect errors on screen instead of main log.
+          # Errors redirected to server log file.
+          cmd << "2> #{Zena.log_path}"
+
+          cmd.join(' ')
+        end
+      end # Prince
+    end # Engine
+  end # Pdf
+end # Bricks
+
+
+
+

data/config/bricks.yml

@@ -23,7 +23,8 @@ development:
       gem: 'uv'
   pdf:
     switch: ON
-    engine: prince
+    engine: wkhtmltopdf
+    cmd: /usr/local/bin/wkhtmltopdf
 
   math:
     switch: ON
@@ -74,7 +75,8 @@ production:
       gem: 'simple_xlsx'
   pdf:
     switch: ON
-    engine: prince
+    engine: wkhtmltopdf
+    cmd: /usr/local/bin/wkhtmltopdf
   math:
     switch: ON
     live:   ON

data/config/gems.yml

@@ -6,7 +6,7 @@ tzinfo:
 uuidtools:      '= 2.0.0'
 rails:          '= 2.3.18'
 json:           '= 1.5.1'
-authlogic:      '= 2.1.3'
+authlogic:      '= 2.1.9'
 fast_gettext:   '~> 0.4.16'
 will_paginate:  '~> 2.3.12'
 differ:         '= 0.1.2'
@@ -25,8 +25,6 @@ rubyless:       '= 0.8.10'
 property:       '= 2.3.3'
 versions:       '= 0.3.1'
 
-jeweler:
-
 RedCloth:
   lib:          'redcloth'
   version:      '= 3.0.4'

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.2.6'
+  VERSION        = '1.2.7'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/test/functional/nodes_controller_test.rb

@@ -983,7 +983,7 @@ END:VCALENDAR
     if Zena::Use::Upload.has_network?
       preserving_files('test.host/data') do
         assert_difference('Node.count', 1) do
-          post 'create', 'attachment_url' => 'http://zenadmin.org/fr/blog/image5.jpg', 'node' => {'parent_id' => nodes_zip(:zena)}
+          post 'create', 'attachment_url' => 'http://zenadmin.org/fr/blog/image5.0c8db.jpg', 'node' => {'parent_id' => nodes_zip(:zena)}
         end
         document = assigns(:node)
         assert_equal 73633, document.size

data/zena.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
@@ -342,7 +342,7 @@ Gem::Specification.new do |s|
     "bricks/pdf/VERSION",
     "bricks/pdf/lib/bricks/pdf.rb",
     "bricks/pdf/lib/bricks/pdf/engine/prince.rb",
-    "bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb",
+    "bricks/pdf/lib/bricks/pdf/engine/wkhtmltopdf.rb",
     "bricks/pdf/lib/bricks/pdf/install.rb",
     "bricks/pdf/test/engines/test_prince.rb",
     "bricks/pdf/test/engines/test_xhtml2pdf.rb",
@@ -2479,87 +2479,84 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
       s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
       s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<property>, ["= 2.3.3"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<property>, ["= 2.3.3"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
       s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
       s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<property>, ["= 2.3.3"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
+    s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<property>, ["= 2.3.3"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
     s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
     s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -19,191 +19,189 @@ date: 2013-08-16 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyless
+  name: uuidtools
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 15
         segments: 
+        - 2
         - 0
-        - 8
-        - 10
-        version: 0.8.10
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yamltest
+  name: will_paginate
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+        - 2
+        - 3
+        - 12
+        version: 2.3.12
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: property
+  name: RedCloth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15
         segments: 
-        - 2
-        - 3
         - 3
-        version: 2.3.3
+        - 0
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: httmultiparty
+  name: ruby-recaptcha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
+        - 1
         - 0
         - 3
-        - 8
-        version: 0.3.8
+        version: 1.0.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: gettext
+  name: simple_xlsx_writer
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 2
-        - 1
         - 0
-        version: 2.1.0
+        version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: differ
+  name: safe_yaml
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 63
         segments: 
         - 0
-        - 1
-        - 2
-        version: 0.1.2
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: daemons
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: fast_gettext
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 16
+        version: 0.4.16
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: authlogic
+  name: shoulda
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 33
         segments: 
         - 2
-        - 1
+        - 10
         - 3
-        version: 2.1.3
+        version: 2.10.3
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: querybuilder
+  name: tzinfo
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: differ
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
+        - 0
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -221,205 +219,193 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: fast_gettext
+  name: rubyless
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 43
         segments: 
         - 0
-        - 4
-        - 16
-        version: 0.4.16
+        - 8
+        - 10
+        version: 0.8.10
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: simple_xlsx_writer
+  name: gettext
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
+        - 2
+        - 1
         - 0
-        version: "0"
+        version: 2.1.0
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: ruby-recaptcha
+  name: gem_plugin
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 3
-        version: 1.0.3
+        version: "0"
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: versions
+  name: open4
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        version: "0"
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: safe_yaml
+  name: syntax
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 8
         - 0
-        version: 0.8.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: property
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 5
         segments: 
         - 2
         - 3
-        - 18
-        version: 2.3.18
+        - 3
+        version: 2.3.3
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: yamltest
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: rails
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 39
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 18
+        version: 2.3.18
   type: :runtime
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: querybuilder
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
+        - 1
         - 2
-        - 3
-        - 12
-        version: 2.3.12
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: gem_plugin
+  name: httmultiparty
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 8
+        version: 0.3.8
   type: :runtime
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: authlogic
   prerelease: false
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 25
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 1
+        - 9
+        version: 2.1.9
   type: :runtime
   version_requirements: *id024
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: versions
   prerelease: false
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 17
         segments: 
-        - 2
-        - 10
+        - 0
         - 3
-        version: 2.10.3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id025
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id026
 description: zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).
 email: gaspard@teti.ch
 executables: 
@@ -753,7 +739,7 @@ files:
 - bricks/pdf/VERSION
 - bricks/pdf/lib/bricks/pdf.rb
 - bricks/pdf/lib/bricks/pdf/engine/prince.rb
-- bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb
+- bricks/pdf/lib/bricks/pdf/engine/wkhtmltopdf.rb
 - bricks/pdf/lib/bricks/pdf/install.rb
 - bricks/pdf/test/engines/test_prince.rb
 - bricks/pdf/test/engines/test_xhtml2pdf.rb

data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb

@@ -1,9 +0,0 @@
-module Bricks
-  module Pdf
-    module Engine
-      module Xhtml2pdf
-        # Not supported until they have http auth and base url settings.
-      end # Xhtml2pdf
-    end # Engine
-  end # Pdf
-end # Bricks