ruby-box 1.3.1 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVlNDQyNDAxY2U0Y2VjODkwMDczYWFhMjkxMjg1OTc2NGMxY2VlNQ==
+    ODI2ZDdkYWJmMDQ3ZGZiMDQ1ZGI3NDljOTM0ZGY2ZDhiMGM1YWE2Mw==
   data.tar.gz: !binary |-
-    MTQzZWFmMjg3N2U4NjkxMmY5NGRmY2EzNjFkNTI1ODc5ODRhNzM0MQ==
+    ODNjY2YyZTA5ODcwMjU3ZjNmODljYjY1MzM5YTcxODYwZjgzNTcyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWEwMTRiZjJiNWM1YTliN2NlZjBkYzNkNzNjODBiM2U0MWMwNzUwOTljZWM2
-    MzNkZDllZDFlOTlkZDUyYWNkMDlmYTgxYTE3YmJmMmM0OTcxNzQ5OTFmOWQz
-    NDdjN2Q1MDRhNTg1MTNkYTRkZTc4ODM5ODg1MjZkYjE3YWQwNGQ=
+    MDYxYmQ5ZjAyZjYyNzc4MzczNjEwZTdjMWNhOGI4ZWFkODI0OWJjMzVjNGJk
+    ODYyMTQ2ZmVlMmUwZDNkMDE5NGY2NTZjOTgyYWQ5MGMzOGFhYTEzMjhhN2Qy
+    ZDVlY2JkM2E0N2U2NTEzYzA2ZDJkYTZjYjJkODUwYTRjZjI5YmE=
   data.tar.gz: !binary |-
-    MjJkMjRmMDFmMjc3YTk4YjlkYTRhYjNjMGY2ZmJkYTE3N2VmYjljZmY5MTRj
-    MjJiZTY2OWUxMDU4OGJlYjA4YmRjMGMwNjdhYjA0NjczYWU2NWFmNTRlMzhl
-    NTg0ZWJhNTk1YzQ3M2MzMmNhNjEzYzhkNzc2YTdmN2UwODg4NWI=
+    OTliM2MyMjk3ZmJmNzIxY2I3MjBmYWJjM2IzNWEwNThmN2I0Nzc2NjcxMmQ1
+    MDNhNzFmNjk1YjdlMDIzZjkyYTA0ZGNlYTY1MWFiOThmZDAzYzlkM2IxZWQw
+    OTg5NmRmMTRkNzBkNzMxNjhiMWU4MzEwMzE4ZTMzMGQ5OGU1YTc=

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "multipart-post"
 gem "oauth2"
 gem "json"
+gem "addressable"
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -41,6 +41,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
   bundler
   jeweler (~> 1.6.4)
   json

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/ruby-box/folder.rb

@@ -2,6 +2,7 @@ module RubyBox
   class Folder < Item
 
     has_many :discussions
+    has_many :collaborations
     has_many_paginated :items
 
     def files(name=nil, item_limit=100, offset=0, fields=nil)
@@ -12,10 +13,6 @@ module RubyBox
       items_by_type(RubyBox::Folder, name, item_limit, offset, fields)
     end
 
-    def collaborations(item_limit=100, offset=0, fields=nil)
-      items_by_type(RubyBox::Collaboration, nil, item_limit, offset, fields)
-    end
-
     def upload_file(filename, data)
       file = RubyBox::File.new(@session, {
         'name' => filename,
@@ -42,6 +39,18 @@ module RubyBox
       RubyBox::Folder.new(@session, resp)
     end
 
+    # see http://developers.box.com/docs/#collaborations-collaboration-object
+    # for a list of valid roles.
+    def create_collaboration(email, role=:viewer)
+      collaboration = RubyBox::Collaboration.new(@session, {
+          'item' => {'id' => id, 'type' => type},
+          'accessible_by' => {'login' => email},
+          'role' => role.to_s
+      })
+
+      collaboration.create
+    end
+
     private
 
     def resource_name

data/lib/ruby-box/item.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'addressable/uri'
 
 module RubyBox
   class Item
@@ -35,8 +36,19 @@ module RubyBox
       self
     end
 
-    def delete
+    def create
+      url = "#{RubyBox::API_URL}/#{resource_name}"
+      uri = URI.parse(url)
+      request = Net::HTTP::Post.new( uri.request_uri )
+      request.body = JSON.dump(@raw_item)
+      resp = @session.request(uri, request)
+      @raw_item = resp
+      self
+    end
+
+    def delete(opts={})
       url = "#{RubyBox::API_URL}/#{resource_name}/#{id}"
+      url = "#{url}#{Addressable::URI.new(:query_values => opts).to_s}" unless opts.keys.empty?
       resp = @session.delete( url )
     end
 

data/lib/ruby-box/session.rb

@@ -13,6 +13,7 @@ module RubyBox
       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]
+        @refresh_token = opts[:refresh_token]
       else # Support legacy API for historical reasons.
         @api_key = opts[:api_key]
         @auth_token = opts[:auth_token]
@@ -49,7 +50,7 @@ module RubyBox
       resp = request( uri, request, raw )
     end
     
-    def request(uri, request, raw=false)      
+    def request(uri, request, raw=false, retries=0)
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
@@ -66,6 +67,13 @@ module RubyBox
       if response.is_a? Net::HTTPNotFound
         raise RubyBox::ObjectNotFound
       end
+
+      # Got unauthorized (401) status, try to refresh the token
+      if response.code.to_i == 401 and @refresh_token and retries == 0
+        refresh_token(@refresh_token)
+        request(uri, request, raw, retries + 1)
+      end
+
       handle_errors( response.code.to_i, response.body, raw )
     end
 
@@ -91,10 +99,15 @@ module RubyBox
         msg = body.nil? || body.empty? ? "no data returned" : body
         parsed_body = { "message" =>  msg }
       end
+
+      # status is used to determine whether
+      # we need to refresh the access token.
+      parsed_body["status"] = status
+
       case status / 100
       when 4
         raise(RubyBox::ItemNameInUse.new(parsed_body), parsed_body["message"]) if parsed_body["code"] == "item_name_in_use"
-        raise(RubyBox::AuthError.new(parsed_body), parsed_body["message"]) if parsed_body["code"] == "unauthorized" || status == 401        
+        raise(RubyBox::AuthError.new(parsed_body), parsed_body["message"]) if parsed_body["code"] == "unauthorized" || status == 401
         raise(RubyBox::RequestError.new(parsed_body), parsed_body["message"])
       when 5
         raise RubyBox::ServerError, parsed_body["message"]

data/ruby-box.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Attachments.me"]
-  s.date = "2013-06-19"
+  s.date = "2013-06-21"
   s.description = "ruby gem for box.com 2.0 api"
   s.email = "ben@attachments.me"
   s.extra_rdoc_files = [
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -72,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<oauth2>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<oauth2>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/folder_spec.rb

@@ -122,13 +122,4 @@ describe RubyBox::Folder do
     end
   end
 
-  describe '#collaborations' do
-    it "should only return items of type Collaboration" do
-      RubyBox::Session.any_instance.stub(:request) { @items.pop }
-      session = RubyBox::Session.new
-      collaborations = RubyBox::Folder.new(session, {'id' => 1}).collaborations
-      collaborations.count.should == 1
-      collaborations.first.kind_of?(RubyBox::Collaboration).should == true
-    end
-  end
 end

data/spec/integration_spec.rb

@@ -27,7 +27,7 @@ describe RubyBox, :skip => true do
   after do
     File.delete('./spec/fixtures/遠志教授.jpg')
   end
-    
+
   it "raises an AuthError if not client auth fails" do
     session = RubyBox::Session.new({
       api_key: 'bad-key',
@@ -112,7 +112,6 @@ describe RubyBox, :skip => true do
   end
 
   describe RubyBox::Client do
-
     describe '#put_data' do
       it "should update an existing file" do
         utf8_file_name = '遠志教授.jpg'
@@ -141,6 +140,14 @@ describe RubyBox, :skip => true do
       end
     end
 
+    describe '#delete folder' do
+      it "should be able to recursively delete the contents of a folder" do
+        folder = @client.create_folder('/ruby-box_gem_testing/delete_test')
+        @client.create_folder('/ruby-box_gem_testing/delete_test/subfolder')
+        folder.delete(recursive: 'true')
+      end
+    end
+
     describe '#get_file_info' do
       it "returns meta information for a file" do
         file = @client.file( '/ruby-box_gem_testing/cool stuff/кузнецкий_105_а_№2.test' )
@@ -176,6 +183,20 @@ describe RubyBox, :skip => true do
         data.should eq nil
       end   
     end
+
+    describe '#collaborations' do
+      it 'should be able to create and list collaborations on a folder' do
+        folder = @client.create_folder('/ruby-box_gem_testing/collaboration_folder')
+        folder.create_collaboration('bencoe@gmail.com')
+        folder.create_collaboration('ben@attachments.me', 'editor')
+        collaborations = folder.collaborations.to_a
+
+        collaborations[0].role.should == 'viewer'
+        collaborations[1].role.should == 'editor'
+        collaborations.count.should == 2
+
+        folder.delete if folder
+      end
+    end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Attachments.me
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement