ruby-box 1.1.2 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2IwZDUyYzhhNzE4Njc4YzdmNjUyZDg2NmFiNDc3MDc1NzIzYTJjYQ==
+    YzA2NGU1NGE3NjRiYmQzYWE0NmNmNDFmZWY1ZTA3NDJjMjljMjhkNw==
   data.tar.gz: !binary |-
-    ZjQ5NDE2Yjk1N2NhMjdjY2FhZThmZTE1MDRkMDkyMzQ0NTU4MmMxNg==
+    Y2E3MzIzOWE3NjY3YjFlNGIzOTBkNzVkZTI4Y2UwMTAxNWVjNzc1MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzJmZWEyODkwODQwYTY0ODMxZGE1NGZkZWMzZGE1OWYwYzFhYmQ0ZWU4NjBl
-    NWU0ZGI2ZjY3ZjBmOTE2MTdkMWVlNTFlZTEzMGY3MWNlNzQ1MWZhMWQyZGVj
-    NjkzOWM2OTg3ZmI0MTAyZWIwMDFhMmI1NWZiYzQ5YjJlYmY5ZjM=
+    NTFiYWM5MGEzNjRhZDMwNGJlNjhhOTkxMjhiZTM2ZDEwN2M4OTQ3ZTI3MTFk
+    NDc4ZDcwOTg1MWFmMTk4OTExOGZkNTE0YThhMWRkZDg5YzY1NjBkNTBjMmQ3
+    N2U3Yzg3ZGIxOGMxNDI2ZDI5MmI2NmNjNmQxN2E3OTE0Mzc2N2Q=
   data.tar.gz: !binary |-
-    NDE1ZDBhMWNmNWI4M2FjZWQwOGU0OTgyM2E0Njg4OThmMjM4MzkyOTk1Yjdi
-    OTExMmY1Y2NlNDJkY2Q2YjE0NmU3OGYzMTc4ZDZjYjljYWIxZTMyMThlOGM4
-    NWVhYWYyMGRlOTdmNjUzODQ3YjU3NzUxNjI2ZDNmYTkxOGFjZjA=
+    ZDY2ZWQ0ZTBhZjMxOTMzZDVmMjQ2NmI5MTAwZTNlNzBhYTRhY2VkODliNTc2
+    NDJhODQwMjE1NTg2YjFlNzdiOTY2MzM3MzkwY2E1MDgxNWY4ODRiNzg5MWNk
+    ZDVmZGJiYzI1M2MyNGNmODAzY2Q3YTc1MTU2NzQ2MTI3M2JjMDA=

data/Gemfile

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

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.7.7)
     jwt (0.1.5)
       multi_json (>= 1.0)
     multi_json (1.6.0)
@@ -42,6 +43,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler (~> 1.6.4)
+  json
   multipart-post
   oauth2
   rspec

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/ruby-box.rb

@@ -6,6 +6,7 @@ require 'ruby-box/file'
 require 'ruby-box/folder'
 require 'ruby-box/user'
 require 'ruby-box/comment'
+require 'ruby-box/collaboration'
 require 'ruby-box/discussion'
 require 'ruby-box/exceptions'
 require 'ruby-box/event_response'

data/lib/ruby-box/client.rb

@@ -16,12 +16,14 @@ module RubyBox
       folder.reload_meta
     end
 
-    def folder(path)
+    def folder(path='/')
+      path = path.sub(/(^\.$)|(^\.\/)/, '') if path # handle folders with leading '.'
+      return root_folder if ['', '/'].member?(path)
       folder_from_split_path( split_path(path) )
     end
 
     def file(path)
-      path = split_path(path)
+      path = split_path( path.sub(/^\.\//, '') )
       file_name = path.pop
       folder = folder_from_split_path( path )
       folder.files(file_name).first if folder
@@ -96,6 +98,11 @@ module RubyBox
       EventResponse.new(@session, resp)
     end
 
+    def me
+      resp = @session.get( "#{RubyBox::API_URL}/users/me" )
+      User.new(@session, resp)
+    end
+
     private
 
     def folder_from_split_path(path)
@@ -108,7 +115,9 @@ module RubyBox
     end
 
     def fmt_events_args(stream_position, stream_type, limit)
-      stream_position = stream_position.kind_of?(Numeric) ? stream_position : 0
+      unless stream_position.to_s == 'now'
+        stream_position = stream_position.kind_of?(Numeric) ? stream_position : 0
+      end
       stream_type = [:all, :changes, :sync].include?(stream_type) ? stream_type : :all
       limit = limit.kind_of?(Fixnum) ? limit : 100
       "stream_position=#{stream_position}&stream_type=#{stream_type}&limit=#{limit}"

data/lib/ruby-box/collaboration.rb

@@ -0,0 +1,15 @@
+module RubyBox
+  class Collaboration < Item
+
+    private
+
+    def resource_name
+      'collaborations'
+    end
+
+    def update_fields
+      ['role', 'status']
+    end
+
+  end
+end

data/lib/ruby-box/folder.rb

@@ -16,6 +16,12 @@ module RubyBox
       end
     end
 
+    def collaborations(item_limit=100, offset=0)
+      items(item_limit, offset).select do |item|
+        item.kind_of? RubyBox::Collaboration
+      end
+    end
+
     def upload_file(filename, data)
       file = RubyBox::File.new(@session, {
         'name' => filename,

data/lib/ruby-box/item.rb

@@ -73,21 +73,12 @@ module RubyBox
     protected
 
     def self.factory(session, entry)
-      case entry['type']
-      when 'folder'
-        return RubyBox::Folder.new(session, entry)
-      when 'file'
-        return RubyBox::File.new(session, entry)
-      when 'comment'
-        return RubyBox::Comment.new(session, entry)        
-      when 'user'
-        return RubyBox::User.new(session, entry)
-      when 'discussion'
-        return RubyBox::Discussion.new(session, entry)
-      when 'web_link'
-        return RubyBox::WebLink.new(session, entry)
+      type = entry['type'].capitalize.to_sym
+      if RubyBox.constants.include? type
+        RubyBox.const_get(type).new(session, entry)
+      else
+        entry
       end
-      entry
     end
 
     def has_mini_format?

data/ruby-box.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Attachments.me"]
-  s.date = "2013-05-01"
+  s.date = "2013-05-03"
   s.description = "ruby gem for box.com 2.0 api"
   s.email = "ben@attachments.me"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ruby-box.rb",
     "lib/ruby-box/client.rb",
+    "lib/ruby-box/collaboration.rb",
     "lib/ruby-box/comment.rb",
     "lib/ruby-box/discussion.rb",
     "lib/ruby-box/event.rb",
@@ -42,11 +43,13 @@ Gem::Specification.new do |s|
     "spec/event_spec.rb",
     "spec/file_spec.rb",
     "spec/fixtures/events.json",
+    "spec/fixtures/me.json",
     "spec/fixtures/遠志教授.jpg",
     "spec/folder_spec.rb",
     "spec/helper/account.example",
     "spec/helper/account.rb",
     "spec/integration_spec.rb",
+    "spec/me_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/attachmentsme/ruby-box"
@@ -61,6 +64,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -68,6 +72,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<oauth2>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -76,6 +81,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<oauth2>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/client_spec.rb

@@ -10,6 +10,17 @@ describe RubyBox::Client do
     @session = RubyBox::Session.new
   end
 
+  describe '#folder' do
+    it "should return root folder as default behavior for paths such as ./" do
+      RubyBox::Client.any_instance.should_receive(:root_folder).exactly(4).times
+      client = RubyBox::Client.new(@session)
+      client.folder()
+      client.folder('.')
+      client.folder('./')
+      client.folder('/')
+    end
+  end
+
   describe '#split_path' do
     it "returns the appropriate path" do
       client = RubyBox::Client.new(@session)

data/spec/event_spec.rb

@@ -29,6 +29,11 @@ describe RubyBox::EventResponse do
     event.missing_key
   end
 
+  it '#fmt_events_args should return a properly formatted URL' do
+    @client.send(:fmt_events_args, 0, :all, 100).should eql("stream_position=0&stream_type=all&limit=100")
+    @client.send(:fmt_events_args, 'now', :changes, 55).should eql("stream_position=now&stream_type=changes&limit=55")
+  end
+
   describe '#event_response' do
     before do
       @response = @client.event_response

data/spec/fixtures/me.json

@@ -0,0 +1,17 @@
+{
+    "type": "user",
+    "id": "10000000",
+    "name": "Test User",
+    "login": "test@example.com",
+    "created_at": "2013-05-01T11:26:07-05:00",
+    "modified_at": "2013-05-01T11:26:07-05:00",
+    "language": "en",
+    "space_amount": 2400000000,
+    "space_used": 2000000,
+    "max_upload_size": 200000000,
+    "status": "active",
+    "job_title": "Unit Tester",
+    "phone": "5555555555",
+    "address": "600 Unit Test Way",
+    "avatar_url": "https://www.box.com/api/avatar/large/10000000"
+}

data/spec/folder_spec.rb

@@ -11,8 +11,8 @@ describe RubyBox::Folder do
     @full_folder = JSON.parse('{    "type": "folder",    "id": "11446498",    "sequence_id": "1",    "etag": "1",    "name": "Pictures",    "created_at": "2012-12-12T10:53:43-08:00",    "modified_at": "2012-12-12T11:15:04-08:00",    "description": "Some pictures I took",    "size": 629644,    "path_collection": {        "total_count": 1,        "entries": [            {                "type": "folder",                "id": "0",                "sequence_id": null,                "etag": null,                "name": "All Files"            }        ]    },    "created_by": {        "type": "user",        "id": "17738362",        "name": "sean rose",        "login": "sean@box.com"    },    "modified_by": {        "type": "user",        "id": "17738362",        "name": "sean rose",        "login": "sean@box.com"    },    "owned_by": {        "type": "user",        "id": "17738362",        "name": "sean rose",        "login": "sean@box.com"    },    "shared_link": {        "url": "https://www.box.com/s/vspke7y05sb214wjokpk",        "download_url": "https://www.box.com/shared/static/vspke7y05sb214wjokpk",        "vanity_url": null,        "is_password_enabled": false,        "unshared_at": null,        "download_count": 0,        "preview_count": 0,        "access": "open",        "permissions": {            "can_download": true,            "can_preview": true        }    },    "folder_upload_email": {        "access": "open",        "email": "upload.Picture.k13sdz1@u.box.com"    },    "parent": {        "type": "folder",        "id": "0",        "sequence_id": null,        "etag": null,        "name": "All Files"    },    "item_status": "active",    "item_collection": {        "total_count": 1,        "entries": [            {                "type": "file",                "id": "5000948880",                "sequence_id": "3",                "etag": "3",                "sha1": "134b65991ed521fcfe4724b7d814ab8ded5185dc",                "name": "tigers.jpeg"            }        ],        "offset": 0,        "limit": 100    }}')
     @mini_folder = JSON.parse('{    "type":"folder",    "id":"301415432",    "sequence_id":"0",    "name":"my first sub-folder"}')
     @items = [
-      JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047867",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s your folder"        },        {            "type": "file",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "0",    "limit": "2"}'),
-      JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')  
+      JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047867",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s your folder"        },        {            "type": "file",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        },    { "type": "collaboration", "id": "409042000", "status": "accepted" } ],    "offset": "0",    "limit": "3"}'),
+      JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        },    { "type": "collaboration", "id": "409042001", "status": "accepted" }   ],    "offset": "2",    "limit": "3"}')
     ]
   end
 
@@ -109,4 +109,14 @@ describe RubyBox::Folder do
       files.first.kind_of?(RubyBox::Folder).should == true
     end
   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/me_spec.rb

@@ -0,0 +1,20 @@
+#encoding: UTF-8
+
+require 'ruby-box'
+require 'webmock/rspec'
+
+describe '/users/me' do
+  before do
+    @session = RubyBox::Session.new
+    @client  = RubyBox::Client.new(@session)
+    @me_json  = File.read 'spec/fixtures/me.json'
+    @me = JSON.load @me_json
+    stub_request(:get, /#{RubyBox::API_URL}\/users\/me/).to_return(body: @me_json, :status => 200)
+  end
+
+  it 'should return the currently logged in User' do
+    me = @client.me
+    me.instance_of?(RubyBox::User).should be_true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Attachments.me
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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
@@ -111,6 +125,7 @@ files:
 - VERSION
 - lib/ruby-box.rb
 - lib/ruby-box/client.rb
+- lib/ruby-box/collaboration.rb
 - lib/ruby-box/comment.rb
 - lib/ruby-box/discussion.rb
 - lib/ruby-box/event.rb
@@ -127,11 +142,13 @@ files:
 - spec/event_spec.rb
 - spec/file_spec.rb
 - spec/fixtures/events.json
+- spec/fixtures/me.json
 - spec/fixtures/遠志教授.jpg
 - spec/folder_spec.rb
 - spec/helper/account.example
 - spec/helper/account.rb
 - spec/integration_spec.rb
+- spec/me_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/attachmentsme/ruby-box
 licenses: