cdnconnect-api 0.2.5 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9fe3b2da7a7be09a4ea5f6102eb34ee9334a429b
+  data.tar.gz: 0bbaee45ba2c37405aadf16393a26ebcf7e24794
+SHA512:
+  metadata.gz: a2f4116913c9ba0510e53b9ef636cf71c14d78e37a17560b25f99a4fb0325cec89c74846987cf15b837676958dd8671173561db2442ec87dbe456b62c5643678
+  data.tar.gz: d6f5598b6154100cef57e72558084a09a7657738edaaced8d7cc5446854eece8a4678958d1f71aaeec049ad11a0c703d2e98cff68349d6f6e3581d92b22f08f3

data/LICENSE

@@ -1,202 +1,20 @@
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# CDN Connect API Ruby Client, v0.2.5
+# CDN Connect API Ruby Client, v0.3.0
 
 CDN Connect makes it easier to manage production assets for teams of developers and designers, all while serving files from a fast content delivery network. Features include image optimization, resizing, cropping, filters, changing output formats, convert to WebP image format, etc. The CDN Connect API Ruby Client makes it easier to upload files and interact with the API with only a few lines of code.
 

data/lib/cdnconnect_api.rb

@@ -16,6 +16,7 @@ require 'faraday'
 require 'faraday/utils'
 require 'signet/oauth_2/client'
 require 'cdnconnect_api/response'
+require 'logger'
 
 
 module CDNConnect
@@ -25,7 +26,7 @@ module CDNConnect
   class APIClient
   
     @@application_name = 'cdnconnect-api-ruby'
-    @@application_version = '0.2.5'
+    @@application_version = '0.3.0'
     @@user_agent = @@application_name + ' v' + @@application_version
     @@api_host = 'https://api.cdnconnect.com'
     @@api_version = 'v1'
@@ -68,40 +69,48 @@ module CDNConnect
     #   - <code>:app_host</code> -
     #     The CDN Connect App host. For example, demo.cdnconnect.com is a CDN Connect
     #     app host. The app host should not include https://, http:// or a URL path.
-    #   - <code>:debug</code> -
-    #     Print out any debugging information. Default is false.
+    #   - <code>:log_device</code> -
+    #     Ruby Logger logdev argument in Logger.new(logdev). Defaults to STDOUT.
     def initialize(options={})
-      # Normalize key to String to allow indifferent access.
-      options = options.inject({}) { |accu, (k, v)| accu[k.to_s] = v; accu }
-      
-      # Initialize all of the options
-      @client_id = options["client_id"]
-      @client_secret = options["client_secret"]
-      @scope = options["scope"]
-      @state = options["state"]
-      @code = options["code"]
-      @redirect_uri = options["redirect_uri"]
-      options["access_token"] = options["access_token"] || options["api_key"] # both work
-      @access_token = options["access_token"]
-      @app_host = options["app_host"]
-      @debug = options["debug"] || false
-      @prefetched_upload_urls = {}
-      @upload_queue = {}
-      @failed_uploads = []
-      
-      if options["api_key"] != nil and options["app_host"] == nil
-        raise ArgumentError, 'app_host option required when using api_key option'
-      end
+        # Normalize key to String to allow indifferent access.
+        options = options.inject({}) { |accu, (k, v)| accu[k.to_s] = v; accu }
+
+        # Initialize all of the options
+        @client_id = options["client_id"]
+        @client_secret = options["client_secret"]
+        @scope = options["scope"]
+        @state = options["state"]
+        @code = options["code"]
+        @redirect_uri = options["redirect_uri"]
+        options["access_token"] = options["access_token"] || options["api_key"] # both work
+        @access_token = options["access_token"]
+        @app_host = options["app_host"]
+        @@api_host = options["api_host"] || @@api_host
+        @prefetched_upload_urls = {}
+        @upload_queue = {}
+        @failed_uploads = []
+
+        log_device = options["log_device"] || STDOUT
+        @logger = Logger.new(log_device, 10, 1024000)
+        @logger.sev_threshold = options["log_sev_threshold"] || Logger::WARN
+
+        if options["api_key"] != nil and options["app_host"] == nil
+            err_msg = 'app_host option required when using api_key option'
+            @logger.error(err_msg)
+            raise ArgumentError, err_msg
+        end
 
-      # Create the OAuth2 client which will be used to authorize the requests
-      @client = Signet::OAuth2::Client.new(:client_id => client_id,
-                                           :client_secret => @client_secret,
-                                           :scope => @scope,
-                                           :state => @state,
-                                           :code => @code,
-                                           :redirect_uri => @redirect_uri,
-                                           :access_token => @access_token)
-      return self
+        @logger.debug("#{@@user_agent}, #{@@api_host}")
+
+        # Create the OAuth2 client which will be used to authorize the requests
+        @client = Signet::OAuth2::Client.new(:client_id => client_id,
+                                             :client_secret => @client_secret,
+                                             :scope => @scope,
+                                             :state => @state,
+                                             :code => @code,
+                                             :redirect_uri => @redirect_uri,
+                                             :access_token => @access_token)
+        return self
     end
 
 
@@ -183,40 +192,38 @@ module CDNConnect
             
             # Get the destination_path in the list of upload queues
             destination_path = @upload_queue.keys[0]
-            if @debug
-                puts "Upload destination_path: #{destination_path}"
-            end
+            @logger.debug("destination_path: #{destination_path}")
       
             # Check if we have a prefetched upload url before requesting a new one
             upload_url = get_prefetched_upload_url(destination_path)
             if upload_url == nil
-              # We do not already have an upload url created. The first upload request
-              # will need to make a request for an upload url. After the first upload
-              # each upload response will also include a new upload url which can be used 
-              # for the next upload when uploading to the same folder.
-              upload_url_response = self.get_upload_url(destination_path)
-              if upload_url_response.is_error
-                return upload_url_response
-              end
-              upload_url = upload_url_response.get_result('upload_url')
-              if @debug
-                puts "Received upload url"
-              end
+                # We do not already have an upload url created. The first upload request
+                # will need to make a request for an upload url. After the first upload
+                # each upload response will also include a new upload url which can be used 
+                # for the next upload when uploading to the same folder.
+                upload_url_response = self.get_upload_url(destination_path)
+                if upload_url_response.is_error
+                    return upload_url_response
+                end
+                upload_url = upload_url_response.get_result('upload_url')
+                @logger.debug("Received new upload url")
+            else
+                @logger.debug("Use prefetched upload url")
             end
 
             # Build the data that gets sent in the POST request
-            post_data = build_post_data(destination_path, 
-                                        destination_file_name = options[:destination_file_name],
-                                        max_files_per_request = 25, 
-                                        max_request_size = 25165824, 
-                                        queue_processing = options.fetch(:queue_processing, false),
-                                        webhook_url = options[:webhook_url],
-                                        webhook_format = options[:webhook_format])
+            post_data = build_post_data(:destination_path => destination_path,
+                                        :destination_file_name => options[:destination_file_name],
+                                        :queue_processing => options.fetch(:queue_processing, true),
+                                        :webhook_url => options[:webhook_url],
+                                        :webhook_format => options[:webhook_format])
 
             # Build the request to send to the API
             # Uses the Faraday: https://github.com/lostisland/faraday
             conn = Faraday.new() do |req|
-              req.headers['User-Agent'] = @@user_agent
+              req.headers = {
+                'User-Agent' => @@user_agent
+              }
               req.request :multipart
               req.adapter :net_http
             end
@@ -226,10 +233,8 @@ module CDNConnect
 
             # w00t! Convert the http response into APIResponse and see what's up
             upload_response = APIResponse.new(http_response)
-            if @debug
-              for msg in upload_response.msgs
-                puts "Upload " + msg["status"] + ": " + msg["text"]
-              end
+            for msg in upload_response.msgs
+                @logger.info("Upload " + msg["status"] + ": " + msg["text"])
             end
 
             # merge the two together so we build one awesome response
@@ -239,13 +244,19 @@ module CDNConnect
             # Read the response and see what we got
             if upload_response.is_server_error
                 # There was a server error, empty the active upload queue
-                failed_upload_attempt(destination_path)            
-                
+                failed_upload_attempt(destination_path)
+                @logger.error(upload_response.body)
+
+                # put the upload url back in the list
+                # of prefetched urls so it can be reused
+                set_prefetched_upload_url(destination_path, upload_url)
             else
                 # successful upload, clear out the active upload queue
                 # and remove uploaded files from the upload queue
                 successful_upload_attempt(destination_path)
                 
+                @logger.info("Successful upload")
+
                 # an upload response also contains a new upload url. 
                 # Save it for the next upload to the same destination.
                 set_prefetched_upload_url(destination_path,
@@ -261,10 +272,14 @@ module CDNConnect
     ##
     # Build the POST data that gets sent in the request
     # @!visibility private
-    def build_post_data(destination_path, destination_file_name = nil, max_files_per_request = 25, max_request_size = 25165824, queue_processing = false, webhook_url = nil, webhook_format = nil)
+    def build_post_data(options)
         # @active_uploads will hold all of the upload keys  
         # which are actively being uploaded.
         @active_uploads = []
+
+        # set defaults
+        max_files_per_request = options[:max_files_per_request] || 25
+        max_request_size = options[:max_request_size] || 25165824
         
         # post_data will contain all of the data that gets sent
         post_data = {}
@@ -274,18 +289,20 @@ module CDNConnect
         
         # the set what the file name will be. By default it will be named the same as
         # the uploaded file. This will only work for single file uploads.
-        post_data[:destination_file_name] = destination_file_name
+        post_data[:destination_file_name] = options[:destination_file_name]
 
         # Processing of the data can be queued. However, an `queue_processing` response
         # will not contain any information about the data uploaded.
-        post_data[:queue_processing] = queue_processing
+        if options[:queue_processing] == true
+            post_data[:queue_processing] = 'true'
+        end
 
         # send with the post data the webhook_url if there is one
-        if webhook_url != nil
-            post_data[:webhook_url] = webhook_url
+        if options[:webhook_url] != nil
+            post_data[:webhook_url] = options[:webhook_url]
             # send in the webhook_format, but defaults to json if nothing sent
-            if webhook_format != nil
-                post_data[:webhook_format] = webhook_format
+            if options[:webhook_format] != nil
+                post_data[:webhook_format] = options[:webhook_format]
             end
         end
         
@@ -302,19 +319,21 @@ module CDNConnect
         total_files = 0
         
         # Add each source file in the queue to the request as multipart-post data
-        @upload_queue[destination_path].each_pair do |source_file_path, value|
+        @upload_queue[ options[:destination_path] ].each_pair do |source_file_path, value|
         
             # Figure out how large this file is
             file_size = File.stat(source_file_path).size
 
+            @logger.debug(" - #{source_file_path} (#{human_file_size(file_size)})")
+
             # Add this file's size to the overall request size total
             total_request_size += file_size
         
             # Increment the upload attempts for this file
-            @upload_queue[destination_path][source_file_path]['attempts'] += 1
+            @upload_queue[ options[:destination_path] ][source_file_path]['attempts'] += 1
             
             # Set that this file is actively being uploaded
-            @upload_queue[destination_path][source_file_path]['active'] = true
+            @upload_queue[ options[:destination_path] ][source_file_path]['active'] = true
         
             # Add the source file it to the request's post data
             post_data[:file].push( Faraday::UploadIO.new(source_file_path, mime_type) )
@@ -324,17 +343,17 @@ module CDNConnect
             if total_request_size > max_request_size
                 # If the total request size is larger than the max
                 # then do not add any more files
+                @logger.debug(" - Reached max request size per request")
                 break
             elsif total_files >= max_files_per_request
                 # only add XX files per post request
                 # any left over will be picked up in the next upload
+                @logger.debug(" - Reached max files per request")
                 break
             end
         end
         
-        if @debug
-            puts "Upload request, File Count: #{total_files}, File Size: #{total_request_size} bytes"
-        end
+        @logger.info(" - Upload, File Count: #{total_files}, File Size: #{human_file_size(total_request_size)}")
 
         return post_data
     end
@@ -362,9 +381,8 @@ module CDNConnect
     # If it was attempted too many times then remove it from the queue.
     # @!visibility private
     def failed_upload_attempt(destination_path)
-        if @debug
-            puts "failed_upload_attempt: #{destination_path}"
-        end
+        @logger.error("failed_upload_attempt: #{destination_path}")
+
         # Loop through each active upload for the destination folder url
         if @upload_queue.has_key?(destination_path)
             # Loop through each file for this destination folder
@@ -550,10 +568,10 @@ module CDNConnect
     # already have an upload url ready to go for the folder we're uploading to.
     # @!visibility private
     def get_prefetched_upload_url(destination_path)
-      # Build a unique key for the folder which was used to save an new upload url
-      rtn_url = @prefetched_upload_urls[destination_path]
-      @prefetched_upload_urls[destination_path] = nil
-      return rtn_url
+        # Build a unique key for the folder which was used to save an new upload url
+        rtn_url = @prefetched_upload_urls[destination_path]
+        @prefetched_upload_urls[destination_path] = nil
+        return rtn_url
     end
 
 
@@ -562,8 +580,8 @@ module CDNConnect
     # for the next upload to this folder.
     # @!visibility private
     def set_prefetched_upload_url(destination_path, upload_url)
-      # Build a unique key for the folder to save an new upload url value to
-      @prefetched_upload_urls[destination_path] = upload_url
+        # Build a unique key for the folder to save an new upload url value to
+        @prefetched_upload_urls[destination_path] = upload_url
     end
 
 
@@ -573,16 +591,26 @@ module CDNConnect
     # used to eliminate the need to do seperate requests for an upload url.
     # @!visibility private
     def get_upload_url(destination_path)
-      api_path = destination_path + '/upload.json'
-
-      i = 1
-      begin
-        response = get(api_path)
-        if not response.is_server_error or i > 2
-          return response
+        if destination_path == "/"
+            destination_path = ""
         end
-        i += 1
-      end while i <= 3
+        upload_id = Random.new.rand(1_000_000..9_999_999)
+        api_path = "#{destination_path}/upload-#{upload_id}.json"
+
+        @logger.debug("get_upload_url: #{api_path}")
+
+        i = 1
+        begin
+            response = get(api_path)
+            if not response.is_server_error
+                return response
+            elsif i > 2
+                @logger.error("Too many get_upload_url attempts")
+                return response
+            end
+            @logger.error(response.body)
+            i += 1
+        end while i <= 3
     end
 
     
@@ -660,7 +688,7 @@ module CDNConnect
     # @param data [Hash] Data which will be placed in the GET request's querystring. (Optional)
     # @return [APIResponse] A response object with helper methods to read the response.
     def get(api_path, data={})
-      fetch(:api_path => api_path, :method => 'GET', :data => data)
+        fetch(:api_path => api_path, :method => 'GET', :data => data)
     end
 
 
@@ -672,7 +700,7 @@ module CDNConnect
     # @param data [Hash] Data which will be sent in the POST request.
     # @return [APIResponse] A response object with helper methods to read the response.
     def post(api_path, data)
-      fetch(:api_path => api_path, :method => 'POST', :data => data)
+        fetch(:api_path => api_path, :method => 'POST', :data => data)
     end
 
 
@@ -684,7 +712,7 @@ module CDNConnect
     # @param data [Hash] Data which will be sent in the PUT request.
     # @return [APIResponse] A response object with helper methods to read the response.
     def put(api_path, data)
-      fetch(:api_path => api_path, :method => 'PUT', :data => data)
+        fetch(:api_path => api_path, :method => 'PUT', :data => data)
     end
 
 
@@ -695,7 +723,7 @@ module CDNConnect
     # @param api_path [String] The API path to send the DELETE request to.
     # @return [APIResponse] A response object with helper methods to read the response.
     def delete(api_path)
-      fetch(:api_path => api_path, :method => 'DELETE')
+        fetch(:api_path => api_path, :method => 'DELETE')
     end
     
 
@@ -704,26 +732,26 @@ module CDNConnect
     # and make it all pretty before firing off the request to the API.
     # @!visibility private
     def prepare(options={})
-      if options[:api_path] == nil
-        raise ArgumentError, 'missing api path'
-      end
+        if options[:api_path] == nil
+            raise ArgumentError, 'missing api path'
+        end
 
-      options[:headers] = { 'User-Agent' => @@user_agent }
-      options[:uri] = "#{@@api_host}/#{@@api_version}/#{@app_host}#{options[:api_path]}"
+        options[:headers] = { 'User-Agent' => @@user_agent }
+        options[:uri] = "#{@@api_host}/#{@@api_version}/#{@app_host}#{options[:api_path]}"
 
-      options[:method] = options[:method] || 'GET'
+        options[:method] = options[:method] || 'GET'
 
-      if options[:method] == 'GET' and options[:data] != nil and options[:data].length > 0
-        require "addressable/uri"
-        uri = Addressable::URI.new
-        uri.query_values = options[:data]
-        options[:uri] = "#{options[:uri]}?#{uri.query}"
-        options[:data] = nil
-      end
+        if options[:method] == 'GET' and options[:data] != nil and options[:data].length > 0
+            require "addressable/uri"
+            uri = Addressable::URI.new
+            uri.query_values = options[:data]
+            options[:uri] = "#{options[:uri]}?#{uri.query}"
+            options[:data] = nil
+        end
 
-      options[:url] = options[:uri]
-      
-      options
+        options[:url] = options[:uri]
+
+        options
     end
 
 
@@ -731,37 +759,30 @@ module CDNConnect
     # Guts of an authorized request. Do not call this directly.
     # @!visibility private
     def fetch(options={})
-      # Prepare the data to be shipped in the request
-      options = prepare(options)
+        # Prepare the data to be shipped in the request
+        options = prepare(options)
 
-      if @debug
-        puts options[:method] + ': ' + options[:uri]
-      end
+        @logger.debug(options[:method] + ': ' + options[:uri])
 
-      begin
-        # Send the request and get the response
-        options[:body] = options[:data]
-        http_response = @client.fetch_protected_resource(options)
+        begin
+            # Send the request and get the response
+            options[:body] = options[:data]
+            http_response = @client.fetch_protected_resource(options)
 
-        # Return the API response
-        api_response = APIResponse.new(http_response)
+            # Return the API response
+            api_response = APIResponse.new(http_response)
 
-        if @debug
             for msg in api_response.msgs
-                puts msg["status"] + ": " + msg["text"]
+                @logger.debug(msg["status"] + ": " + msg["text"])
             end
-        end
 
-        return api_response
-      rescue Signet::AuthorizationError => authorization_error
-        # whoopsy doodle. Probably an incorrect API Key or App Host. 
-        # Validate your authorization info.
-        if @debug
-          puts authorization_error
+            return api_response
+        rescue Signet::AuthorizationError => authorization_error
+            # whoopsy doodle. Probably an incorrect API Key or App Host. 
+            # Validate your authorization info.
+            @logger.error(authorization_error)
+            return APIResponse.new(authorization_error.response)
         end
-        return APIResponse.new(authorization_error.response)
-      end
-
     end
 
 
@@ -772,7 +793,7 @@ module CDNConnect
     #
     # @return [String]
     def client_id
-      @client_id
+        @client_id
     end
 
 
@@ -784,7 +805,7 @@ module CDNConnect
     #
     # @return [String]
     def client_secret
-      @client_secret
+        @client_secret
     end
 
 
@@ -795,7 +816,7 @@ module CDNConnect
     #
     # @return [String]
     def scope
-      @scope
+        @scope
     end
 
 
@@ -806,7 +827,7 @@ module CDNConnect
     #
     # @return [String]
     def state
-      @state
+        @state
     end
 
 
@@ -814,7 +835,7 @@ module CDNConnect
     # OAuth2 value. The authorization code received from the authorization server.
     # @return [String]
     def code
-      @code
+        @code
     end
 
 
@@ -822,7 +843,7 @@ module CDNConnect
     # OAuth2 value. The redirection URI used in the initial request.
     # @return [String]
     def redirect_uri
-      @redirect_uri
+        @redirect_uri
     end
 
 
@@ -832,7 +853,7 @@ module CDNConnect
     #
     # @return [String]
     def access_token
-      @access_token
+        @access_token
     end
 
 
@@ -842,7 +863,7 @@ module CDNConnect
     #
     # @return [String]
     def app_host
-      @app_host
+        @app_host
     end
 
 
@@ -852,7 +873,7 @@ module CDNConnect
     # @return [Hash]
     # @!visibility private
     def upload_queue
-      @upload_queue
+        @upload_queue
     end
 
     ##
@@ -860,7 +881,14 @@ module CDNConnect
     #
     # @return [Array]
     def failed_uploads
-      @failed_uploads
+        @failed_uploads
+    end
+
+    def human_file_size(bytes)
+        units = %w{B KB MB GB TB}
+        e = (Math.log(bytes)/Math.log(1024)).floor
+        s = "%.2f" % (bytes.to_f / 1024**e)
+        s.sub(/\.?0*$/, units[e])
     end
 
   end

data/lib/cdnconnect_api/response.rb

@@ -28,9 +28,11 @@ module CDNConnect
       if http_response != nil
         @status = http_response.status
         @data = nil
+        @body = nil
       else
         @status = 0
         @data = {"results" => {}, "msgs" => []}
+        @body = nil
       end
       return self
     end
@@ -69,9 +71,9 @@ module CDNConnect
     # @return [String]
     def body
       if @http_response != nil 
-        return @http_response.body
+        @body = @http_response.body
       end
-      nil
+      @body
     end
 
 
@@ -170,7 +172,15 @@ module CDNConnect
         @data = updating_response.data
         return self
       end
-            
+      
+      if updating_response.body != nil
+        if @body == nil
+          @body = updating_response.body
+        else
+          @body += updating_response.body
+        end
+      end
+
       @data['msgs'] += updating_response.msgs
       
       if updating_response.files != nil
@@ -195,7 +205,7 @@ module CDNConnect
     ##
     # @return [bool]
     def is_success
-      status >= 200 and status < 300 and not has_errors
+      @body != nil and status >= 200 and status < 300 and not has_errors
     end
 
     ##

metadata

@@ -1,114 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cdnconnect-api
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Adam Bradley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: signet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
-        version: 0.4.5
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: signet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: CDN Connect makes it easier to manage production assets for teams of developers and designers, all while serving files from a fast content delivery network. Features include image optimization, resizing, cropping, filters, etc. The CDN Connect API Ruby Client makes it easier to upload files and interact with the API. Most interactions with CDN Connect APIs require users to authorize applications via OAuth 2.0. This library simplifies the communication with CDN Connect even further allowing you to easily upload files and get information with only a few lines of code.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: CDN Connect makes it easier to manage production assets for teams of
+  developers and designers, all while serving files from a fast content delivery network.
+  Features include image optimization, resizing, cropping, filters, etc. The CDN Connect
+  API Ruby Client makes it easier to upload files and interact with the API. Most
+  interactions with CDN Connect APIs require users to authorize applications via OAuth
+  2.0. This library simplifies the communication with CDN Connect even further allowing
+  you to easily upload files and get information with only a few lines of code.
 email: developer@cdnconnect.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/cdnconnect_api.rb
 - lib/cdnconnect_api/response.rb
 - LICENSE
 - README.md
 homepage: http://www.cdnconnect.com/
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Package Summary
 test_files: []
-
 has_rdoc: