icanhazpdf 0.0.4.2 → 0.0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d92c7f6514403cf7f58a68e1a41f6782da51a5
-  data.tar.gz: 644f4818c62cf2cbd40b74f2f06bcd03ea68a5d2
+  metadata.gz: 2d8427a72b674a8353bec47f070bd4232d0b1e0d
+  data.tar.gz: d5dad796723b8afbada146405f1c6e696e69e83b
 SHA512:
-  metadata.gz: 2fb4be6777b2a15d9bbedc61142e316fa3bb361b10e31438bf7fa825da838c16c15d0547468ed06ef07dc835bffced5b00115d624cb92b07a98f5ca3d6bc6441
-  data.tar.gz: b8c7b365ef97751200cf79b36d21e086b88c17adb700ca4eaa627630a4db9b8f7fc9259c5f9e65cbef0ea6c089c9d4db00f98c8cbdf80a3defe2214569ce4592
+  metadata.gz: 5adc3f10d2657b07e22fa81d4d0cbc2c7d85dd9c3e203425a98e8b4ded523225fa5810ab45258a1b99960308bfad73486d15399001879c018c94643c2226e369
+  data.tar.gz: 5da95ba9b12e23f7c7d14b0ad2a23778d2266565d0fb51fbb4f6c6b9205fec4c0a4b73624873218a5f636b12002d086f93e00a3d517b94d928fa188e543b8040

data/README.md

@@ -37,7 +37,7 @@ To render a pdf (send the file to the browser) from a url use the renderer modul
       include Icanhazpdf::Controller::Renderer
 
       def my_action
-        render_pdf_from my_resource_url(resource), 'myfilename.pdf'
+        render_pdf_from my_resource_url(resource), {filename: 'myfilename.pdf'}
       end
     end
 
@@ -66,7 +66,7 @@ By default ICanHazPdf uses phantomjs to generate pdfs. You can also now choose t
 use wkhtmltopdf. To enable this you need to pass this option into the client or controller
 request. e.g.
 
-    pdf_response = Icanhazpdf::Client.new.pdf_from_url my_resource_url(resource), true
+    pdf_response = Icanhazpdf::Client.new.pdf_from_url my_resource_url(resource), {use_wkhtmltopdf: true}
 
 ## Authentication
 

data/lib/icanhazpdf/client.rb

@@ -18,7 +18,7 @@ module Icanhazpdf
     end
 
     # generate a pdf from the url passed
-    def pdf_from_url(full_url, use_wkhtmltopdf = false)
+    def pdf_from_url(full_url, options = {})
       uri = URI(full_url)
       params = URI.decode_www_form(uri.query || "") << ['icanhazpdf', Icanhazpdf::Client::api_key]
       uri.query = URI.encode_www_form(params)
@@ -28,7 +28,8 @@ module Icanhazpdf
         service_url = Icanhazpdf::Client.default_service_url
       end
       encoded_url = "#{service_url}?url=#{URI.encode(uri.to_s).gsub(':', '%3A').gsub('/', '%2F').gsub('?', '%3F').gsub('=', '%3D').gsub('&', '%26')}"
-      encoded_url += "&use_wkhtmltopdf=true" if use_wkhtmltopdf
+      encoded_url += "&use_wkhtmltopdf=true" if options.has_key?(:use_wkhtmltopdf)
+      encoded_url += "&margin=#{options[:margin]}" if options.has_key?(:margin)
       HTTParty.get(encoded_url, :timeout => 10000)
     end
 

data/lib/icanhazpdf/controller.rb

@@ -9,10 +9,9 @@ module Icanhazpdf
     module Renderer
 
       # generate and render a pdf from a url
-      def render_pdf_from(url, filename = "", use_wkhtmltopdf = false)
-        options = {}
-        options[:filename] = filename if filename.present?
-        render_response_for Icanhazpdf::Client.new.pdf_from_url(url, use_wkhtmltopdf), options
+      def render_pdf_from(url, options = {})
+        options.slice!(:filename, :use_wkhtmltopdf, :margin)
+        render_response_for Icanhazpdf::Client.new.pdf_from_url(url, options), options
       end
 
       # send the pdf to the user if its a valid file

data/lib/icanhazpdf/version.rb

@@ -1,3 +1,3 @@
 module Icanhazpdf
-  VERSION = "0.0.4.2"
+  VERSION = "0.0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icanhazpdf
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.5.0
 platform: ruby
 authors:
 - Nic Pillinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler