docmago_client 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df904a82dddce585c9927218db5a45226b97629
-  data.tar.gz: 7c008e9db440b2f55cfe81f38c7d0144bc62ad50
+  metadata.gz: 427cde4f1b93bca32ad2f0a36ba35a07d480eabc
+  data.tar.gz: aba13394543c749323a9ac856a65d017db54c33e
 SHA512:
-  metadata.gz: 87e960d40a0bc8f861fa7e1cdd97efb184d6608d3c197204132436b432fa18f4f43c416d039ecfadcffa3e8256ea9c215728ea1ae06a4969bd202f0003857d9d
-  data.tar.gz: 51534f2bdaf7ad87e4d83053011ba6ba20c77226d8de9b680a207cea481343ff1509d7c46f58fa91ab833db474fe1f558cc50e076dd99da8501e28bb879c5a04
+  metadata.gz: d176c4ee995dfb48aa7f19b4c6902666a110ebce5ebd45a8f55766aa96d71acc9a109c470fd3c362df5bde26be6acf17b8bec97aa6a0d4d31e37a38819565122
+  data.tar.gz: 86a8a5c31c85516d14da1a74bdadb05e2853a224fab66fd58e9dc9f8f64b43a84ea95fec918f85fd3b8ea86dba3de8eea8aee227c75561b3e3ef2b0b6dd4ea33

data/lib/docmago_client/railtie.rb

@@ -31,14 +31,13 @@ module DocmagoClient
         options = default_options.merge(options)
         options[:content] ||= render_to_string(options)
 
-        docmago_response = DocmagoClient.create(options)
-        logger.info "Docmago response - status: #{docmago_response.code}; size: #{docmago_response.body.size}"
+        res = DocmagoClient.create(options)
+        logger.info "Docmago response - status: #{res.code}; size: #{res.body.size}"
 
-        if docmago_response.code == 200
-          response.headers['Content-Length'] = docmago_response.body.size.to_s
-          send_data docmago_response, filename: "#{options[:name]}.pdf", type: 'application/pdf', disposition: 'attachment'
+        if res.code == 200
+          send_data res.body, filename: "#{options[:name]}.pdf", type: 'application/pdf', disposition: 'attachment'
         else
-          render inline: docmago_response.body, status: docmago_response.code
+          render inline: res.body, status: res.code
         end
       end
     end

data/lib/docmago_client/version.rb

@@ -1,3 +1,3 @@
 module DocmagoClient
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/docmago_client.rb

@@ -1,4 +1,4 @@
-require 'httmultiparty'
+require 'typhoeus'
 require 'tempfile'
 
 require 'docmago_client/version'
@@ -15,31 +15,21 @@ if defined?(Rails)
 end
 
 module DocmagoClient
-  include HTTMultiParty
-
-  base_uri ENV['DOCMAGO_URL'] || 'https://docmago.com/api'
-
   class << self
+    attr_accessor :base_uri, :api_key
     attr_writer :logger
 
     def logger
       @logger ||= Logger.new($stdout)
     end
-  end
 
-  def self.base_uri(uri = nil)
-    default_options[:base_uri] = uri ? uri : default_options[:base_uri] || ENV['DOCMAGO_URL']
-    default_options[:base_uri]
-  end
-
-  def self.api_key(key = nil)
-    default_options[:api_key] = key ? key : default_options[:api_key] || ENV['DOCMAGO_API_KEY']
-    default_options[:api_key] || raise(DocmagoClient::Error::NoApiKeyProvidedError.new('No API key provided'))
-  end
+    def base_uri
+      @base_uri || ENV['DOCMAGO_URL'] || 'https://docmago.com/api'
+    end
 
-  def self.create!(options = {})
-    raise ArgumentError, 'please pass in an options hash' unless options.is_a? Hash
-    create options.merge(raise_exception_on_failure: true)
+    def api_key
+      @api_key || ENV['DOCMAGO_API_KEY']
+    end
   end
 
   # when given a block, hands the block a TempFile of the resulting document
@@ -58,8 +48,6 @@ module DocmagoClient
     }
 
     options = default_options.merge(options)
-    raise_exception_on_failure = options[:raise_exception_on_failure]
-    options.delete :raise_exception_on_failure
 
     if options[:zip_resources]
       tmp_dir = Dir.mktmpdir
@@ -68,16 +56,18 @@ module DocmagoClient
         options[:content] = File.new(resource_archiver.create_zip("#{tmp_dir}/document.zip"))
         options.delete :assets
 
-        response = post('/documents', body: { document: options }, basic_auth: { username: api_key })
+        response = Typhoeus.post "#{base_uri}/documents", body: {
+          auth_token: api_key,
+          document: { content: options[:content] }
+        }
       ensure
         FileUtils.remove_entry_secure tmp_dir
       end
     else
-      response = post('/documents', body: { document: options }, basic_auth: { username: api_key })
-    end
-
-    if raise_exception_on_failure && !response.success?
-      raise DocmagoClient::Exception::DocumentCreationFailure.new response.body, response.code
+      response = Typhoeus.post "#{base_uri}/documents", body: {
+        auth_token: api_key,
+        document: options
+      }
     end
 
     if block_given?
@@ -94,28 +84,4 @@ module DocmagoClient
       response
     end
   end
-
-  def self.list_docs!(options = {})
-    raise ArgumentError, 'please pass in an options hash' unless options.is_a? Hash
-    list_docs options.merge(raise_exception_on_failure: true)
-  end
-
-  def self.list_docs(options = {})
-    raise ArgumentError, 'please pass in an options hash' unless options.is_a? Hash
-    default_options = {
-      page: 1,
-      per_page: 100,
-      raise_exception_on_failure: false
-    }
-    options = default_options.merge(options)
-    raise_exception_on_failure = options[:raise_exception_on_failure]
-    options.delete :raise_exception_on_failure
-
-    response = get('/documents', query: options, basic_auth: { username: api_key })
-    if raise_exception_on_failure && !response.success?
-      raise DocmagoClient::Exception::DocumentListingFailure.new response.body, response.code
-    end
-
-    response
-  end
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: docmago_client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jan Habermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement