url2pdf_rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842d9398ac42378a91cc6bda95ad00271e546e85
-  data.tar.gz: 5b030f5b0fe48b9512507210f53441d75266a706
+  metadata.gz: 3671c66a178b53f820c8faa22edec66d6ea77129
+  data.tar.gz: 3a062c5799bfdef4c670d6c5701c37d809cdca7b
 SHA512:
-  metadata.gz: 7743ca0c82feb1c23f33f4787837d06810755227ac1577ffb9816bcdfe39e43985a71dc95dbe9e8fec6a9e38eba0a9e97ec2f1b2cbe432e745891fe2c93e357d
-  data.tar.gz: b9a7c26bed291b6af6e909666139625e2fbd03b6cae9125ce93f02335d0a672bd0e744b396a25480c1b0dca030d206f2782c05aa74b093955236ebc0d0d0c09a
+  metadata.gz: 66a6443841919266c67a9aefb6d0f7b03fd9c17236125a07aba7867b31356afd59e9c088c25f34583f7feb7ba9d0fb5a6bf02e29eead8f87ce52f5b5a1d97c10
+  data.tar.gz: cf68378ead0cf8d34747cff46602aa5133eaf926ab3c607097ecd7db0ffb33bc65002909d1d9a39826df1afe02eb23d91b6f238ceccdba46345847af0602f2e0

data/lib/url2pdf_rails/authentication.rb

@@ -1,5 +1,3 @@
-require 'url2pdf_rails/configuration'
-
 module Url2pdfRails
   module Authentication
 
@@ -10,27 +8,54 @@ module Url2pdfRails
     module ClassMethods
       def authenticate_as_pdf_request!(options = {})
         skip_filter = options.delete(:skip_filter)
-        devise_auth_model = options.delete(:devise_auth_model)
+        devise_fallback = options.delete(:devise_fallback)
 
-        # should skip an existing authentication filter?
+        # should skip any before filters?
         skip_before_filter skip_filter, options if skip_filter.present?
 
-        # add our filter for authentication
-        authenticate_as_icanhazpdf_or_devise = -> do
-          devise_auth_model ||= 'user'
+        # skip devise authentication filters if present
+        devise_fallback.each do |devise_auth_model|
           devise_auth_method = "authenticate_#{devise_auth_model}!"
-          head 401 unless valid_icanhazpdf_request? || (self.respond_to?(devise_auth_method) && self.send(devise_auth_method))
-        end
+          skip_before_filter devise_auth_method.to_sym, options
+        end if devise_fallback.present?
 
+        # try authenticate as pdf request and then fallback to devise if supplied
+        authenticate_as_icanhazpdf_or_devise = -> do
+          if valid_icanhazpdf_request?
+            @authenticated_pdf_request = true
+            return
+          end
+          head 401 and return unless devise_fallback.present?
+          devise_fallback.each do |devise_auth_model|
+            devise_signed_in_method = "#{devise_auth_model}_signed_in?"
+            if self.respond_to?(devise_signed_in_method) && self.send(devise_signed_in_method)
+              @authenticated_devise_request = true
+              return
+            end
+          end
+          head 401
+        end
         before_filter authenticate_as_icanhazpdf_or_devise, options
       end
     end
 
+    def authenticated_pdf_request?
+      @authenticated_pdf_request || false
+    end
+
+    def authenticated_devise_request?
+      @authenticated_devise_request || false
+    end
+
+    def authenticated_request?
+      authenticated_pdf_request? || authenticated_devise_request?
+    end
+
     private
 
     def valid_icanhazpdf_request?
       return false unless params[:icanhazpdf].present?
-      return params[:icanhazpdf] == Configuration.get_api_key
+      return params[:icanhazpdf] == Rails.configuration.url2pdf_api_key
     end
 
   end

data/lib/url2pdf_rails/pdf_generation.rb

@@ -1,4 +1,3 @@
-require 'url2pdf_rails/configuration'
 require 'url2pdf'
 
 module Url2pdfRails
@@ -15,7 +14,10 @@ module Url2pdfRails
 
     # generate a pdf and return the http response
     def get_pdf_from(url, options = {})
-      Url2pdf::Client.new(Configuration.get_api_key).pdf_from_url(url, options)
+      server_options = {}
+      server_options.merge!(server_url: Rails.configuration.url2pdf_server_url) if Rails.configuration.respond_to?(:url2pdf_server_url)
+      server_options.merge!(timeout: Rails.configuration.url2pdf_timeout) if Rails.configuration.respond_to?(:url2pdf_timeout)
+      Url2pdf::Client.new(Rails.configuration.url2pdf_api_key, server_options).pdf_from_url(url, options)
     end
 
   end

data/lib/url2pdf_rails/version.rb

@@ -1,3 +1,3 @@
 module Url2pdfRails
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/url2pdf_rails.rb

@@ -1,5 +1,4 @@
 require 'url2pdf_rails/version'
-require 'url2pdf_rails/configuration'
 require 'url2pdf_rails/authentication'
 require 'url2pdf_rails/pdf_generation'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url2pdf_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nic Pillinger
@@ -107,7 +107,6 @@ files:
 - lib/tasks/url2pdf_rails_tasks.rake
 - lib/url2pdf_rails.rb
 - lib/url2pdf_rails/authentication.rb
-- lib/url2pdf_rails/configuration.rb
 - lib/url2pdf_rails/pdf_generation.rb
 - lib/url2pdf_rails/version.rb
 homepage: http://factory3.io

data/lib/url2pdf_rails/configuration.rb

@@ -1,27 +0,0 @@
-module Url2pdfRails
-  class Configuration
-
-    def self.method_missing(method_sym, *arguments, &block)
-      # the first argument is a Symbol, so you need to_s it if you want to pattern match
-      if method_sym.to_s =~ /^get_(.*)$/
-        get_config_for("url2pdf_#{$1}".to_sym)
-      else
-        super
-      end
-    end
-
-    def self.respond_to?(method_sym, include_private = false)
-      if method_sym.to_s =~ /^get_(.*)$/
-        true
-      else
-        super
-      end
-    end
-
-    private
-
-    def self.get_config_for(config_parameter)
-      Rails.configuration.respond_to?(config_parameter) ? Rails.configuration.send(config_parameter) : nil
-    end
-  end
-end