file-convert 0.1.0 → 0.1.1

data/README.md

@@ -1,4 +1,4 @@
-# file-convert [![Gem Version](https://badge.fury.io/rb/file-convert.svg)](http://badge.fury.io/rb/file-convert) [![Build Status](https://travis-ci.org/tolingo/file-convert.svg?branch=feature%2Ffix-specs-and-refactor)](https://travis-ci.org/tolingo/file-convert) 
+# file-convert [![Gem Version](https://badge.fury.io/rb/file-convert.svg)](http://badge.fury.io/rb/file-convert) [![Build Status](https://travis-ci.org/tolingo/file-convert.svg?branch=feature%2Ffix-specs-and-refactor)](https://travis-ci.org/tolingo/file-convert) [![tolingo](http://img.shields.io/badge/powered--by-tolingo-green.svg)](http://tolingo.com)
 [![Code Climate](https://codeclimate.com/repos/53f4984b6956807963019c1a/badges/7aef33ebfd86eb320a98/gpa.svg)](https://codeclimate.com/repos/53f4984b6956807963019c1a/feed) [![Test Coverage](https://codeclimate.com/repos/53f4984b6956807963019c1a/badges/7aef33ebfd86eb320a98/coverage.svg)](https://codeclimate.com/repos/53f4984b6956807963019c1a/feed) [![Dependency Status](https://gemnasium.com/tolingo/file-convert.svg)](https://gemnasium.com/tolingo/file-convert)
 
 > Use google-api-ruby-client and Google Drive to convert files from one mime-type to another.
@@ -41,8 +41,7 @@ conversion.save('path_to_new_file.pdf')
 
 * `$ bundle exec rake` for `rspec` and `rubocop`.
 * `$ bundle exec rake build` to also run the `integration` tests located at `spec/integration/**/*_integration.rb`.
-Note that you need to have a valid `config/file_convert.yml` present for these tests to work,
-since we want to actually test the integration with the Google API here. (Do not worry, TravisCI will run these test as well.)
+Note that you need to configure valid Google API credentials (i.e. set `ENV['email']` and `ENV['pkcspath']`) for these tests to work, since we want to actually test the integration with the Google API here. (Do not worry, TravisCI will run these tests as well.)
 
 ## Contributing
 

data/lib/file_convert/conversion.rb

@@ -15,12 +15,14 @@ module FileConvert
     def initialize(client, remote_file, mime_type)
       @client = client
       @remote_file = remote_file
-      @original_file_data = remote_file.data
+      @original_upload_result = remote_file.original_file
+      @remote_file_data = remote_file.data
       @mime_type = mime_type
 
-      # Raise if requested mime-type is not available
+      # Fail if upload errored
+      fail data_error_exception if @original_upload_result.error?
+      # Fail if requested mime-type is not available
       fail missing_mime_type_exception unless export_links.key?(mime_type)
-      fail data_error_exception if @original_file_data.to_hash.key?('error')
 
       @file = fetch_file
       @body = @file.body
@@ -41,7 +43,8 @@ module FileConvert
     ##
     # @return [Hash] available mime-type download URIs
     def export_links
-      @original_file_data['exportLinks'].to_hash
+      available_links = @remote_file_data['exportLinks'] || {}
+      available_links.to_hash
     end
 
     ###
@@ -56,7 +59,7 @@ module FileConvert
     end
 
     def data_error_exception
-      Exception::UploadedFileDataError.new @original_file_data
+      Exception::UploadedFileDataError.new @original_upload_result
     end
 
     def missing_mime_type_exception

data/lib/file_convert/exception.rb

@@ -16,15 +16,14 @@ module FileConvert
     end
 
     class UploadedFileDataError < StandardError
-      def initialize(file_data)
+      def initialize(upload_result)
         super()
-        @file_data = file_data
+        @upload_result = upload_result
       end
 
       def message
         ''"
-          An error occured while uploading the file.
-          Data was: #{@file_data}
+          An error occured while uploading: #{@upload_result.error_message}.
         "''
       end
     end

data/lib/file_convert/version.rb

@@ -2,7 +2,7 @@ module FileConvert
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement