Permalink
Browse files

gem updates, including wicked_pdf 0.7.7 -> no need to patch it anymore

  • Loading branch information...
1 parent 1d75316 commit 41cd6a4dcc4057aae99d4aef3e68a18467e73794 @karhatsu committed Apr 18, 2012
Showing with 57 additions and 82 deletions.
  1. +57 −53 Gemfile.lock
  2. +0 −29 config/initializers/wicked_pdf.rb
View
110 Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
- ZenTest (4.5.0)
+ ZenTest (4.7.0)
actionmailer (3.2.1)
actionpack (= 3.2.1)
mail (~> 2.4.0)
@@ -29,15 +29,15 @@ GEM
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- arel (3.0.0)
+ addressable (2.2.7)
+ arel (3.0.2)
authlogic (3.1.0)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
autotest (4.4.6)
ZenTest (>= 4.4.1)
- autotest-rails (4.1.1)
- ZenTest (= 4.5)
+ autotest-rails (4.1.2)
+ ZenTest (~> 4.5)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -46,72 +46,74 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.0)
+ childprocess (0.3.1)
ffi (~> 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
- cucumber (1.1.4)
+ coffee-script-source (1.3.1)
+ cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (~> 2.7.1)
+ gherkin (~> 2.9.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
- cucumber-rails (1.2.1)
+ cucumber-rails (1.3.0)
capybara (>= 1.1.2)
- cucumber (>= 1.1.3)
+ cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
daemons (1.0.10)
- database_cleaner (0.7.1)
+ database_cleaner (0.7.2)
diff-lcs (1.1.3)
email_spec (1.2.1)
mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.5.0)
- activesupport
- factory_girl_rails (1.6.0)
- factory_girl (~> 2.5.0)
+ factory_girl (3.1.1)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.1.0)
+ factory_girl (~> 3.1.0)
railties (>= 3.0.0)
ffi (1.0.11)
gem_plugin (0.2.3)
- gherkin (2.7.6)
+ gherkin (2.9.3)
json (>= 1.4.6)
- gherkin (2.7.6-x86-mingw32)
+ gherkin (2.9.3-x86-mingw32)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.1)
- jquery-rails (2.0.0)
- railties (< 5.0, >= 3.2.0.beta)
+ journey (1.0.3)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.5)
- launchy (2.0.5)
+ json (1.6.6)
+ launchy (2.1.0)
addressable (~> 2.2.6)
- mail (2.4.1)
+ libwebsocket (0.1.3)
+ addressable
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
+ mime-types (1.18)
mongrel (1.2.0.pre2)
daemons (~> 1.0.10)
gem_plugin (~> 0.2.3)
mongrel (1.2.0.pre2-x86-mingw32)
gem_plugin (~> 0.2.3)
- multi_json (1.0.4)
- nokogiri (1.5.0)
- nokogiri (1.5.0-x86-mingw32)
- pg (0.12.2)
- pg (0.12.2-x86-mingw32)
+ multi_json (1.3.2)
+ nokogiri (1.5.2)
+ nokogiri (1.5.2-x86-mingw32)
+ pg (0.13.2)
+ pg (0.13.2-x86-mingw32)
polyglot (0.3.3)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
@@ -135,41 +137,43 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.1)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
+ rspec-rails (2.9.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.8.0)
+ rspec (~> 2.9.0)
ruby-prof (0.10.8)
- rubyzip (0.9.5)
- sass (3.1.12)
- sass-rails (3.2.4)
+ rubyzip (0.9.7)
+ sass (3.1.15)
+ sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.18.0)
+ selenium-webdriver (2.21.2)
childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
rubyzip
- shoulda-matchers (1.0.0)
+ shoulda-matchers (1.1.0)
+ activesupport (>= 3.0.0)
spork (0.9.0)
spork (0.9.0-x86-mingw32)
win32-process
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
- sqlite3 (1.3.5)
- sqlite3 (1.3.5-x86-mingw32)
+ sqlite3 (1.3.6)
+ sqlite3 (1.3.6-x86-mingw32)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
@@ -178,12 +182,12 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- uglifier (1.2.2)
+ tzinfo (0.3.33)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
watchr (0.7)
- wicked_pdf (0.7.2)
+ wicked_pdf (0.7.7)
win32-api (1.4.8-x86-mingw32)
win32-process (0.6.5)
windows-pr (>= 1.1.2)
View
29 config/initializers/wicked_pdf.rb
@@ -16,32 +16,3 @@ def check_path(path)
check_path exe_path
WickedPdf.config[:exe_path] = exe_path
-
-class WickedPdf
- def pdf_from_string(string, options={})
- # OWN: double quotes around the exe path
- command = "\"#{@exe_path}\" #{parse_options(options)} -q - - " # -q for no errors on stdout
- p "*"*15 + command + "*"*15 unless defined?(Rails) and Rails.env != 'development'
- pdf, err = Open3.popen3(command) do |stdin, stdout, stderr|
- stdin.binmode
- stdout.binmode
- stderr.binmode
- stdin.write(string)
- stdin.close
- [stdout.read, stderr.read]
- end
- raise "PDF could not be generated!" if pdf and pdf.rstrip.length == 0
- pdf
- rescue Exception => e
- raise "Failed to execute:\n#{command}\nError: #{e}"
- end
-
- private
- def make_option(name, value, type=:string)
- "--#{name.gsub('_', '-')} " + case type
- when :boolean then ""
- when :numeric then value.to_s
- else "\"#{value}\"" # OWN: double quotes around the value
- end + " "
- end
-end

0 comments on commit 41cd6a4

Please sign in to comment.