ruby-box 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI5MWRhMWMwNjYwMDFhN2QyYTg3YzM1OTJhMWE2ZDM5NjMzODNjOQ==
+    MzQwYmEzNDcwZTkzZDk3MTMzNjMwZDFhODY5NjM2MjllZmVjOWEyNQ==
   data.tar.gz: !binary |-
-    YTM1OGYwMmMyOGU0Y2EyZmU0NGFjYWUyMTM0ZjQ2NDM0ZDllMmVhYg==
+    YjQ3Yzc4YjgzZmRiOTdhMjE4NWM5NTJiYmY1MDg1YjkyMDlhMDM2Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjgxZWMxODc2MzIyODg4YTAyMzIzMzg4NGI4MTM4NzdkYmFjNTBhNGFlYmY2
-    MjAxOGU0MmU4ZGYyYWU1MjQ4MWYzNWYxMTcyYmFlYWM3ZDgxMWFhMTcyZTQ3
-    OGMzYTQzMWQzZjAwYTliOGMxMjMwNTcwMWVmNzA0NzQ5MzJmNmQ=
+    NmY5ZmE2ZDI0YTk0OWQzMGU4ZDNkOTZiM2I1ZTdlZmZmODNiNGFmYjQxM2Rm
+    YjQ3ZTFjYjI4Nzc2MTlkOGQ5NjA2OGExNzBhMmMzYzYxMWZhYjM4YjMzNTJm
+    Njg0YWRlYWM5ZTU3MDVkZThkOGJjZThhOTBiZTNmMjcxZGFkYmI=
   data.tar.gz: !binary |-
-    YzhkODAxM2Q2YjZlMWVlMWE5YjAyNzFhMTcwOTA5YmE0MmQ5MzE0NmI0ZTMx
-    YmQxMTM4YTUyZjQ3YzJhM2NhNWJjMTAwZjk0MmNiY2I1NDRhODE4MjA1ZTNi
-    NmZmOGMyYTcxZmViOGZiZjQ3NjE2YzlkMTk4ODc1OTY2YmM2NDY=
+    YWQwNTliOTU4NTQ2MTUzODA2MTA2ODNiOTBiOGM2ZDY0YmY2YTA3OTIwZmRl
+    ZWFjOGVjNjU3MzgyMjgwN2Y2NDViYjhmNmY2YTNhMmYxNTVjZDI4MzgzZTU5
+    ODFkZTFiMmQ1NzliZmM2YWQ4OGYwOTcyN2YwYmE0MmNjYmM2MGI=

data/README.markdown

@@ -26,7 +26,12 @@ authorize_url = session.authorize_url('https://redirect-url-in-app-settings')
 __2)__ After redirecting to the authorize_url, exchange the _code_ given for an _access\_token_
 
 ```ruby
-session.get_access_token('code-returned-to-redirect_url')
+@token = session.get_access_token('code-returned-to-redirect_url')
+p '@token.token' # the access token.
+p '@token.refresh_token' # token that can be exchanged for a new access_token once the access_token expires.
+
+# refreshing token.
+@token = session.refresh_token('refresh-token-string')
 ```
 
 __3)__ Create a client using a session initialized with the _access\_token_.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/ruby-box/discussion.rb

@@ -1,11 +1,6 @@
 module RubyBox
   class Discussion < Item
-
-    def comments
-      url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/comments"
-      resp = @session.get( url )
-      resp['entries'].map {|i| Comment.new(@session, i)}
-    end
+    has_many :comments
 
     private
 

data/lib/ruby-box/file.rb

@@ -1,6 +1,8 @@
 module RubyBox
   class File < Item
 
+    has_many :comments
+
     def download
       resp = stream.read
     end
@@ -10,12 +12,6 @@ module RubyBox
       @session.do_stream( url, opts )
     end
 
-    def comments
-      url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/comments"
-      resp = @session.get( url )
-      resp['entries'].map {|i| Comment.new(@session, i)}
-    end
-
     def upload_content( data )
       url = "#{RubyBox::UPLOAD_URL}/#{resource_name}/content"
       uri = URI.parse(url)

data/lib/ruby-box/folder.rb

@@ -1,18 +1,8 @@
 module RubyBox
   class Folder < Item
-    def items(item_limit=100, offset=0)
-      Enumerator.new do |yielder|
-        while true
-          url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/items?limit=#{item_limit}&offset=#{offset}"
-          resp = @session.get( url )
-          resp['entries'].each do |entry|
-            yielder.yield(RubyBox::Item.factory(@session, entry))
-          end
-          offset += resp['entries'].count
-          break if resp['offset'].to_i + resp['limit'].to_i >= resp['total_count'].to_i
-        end
-      end
-    end
+
+    has_many :discussions
+    has_many_paginated :items
 
     def files(name=nil, item_limit=100, offset=0)
       items(item_limit, offset).select do |item|
@@ -26,12 +16,6 @@ module RubyBox
       end
     end
 
-    def discussions
-      url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/discussions"
-      resp = @session.get( url )
-      resp['entries'].map {|i| Discussion.new(@session, i)}
-    end
-
     def upload_file(filename, data)
       file = RubyBox::File.new(@session, {
         'name' => filename,

data/lib/ruby-box/item.rb

@@ -3,11 +3,22 @@ require 'time'
 module RubyBox
   class Item
 
+    @@has_many = []
+    @@has_many_paginated = []
+
     def initialize( session, raw_item )
       @session = session
       @raw_item = raw_item
     end
 
+    def self.has_many(*keys)
+      keys.each {|key| @@has_many << key.to_s}
+    end
+
+    def self.has_many_paginated(*keys)
+      keys.each {|key| @@has_many_paginated << key.to_s}
+    end
+
     def update
       reload_meta unless etag
 
@@ -37,6 +48,10 @@ module RubyBox
 
     def method_missing(method, *args, &block)
       key = method.to_s
+
+      # Support has many and paginated has many relationships.
+      return many(key) if @@has_many.include?(key)
+      return paginated(key, args[0] || 100, args[1] || 0) if @@has_many_paginated.include?(key)
       
       # update @raw_item hash if this appears to be a setter.
       setter = method.to_s.end_with?('=')
@@ -75,6 +90,26 @@ module RubyBox
 
     private
 
+    def many(key)
+      url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/#{key}"
+      resp = @session.get( url )
+      resp['entries'].map {|i| RubyBox::Item.factory(@session, i)}
+    end
+
+    def paginated(key, item_limit=100, offset=0)
+      Enumerator.new do |yielder|
+        while true
+          url = "#{RubyBox::API_URL}/#{resource_name}/#{id}/#{key}?limit=#{item_limit}&offset=#{offset}"
+          resp = @session.get( url )
+          resp['entries'].each do |entry|
+            yielder.yield(RubyBox::Item.factory(@session, entry))
+          end
+          offset += resp['entries'].count
+          break if resp['offset'].to_i + resp['limit'].to_i >= resp['total_count'].to_i
+        end
+      end
+    end
+
     def serialize
       update_fields.inject({}) {|hash, field| hash[field] = @raw_item[field]; hash}
     end

data/lib/ruby-box/session.rb

@@ -2,7 +2,6 @@ require 'oauth2'
 
 module RubyBox  
   class Session
-    attr_accessor :api_key, :auth_token, :oauth2_client, :access_token
 
     OAUTH2_URLS = {
       :site => 'https://www.box.com',
@@ -13,7 +12,7 @@ module RubyBox
     def initialize(opts={})
       if opts[:client_id]
         @oauth2_client = OAuth2::Client.new(opts[:client_id], opts[:client_secret], OAUTH2_URLS)
-        @access_token = OAuth2::AccessToken.new(oauth2_client, opts[:access_token]) if opts[:access_token]
+        @access_token = OAuth2::AccessToken.new(@oauth2_client, opts[:access_token]) if opts[:access_token]
       else # Support legacy API for historical reasons.
         @api_key = opts[:api_key]
         @auth_token = opts[:auth_token]
@@ -26,8 +25,12 @@ module RubyBox
     end
 
     def get_access_token(code)
-      @access_token = @oauth2_client.auth_code.get_token(code, { :redirect_uri => @redirect_uri, :token_method => :post })
-      @access_token.token
+      @access_token = @oauth2_client.auth_code.get_token(code)
+    end
+
+    def refresh_token(refresh_token)
+      refresh_access_token_obj = OAuth2::AccessToken.new(@oauth2_client, @access_token.token, {'refresh_token' => refresh_token})
+      @access_token = refresh_access_token_obj.refresh!
     end
     
     def build_auth_header

data/ruby-box.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin Coe", "Jesse Miller", "Larry Kang"]

data/spec/folder_spec.rb

@@ -89,6 +89,16 @@ describe RubyBox::Folder do
 
   end
 
+  describe '#discussions' do
+    it "should return all the discussions surrounding a folder" do
+      item = JSON.parse('{    "id": "0000001", "total_count": 1,    "entries": [ {            "type": "discussion",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }   ],    "offset": "0",    "limit": "1"}')
+      RubyBox::Session.any_instance.stub(:request).and_return(item)
+      session = RubyBox::Session.new
+      item = RubyBox::Client.new(session).root_folder.discussions.first
+      item.kind_of?(RubyBox::Discussion).should == true
+    end
+  end
+
   describe '#folders' do
     it "should only return items of type folder" do
       RubyBox::Session.any_instance.stub(:request) { @items.pop }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Benjamin Coe