icanhazpdf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3c30c84c3d9365171cfbac2fa8ce06df2f39ba
-  data.tar.gz: b4203af5b4d792c4e6d9965b4481fdfeebc71450
+  metadata.gz: b5946da7cdb453bfb5c81b36a2db70ca140c08aa
+  data.tar.gz: f0380c04da4ec6e47dc9c91d6d80e466095204cc
 SHA512:
-  metadata.gz: a7c0459fce0eb5c775659d2cff2e1f7db3bdde6016b2cb256898aedde7bbb77828a8bb668274d59bf32c4f6628ee8d1b533ee0987c3baf81c2c92f11e93b6583
-  data.tar.gz: 4ddb25a90930ccf0b3dce7368321735ec97f573a646253c30f47d261094e6de538b13610d50fdea30d9f35a5e7d587b4b109b720c6cd310f6f58a79cd99fff3d
+  metadata.gz: 5249f12359b5469d0de2af37142c5cbf9d01936ecdb4ea97a85ef2ebefdbdc3b2298d09f9363fb47bc99e605bd1b922c4f0434aa870d346917125004007d0dcb
+  data.tar.gz: 36769713bce1a772d834d5f66de1ec826227e6ac4513b7baa18cc310163e30a99747f272543bbf0c57531b62105d1b56e6a5eb4dc98d14d3dadb25558b29df07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icanhazpdf (0.0.2)
+    icanhazpdf (0.0.4)
       activesupport (~> 4.0)
       httparty (~> 0.13)
 
@@ -75,9 +75,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  Icanhazpdf!
   bundler (~> 1.6)
   guard-rspec (~> 4.3)
+  icanhazpdf!
   pry (~> 0.10)
   rake (~> 10.3)
   rspec (~> 3.0)

data/lib/icanhazpdf/client.rb

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

data/lib/icanhazpdf/controller.rb

@@ -9,10 +9,10 @@ module Icanhazpdf
     module Renderer
 
       # generate and render a pdf from a url
-      def render_pdf_from(url, filename = "")
+      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), options
+        render_response_for Icanhazpdf::Client.new.pdf_from_url(url, use_wkhtmltopdf), 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.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/icanhazpdf/client_spec.rb

@@ -42,7 +42,14 @@ describe 'Icanhazpdf::Client' do
         @result = subject.pdf_from_url a_url
       end
 
-      context 'no ocanhazpdf api key in the config' do
+      context 'use wkhtmltopdf is requested as engine' do
+        it 'sets the use_wkhtmltopdf param in the query string' do
+          expect(HTTParty).to receive(:get).with(include("use_wkhtmltopdf=true"), be_an(Hash))
+          @result = subject.pdf_from_url a_url, true
+        end
+      end
+
+      context 'no icanhazpdf api key in the config' do
         before(:each) do
           allow(rails_config).to receive(:icanhazpdf_api_key).and_raise("Undefined config value")
         end

data/spec/lib/icanhazpdf/controller_spec.rb

@@ -31,7 +31,7 @@ describe "Icanhazpdf::Controller::Renderer" do
     end
 
     it 'requests the pdf from the client supplying the url' do
-      expect(client).to receive(:pdf_from_url).with(url)
+      expect(client).to receive(:pdf_from_url).with(url, false)
       subject.render_pdf_from url, filename
     end
 
@@ -46,6 +46,13 @@ describe "Icanhazpdf::Controller::Renderer" do
         subject.render_pdf_from url
       end
     end
+
+    context 'wkhtmltopdf is requested as rendering engine' do
+      it 'calls render response with use_wkhtmltopdf value supplied' do
+        expect(client).to receive(:pdf_from_url).with(url, true)
+        subject.render_pdf_from url, "", true
+      end
+    end
   end
 
   describe 'rendering the response from the client' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icanhazpdf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nic Pillinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler