ruby-box 1.8.1 → 1.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmMwNGQyZjc1ODQyYTFmM2ViNWE0MWY3N2Q2NDY1YWRmZGE2ZGNmNQ==
+    MTU5ODI5ODE2MGFlOTRiODk3MzNlOTA1MThhNDY2NTAwZTc1MDdhZg==
   data.tar.gz: !binary |-
-    YTE3MzlhZDhkZmI0MmU2NGQ5MzlmM2UwZGQ2MjI3NGJkYzhjMjY4NQ==
+    YmJjNTdkZmZjNzVmN2U3YjcyMmM0YzVhZTgzZTE5YzUyYjA5YTNiNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTdlOTQyYjg0ZmRiNDQ3ZjljYzM0ZDYzZTlmYzY4NDJlNWJhYTZjMGRkYWFi
-    NzdkMWNhMDIzYWQ3MzE1MWY4YTE0M2FmMWVhMTFkZGZhYzVjZDY4MGMwZTdl
-    ZTE1NWYzYjQ2NGQxMzY5ZjA1YjZhOGJmMDY0ZTViZTI0MmNjMmU=
+    OWQzMjMwMmE4ZTgxMmE3OTU2OWVkNDI0NTllODUwNTJiMjY1YzU5MzRlMzE1
+    YTJlNWJhMmQ2Nzk3NjU5Y2IxZDM3YjU5NGQ2OTllYjJjYWYyYjg4MDhlYjk3
+    NGY3ZGZhYjkzMWViMGE5NDRlNjM1YWVjYTM0YjMwZTcwMWVlOTY=
   data.tar.gz: !binary |-
-    MmI2MzI2ZDUyOGQ0OGY3MzAyZjZkNjBmNjU1Njc5MGNmOWQ4N2Y0YzZhMDI0
-    Y2U0M2M4YWNlMjRhNmY3ZGQyN2JjNzQyZDc3Yzk5MGEzZjJhMjRjYWQxZmMz
-    NzNiNjUwOTk3MjFiZDY2MjRkNjJiNWZiY2I1ZjQ3ZjBhZTYyNDE=
+    NWJmYWNmNzViMWY3YjVlYmVkODdhODE0M2Y0MTUzMTQyYzAxZjU0ZjQ5ZGM4
+    M2U5NzI2OWE3MjdiOGQwODU2NjNiYjQxNmVjN2U5ZmExZjE1NGY4ODIzNjA4
+    NGYzNGQzMzg0ZGZhZWRkYjQ0M2ZmOTNkMzgzZTJlZjYyZjY3ZDM=

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.9.0

data/lib/ruby-box/folder.rb

@@ -23,7 +23,21 @@ module RubyBox
         resp = file.upload_content(data) #write a new file. If there is a conflict, update the conflicted file.
       rescue RubyBox::ItemNameInUse => e
         data.rewind
-        file = files(filename).first
+
+        # The Box API occasionally does not return
+        # context info for an ItemNameInUse exception.
+        # This is a workaround around:
+        begin
+          # were were given context information about this conflict?
+          file = RubyBox::File.new(@session, {
+            'id' => e['context_info']['conflicts'][0]['id']
+          })
+        rescue
+          # we were not given context information about this conflict.
+          # attempt to lookup the file.
+          file = files(filename).pop
+        end
+
         resp = file.update_content( data )
       end
     end

data/lib/ruby-box/session.rb

@@ -9,7 +9,10 @@ module RubyBox
       :token_url => "/api/oauth2/token"
     }
     
-    def initialize(opts={})
+    def initialize(opts={}, backoff=0.1)
+
+      @backoff = backoff # try not to excessively hammer API.
+
       if opts[:client_id]
         @oauth2_client = OAuth2::Client.new(opts[:client_id], opts[:client_secret], OAUTH2_URLS.dup)
         @access_token = OAuth2::AccessToken.new(@oauth2_client, opts[:access_token]) if opts[:access_token]
@@ -74,6 +77,8 @@ module RubyBox
         request(uri, request, raw, retries + 1)
       end
 
+      sleep(@backoff) # try not to excessively hammer API.
+
       handle_errors( response.code.to_i, response.body, raw )
     end
 

data/ruby-box.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.8.1"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Attachments.me"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Attachments.me