ruby-box 1.8.0 → 1.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ5NTgyY2ZiNTNlNzZhZTM4NjNiYWJhYTViZDUwYzVhMmY1MjI3Ng==
+    MmMwNGQyZjc1ODQyYTFmM2ViNWE0MWY3N2Q2NDY1YWRmZGE2ZGNmNQ==
   data.tar.gz: !binary |-
-    ZDIzM2Y4YTlkNjU4NzcwNjVmYTVlZWY1MTMxYjExMzI0OWIzZDhmNw==
+    YTE3MzlhZDhkZmI0MmU2NGQ5MzlmM2UwZGQ2MjI3NGJkYzhjMjY4NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGZhNmI3NTVmN2FiZDUwYjhhZTlkM2UyNjIwZDYwMDExMTRjMjRiMzVmYWM5
-    MzI5MzZhYzYwZTMyMWEyOTBlMjkyZWYwMTliZDE4NzYyNjQwMjA2NTA4MWEz
-    ZDc5YjMxOGQwMTllYzM3ZDQ4ZWEwMWQ3ZTQ5YzU5YTEyMzYwZTE=
+    MTdlOTQyYjg0ZmRiNDQ3ZjljYzM0ZDYzZTlmYzY4NDJlNWJhYTZjMGRkYWFi
+    NzdkMWNhMDIzYWQ3MzE1MWY4YTE0M2FmMWVhMTFkZGZhYzVjZDY4MGMwZTdl
+    ZTE1NWYzYjQ2NGQxMzY5ZjA1YjZhOGJmMDY0ZTViZTI0MmNjMmU=
   data.tar.gz: !binary |-
-    M2I0OGIwZDQ5YjRmM2JkYjJiY2Y3YmEzZWRlYmIyMTJjMzJhZGM1YWQxZWFj
-    M2Q4NDBkMDdkNjYxYTIzZGNiYjY2MzkxOWJjMmY1YWY2MjIxNTdmOTNhODY4
-    MTgyYzMzM2Y2YzVmYWY4MDllNzEwZGJjMWNjZjI1OWI2Njg1ZmI=
+    MmI2MzI2ZDUyOGQ0OGY3MzAyZjZkNjBmNjU1Njc5MGNmOWQ4N2Y0YzZhMDI0
+    Y2U0M2M4YWNlMjRhNmY3ZGQyN2JjNzQyZDc3Yzk5MGEzZjJhMjRjYWQxZmMz
+    NzNiNjUwOTk3MjFiZDY2MjRkNjJiNWZiY2I1ZjQ3ZjBhZTYyNDE=

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/ruby-box/folder.rb

@@ -22,10 +22,8 @@ module RubyBox
       begin
         resp = file.upload_content(data) #write a new file. If there is a conflict, update the conflicted file.
       rescue RubyBox::ItemNameInUse => e
-        file = RubyBox::File.new(@session, {
-          'id' => e['context_info']['conflicts'][0]['id']
-        })
         data.rewind
+        file = files(filename).first
         resp = file.update_content( data )
       end
     end

data/ruby-box.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.8.0"
+  s.version = "1.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Attachments.me"]
-  s.date = "2013-07-19"
+  s.date = "2013-07-30"
   s.description = "ruby gem for box.com 2.0 api"
   s.email = "ben@attachments.me"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Attachments.me
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post