file-convert 0.1.1 → 0.1.2

data/lib/file_convert.rb

@@ -9,9 +9,7 @@ module FileConvert
 
   extend FileConvert::Configure
 
-  FileConvert::Configure.init_config!
-
-  ###
+  ##
   # @param [String] file_path
   #   Source file for conversions
   # @param [String]
@@ -25,7 +23,7 @@ module FileConvert
     FileConvert::Conversion.new(client, upload.file, target_mime_type)
   end
 
-  ###
+  ##
   # Initialize a new FileConvert::Client
   def self.client
     fail Exception::MissingConfig unless config_present?

data/lib/file_convert/client.rb

@@ -1,15 +1,18 @@
 module FileConvert
   require 'google/api_client'
+  require 'signet/oauth_2/client'
 
   class Client < Google::APIClient
     APP_OPTIONS = {
       application_name: 'file-convert',
-      application_version: FileConvert::Version::STRING
+      application_version: FileConvert::Version::STRING,
+      # Retry request **once** in case authorization failed
+      retries: 1
     }
 
     attr_reader :drive
 
-    ###
+    ##
     # Inherits from Google::APIClient
     # Basically wraps authentiation for simple configuration
     #
@@ -19,11 +22,13 @@ module FileConvert
       gaccount['auth_url'] ||= 'https://www.googleapis.com/auth/drive'
 
       key = load_key gaccount['pkcs12_file_path'], 'notasecret'
-      asserter = get_asserter gaccount['email'], gaccount['auth_url'], key
+      options = APP_OPTIONS.merge(authorization: get_authorization(
+        gaccount['email'], gaccount['auth_url'], key
+      ))
 
-      super(APP_OPTIONS).tap do |client|
-        client.authorization = asserter.authorize
-        @drive = client.discovered_api('drive', 'v2')
+      super(options).tap do |client|
+        client.authorization.fetch_access_token!
+        @drive = client.discovered_api 'drive', 'v2'
       end
     end
 
@@ -33,8 +38,14 @@ module FileConvert
       Google::APIClient::PKCS12.load_key(path, secret)
     end
 
-    def get_asserter(email, auth_url, key)
-      Google::APIClient::JWTAsserter.new email, auth_url, key
+    def get_authorization(email, auth_url, key)
+      Signet::OAuth2::Client.new(
+        token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
+        audience: 'https://accounts.google.com/o/oauth2/token',
+        scope: auth_url,
+        issuer: email,
+        signing_key: key
+      )
     end
   end
 end

data/lib/file_convert/configure.rb

@@ -1,11 +1,8 @@
 module FileConvert
   module Configure
     def self.config
-      @@config
-    end
-
-    def self.init_config!
       @@config ||= {}
+      @@config
     end
 
     def configure

data/lib/file_convert/conversion.rb

@@ -47,19 +47,19 @@ module FileConvert
       available_links.to_hash
     end
 
-    ###
+    ##
     # Actually downloads the file
     # Raises if request was not successfull
     #
     # @return [Google::APIClient::Result]
     def fetch_file
       @client.execute(uri: export_links[@mime_type]).tap do |result|
-        fail connection_error_exception(result) unless result.status == 200
+        fail connection_error_exception(result) unless result.success?
       end
     end
 
     def data_error_exception
-      Exception::UploadedFileDataError.new @original_upload_result
+      Exception::UploadConnectionError.new @original_upload_result
     end
 
     def missing_mime_type_exception

data/lib/file_convert/exception.rb

@@ -15,30 +15,31 @@ module FileConvert
       end
     end
 
-    class UploadedFileDataError < StandardError
-      def initialize(upload_result)
+    class ConnectionError < StandardError
+      def initialize(result, action)
         super()
-        @upload_result = upload_result
+        @result = result
+        @error_message = result.error_message
+        @action = action
       end
 
       def message
         ''"
-          An error occured while uploading: #{@upload_result.error_message}.
+          An error occured while #{@action}: #{@error_message}.
+          Body of request was: #{@result.body}
         "''
       end
     end
 
-    class DownloadConnectionError < StandardError
+    class UploadConnectionError < ConnectionError
       def initialize(result)
-        super()
-        @result = result
+        super(result, 'uploading')
       end
+    end
 
-      def message
-        ''"
-          An error occured connection to Google Drive.
-          Result of request was: #{@result}
-        "''
+    class DownloadConnectionError < ConnectionError
+      def initialize(result)
+        super(result, 'downloading')
       end
     end
 

data/lib/file_convert/version.rb

@@ -2,7 +2,7 @@ module FileConvert
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-convert
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client