boxr 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b4a867d4fc5a6446ae5f142d580c371e7748ae
-  data.tar.gz: 143e912a0826575b25016119b54690103a9e2a3d
+  metadata.gz: 899e4b38f5025cfbd597d3e73efb4779befd1677
+  data.tar.gz: 4ce61c545bb2b7c1634b2a4dc7a44ab30a045a94
 SHA512:
-  metadata.gz: a9631bd2bd6a8ef95ecacfb9b64d88b94498b59543535195d3a36b03f4e5d5f22b3c4d43210957720c38dca5731456697bedf5f07a85176aabcaa78991113e62
-  data.tar.gz: bb56e7e644834021a2047ac7605e2d23448a2187fb1f890916433d914b4d1e5a72eea440af4e394bd5b7ed7f89b84c3abba53094c0bffbe524c728c1f77ab7eb
+  metadata.gz: c84ac5f3451d2bd13c25e27a6c9dd31ed8d9c5a58b95adfce1207cd819fba7f254ec8183aab5712ba4e01adc32cdfdbdca12b2c1a2199af7061d09ec8acd246d
+  data.tar.gz: eea9cbf4af775f0ec27dc851811571ac5b183690148ff6f818ec25772792e31e45cf2e3c3a386a67e7864f3908126214067d6fb275fd9643ca10edc90b15608b

data/README.md

@@ -106,9 +106,11 @@ root_folder_items(fields: [], offset: 0, limit: FOLDER_ITEMS_LIMIT)
       
 create_folder(name, parent)
      
-update_folder(folder, name: nil, description: nil, parent_id: nil, shared_link: nil,
+update_folder(folder, name: nil, description: nil, parent: nil, shared_link: nil,
                 folder_upload_email_access: nil, owned_by_id: nil, sync_state: nil, tags: nil,
                 can_non_owners_invite: nil, if_match: nil)
+
+move_folder(folder, new_parent, name: nil, if_match: nil)
      
 delete_folder(folder, recursive: false, if_match: nil)
      
@@ -124,7 +126,7 @@ trashed_folder(folder, fields: [])
      
 delete_trashed_folder(folder)
       
-restore_trashed_folder(folder, name: nil, parent_id: nil)
+restore_trashed_folder(folder, name: nil, parent: nil)
 ```
 #### [Files](https://developers.box.com/docs/#files)
 ```ruby
@@ -133,7 +135,9 @@ file_from_path(path)
 file_from_id(file_id, fields: [])
 alias :file :file_from_id
 
-update_file(file, name: nil, description: nil, parent_id: nil, shared_link: nil, tags: nil, if_match: nil)
+update_file(file, name: nil, description: nil, parent: nil, shared_link: nil, tags: nil, if_match: nil)
+
+move_file(file, new_parent, name: nil, if_match: nil)
 
 download_file(file, version: nil, follow_redirect: true)
 
@@ -165,7 +169,7 @@ trashed_file(file, fields: [])
 
 delete_trashed_file(file)
 
-restore_trashed_file(file, name: nil, parent_id: nil)
+restore_trashed_file(file, name: nil, parent: nil)
 ```
 #### [Comments](https://developers.box.com/docs/#comments)
 ```ruby

data/lib/boxr/client.rb

@@ -207,12 +207,14 @@ module Boxr
     end
 
     def ensure_id(item)
-      return item if item.class == String || item.class == Fixnum
+      return item if item.class == String || item.class == Fixnum || item.nil?
       return item.id if item.respond_to?(:id)
       raise BoxrException.new(boxr_message: "Expecting an id of class String or Fixnum, or object that responds to :id")
     end
 
-    def restore_trashed_item(uri, name, parent_id)
+    def restore_trashed_item(uri, name, parent)
+      parent_id = ensure_id(parent)
+
       attributes = {}
       attributes[:name] = name unless name.nil?
       attributes[:parent] = {id: parent_id} unless parent_id.nil?

data/lib/boxr/exceptions.rb

@@ -11,14 +11,18 @@ module Boxr
       @boxr_message = boxr_message
 
       if(body)
-        body_json = Oj.load(body)
-        if body_json
-          @type = body_json["type"]
-          @box_status = body_json["status"]
-          @code = body_json["code"]
-          @help_uri = body_json["help_uri"]
-          @box_message = body_json["message"]
-          @request_id = body_json["request_id"]
+        begin
+          body_json = Oj.load(body)
+
+          if body_json
+            @type = body_json["type"]
+            @box_status = body_json["status"]
+            @code = body_json["code"]
+            @help_uri = body_json["help_uri"]
+            @box_message = body_json["message"]
+            @request_id = body_json["request_id"]
+          end
+        rescue
         end
       end
     end

data/lib/boxr/files.rb

@@ -26,8 +26,9 @@ module Boxr
     end
     alias :file :file_from_id
 
-    def update_file(file, name: nil, description: nil, parent_id: nil, shared_link: nil, tags: nil, if_match: nil)
+    def update_file(file, name: nil, description: nil, parent: nil, shared_link: nil, tags: nil, if_match: nil)
       file_id = ensure_id(file)
+      parent_id = ensure_id(parent)
       uri = "#{FILES_URI}/#{file_id}"
 
       attributes = {}
@@ -41,6 +42,10 @@ module Boxr
       updated_file
     end
 
+    def move_file(file, new_parent, name: nil, if_match: nil)
+      update_file(file, parent: new_parent, name: name, if_match: if_match)
+    end
+
     def download_file(file, version: nil, follow_redirect: true)
       file_id = ensure_id(file)
       begin
@@ -202,8 +207,10 @@ module Boxr
       result
     end
 
-    def restore_trashed_file(file, name: nil, parent_id: nil)
+    def restore_trashed_file(file, name: nil, parent: nil)
       file_id = ensure_id(file)
+      parent_id = ensure_id(parent)
+
       uri = "#{FILES_URI}/#{file_id}"
       restore_trashed_item(uri, name, parent_id)
     end

data/lib/boxr/folders.rb

@@ -47,6 +47,7 @@ module Boxr
 
     def create_folder(name, parent)
       parent_id = ensure_id(parent)
+
       uri = "#{FOLDERS_URI}"
       attributes = {:name => name, :parent => {:id => parent_id}}
       
@@ -54,16 +55,17 @@ module Boxr
       created_folder
     end
 
-    def update_folder(folder, name: nil, description: nil, parent_id: nil, shared_link: nil,
+    def update_folder(folder, name: nil, description: nil, parent: nil, shared_link: nil,
                            folder_upload_email_access: nil, owned_by_id: nil, sync_state: nil, tags: nil,
                            can_non_owners_invite: nil, if_match: nil)
       folder_id = ensure_id(folder)
+      parent_id = ensure_id(parent)
       uri = "#{FOLDERS_URI}/#{folder_id}"
 
       attributes = {}
       attributes[:name] = name unless name.nil?
       attributes[:description] = description unless description.nil?
-      attributes[:parent_id] = {id: parent_id} unless parent_id.nil?
+      attributes[:parent] = {id: parent_id} unless parent_id.nil?
       attributes[:shared_link] = shared_link unless shared_link.nil?
       attributes[:folder_upload_email] = {access: folder_upload_email_access} unless folder_upload_email_access.nil?
       attributes[:owned_by_id] = {owned_by: owned_by_id} unless owned_by_id.nil?
@@ -75,6 +77,10 @@ module Boxr
       updated_folder
     end
 
+    def move_folder(folder, new_parent, name: nil, if_match: nil)
+      update_folder(folder, parent: new_parent, name: name, if_match: if_match)
+    end
+
     def delete_folder(folder, recursive: false, if_match: nil)
       folder_id = ensure_id(folder)
       uri = "#{FOLDERS_URI}/#{folder_id}"
@@ -138,8 +144,10 @@ module Boxr
       result
     end
 
-    def restore_trashed_folder(folder, name: nil, parent_id: nil)
+    def restore_trashed_folder(folder, name: nil, parent: nil)
       folder_id = ensure_id(folder)
+      parent_id = ensure_id(parent)
+
       uri = "#{FOLDERS_URI}/#{folder_id}"
       restore_trashed_item(uri, name, parent_id)
     end

data/lib/boxr/version.rb

@@ -1,3 +1,3 @@
 module Boxr
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/boxr_spec.rb

@@ -80,7 +80,7 @@ describe Boxr::Client do
     expect(updated_folder.description).to eq(SUB_FOLDER_DESCRIPTION)
 
     puts "copy folder"
-    new_folder = BOX_CLIENT.copy_folder(SUB_FOLDER,@test_folder, name: 'copy of sub_folder_1')
+    new_folder = BOX_CLIENT.copy_folder(SUB_FOLDER,@test_folder, name: "copy of #{SUB_FOLDER_NAME}")
     expect(new_folder).to be_a Hashie::Mash
     SUB_FOLDER_COPY = new_folder
 
@@ -97,6 +97,12 @@ describe Boxr::Client do
     updated_folder = BOX_CLIENT.disable_shared_link_for_folder(@test_folder)
     expect(updated_folder.shared_link).to be_nil
 
+    puts "move folder"
+    folder_to_move = BOX_CLIENT.create_folder("Folder to move", @test_folder)
+    folder_to_move_into = BOX_CLIENT.create_folder("Folder to move into", @test_folder)
+    folder_to_move = BOX_CLIENT.move_folder(folder_to_move, folder_to_move_into)
+    expect(folder_to_move.parent.id).to eq(folder_to_move_into.id)
+
     puts "delete folder"
     result = BOX_CLIENT.delete_folder(SUB_FOLDER_COPY, recursive: true)
     expect(result).to eq ({})
@@ -187,6 +193,11 @@ describe Boxr::Client do
     expect(new_file.name).to eq(new_file_name)
     NEW_FILE = new_file
 
+    puts "move file"
+    new_folder = BOX_CLIENT.create_folder(SUB_FOLDER_NAME, @test_folder)
+    test_file = BOX_CLIENT.move_file(test_file, new_folder.id)
+    expect(test_file.parent.id).to eq(new_folder.id)
+
     puts "delete file"
     result = BOX_CLIENT.delete_file(NEW_FILE)
     expect(result).to eq({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Chad Burnette