cdnconnect-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c769230e6585f7cf8e4a9cb4693c3d2f4cde3c13
-  data.tar.gz: 030324b9ac21ba79b319885bce287c4326abd3bc
+  metadata.gz: cd6b1fa74023415fa1b4a66f45f23563295dad9a
+  data.tar.gz: 1a849ee61d2d9903faefa7b3ba43deb575b0cfae
 SHA512:
-  metadata.gz: c996b2f72c90dd2b0233ba26caac1b8c99ab46505323f8ad8447769a5420417117f8bfd51a5538320601a62d30ae12f4d96938c4431c3f2dd08fb3863434d478
-  data.tar.gz: 5d783487d3aa20eed0831e930fd265b377411812dbf8f79ab5bc33e397d68a88c93db4b3f64a4f07c8ff370f8b532bb2b4b758cc277f185e4e3daed24280e205
+  metadata.gz: fd2d29668600520d2db891d053b6757ff855b305b18f6f37b05eb52b72b21345fe9e9742986d907d6da66efe3a0450467ea6bf2967640a4a84df236f3b42eab4
+  data.tar.gz: 51305c08c62822d81f60e6f4ba3c21aa897261d1e7f5bfce7c5476c055a90f3d1b8e531828a2a5a77e526b8fc1adcfbc3e1ae5b06eec882d417afdd81137c161

data/README.md

@@ -1,4 +1,4 @@
-# CDN Connect API Ruby Client, v0.3.1
+# CDN Connect API Ruby Client, v0.3.2
 
 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

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 require 'faraday'
-require 'faraday/utils'
 require 'signet/oauth_2/client'
 require 'cdnconnect_api/response'
 require 'logger'
@@ -26,7 +25,7 @@ module CDNConnect
   class APIClient
   
     @@application_name = 'cdnconnect-api-ruby'
-    @@application_version = '0.3.1'
+    @@application_version = '0.3.2'
     @@user_agent = @@application_name + ' v' + @@application_version
     @@api_host = 'https://api.cdnconnect.com'
     @@api_version = 'v1'
@@ -206,7 +205,8 @@ module CDNConnect
                     return upload_url_response
                 end
                 upload_url = upload_url_response.get_result('upload_url')
-                @logger.debug("Received new upload url")
+                upload_id = upload_url_response.get_result('upload_id')
+                @logger.debug("Received new upload url, #{upload_id}")
             else
                 @logger.debug("Use prefetched upload url")
             end
@@ -262,8 +262,13 @@ module CDNConnect
 
                 # 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,
-                                          upload_response.get_result('upload_url'))
+                new_upload_url = upload_response.get_result('upload_url')
+                new_upload_id = upload_response.get_result('upload_url_upload_id')
+                if new_upload_url != nil
+                    @logger.debug("Received upload url in upload response, #{new_upload_id}")
+                    set_prefetched_upload_url(destination_path,
+                                              new_upload_url)
+                end
             end
       
         end 
@@ -597,7 +602,7 @@ module CDNConnect
         if destination_path == "/"
             destination_path = ""
         end
-        upload_id = Random.new.rand(1_000_000..9_999_999)
+        upload_id = ((9_999_999 - 1_000_000) * rand + 1_000_000).to_i
         api_path = "#{destination_path}/upload-#{upload_id}.json"
 
         @logger.debug("get_upload_url: #{api_path}")
@@ -890,10 +895,14 @@ module CDNConnect
     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])
+        begin
+            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])
+        rescue
+            bytes
+        end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdnconnect-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Adam Bradley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday