egnyte 0.0.5 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJiZmE1MmY3MDE0ZjY4NDE4NWQxNjY3OTZmYTYxZjk4NzViNDQzMQ==
+    YWNmYjdjYmYyZDU0MTJlMzAzYmY4NDE2OWFiMWQyYWZiMzg5MGRmNA==
   data.tar.gz: !binary |-
-    M2M2OWZlNGFmZjMxMTRlMjdmZmNjZGFiODkyODEyODk0MWZkZmZhNA==
+    MTk1NTY5YmVlM2FhMDA0NDJhNTFhYzQ0YWU0ZWZjMTRkZjQ5NWMwMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDk0ZTk5MDA1ZjliYjQ5OGM4Mzc1YTE3ZjY1NzM0ZGI0OWI4ZDEwNDM4OTAw
-    NmViNzI4ODY3M2NlZmY4OTA0OTFiMDQ5OTY0ZDdiYjJjZjdkMjg0YmZiZTc4
-    NjE4ZTg0YjYzMGEzMWFkODkyMDcxMDEwNmZiOWY2YzdmMzA1ZTg=
+    YmNjYmQ1MTBlMTZiMmU0MzZlNDUxNjcyYTJiYmNkOGNkNWM1YjE0ZDZiZDgw
+    ZTE3MTQ5ODQ5YmNhYmVkY2NkODM4NDEwM2Q2MzZlMDhhODk2NWEyNTUwMzFm
+    OTgxMWMzMTBkNGM5Yzk4MzRjM2U4ZmZmZThiZDhlNzc2NDYzMDA=
   data.tar.gz: !binary |-
-    ZDMyNmRmZmVmNDg0Y2ZmZmU1YmZjZTdjN2JlMWMyYzI2ODExOWU1MmQ2ODg2
-    NDRmZTc4MTM0ZmUzZTViZGQ4MDFlNmQ3OWVhYTVjMzYxZTZlZDRmOTA0Mjhh
-    M2I0OGU4Y2IzZDA4MTEzZGNiMzM0MmE1N2UyMDgxNWU0MjA3MDQ=
+    YjA0NDcyYWJjNjViYTU1NmFlMTQzN2NmMmRlMmEyMDAyOTgxMzdlNDJhMjMw
+    ZWNkNGFkOWY0NmVjZmI3NjY1NGQxMzFhNDYwMDIyZmRiZGRjMzU3MzQ3M2Q5
+    YjdjNGM0NDU5NGE4YWU4YmI1MWViMTEyNGQ1ZWZkNTM4NThhOTg=

data/lib/egnyte/folder.rb

@@ -4,13 +4,17 @@ module Egnyte
       path = Egnyte::Helper.normalize_path(path)
 
       new_folder_path = "#{self.path}/#{path}"
-      new_folder_path = URI.escape(new_folder_path)
 
-      @session.post("#{fs_path}#{new_folder_path}", JSON.dump({
+      @session.post("#{fs_path}#{URI.escape(new_folder_path)}", JSON.dump({
         action: 'add_folder'
       }))
 
-      Folder::find(@session, new_folder_path)
+      Folder.new({
+        'path' => new_folder_path,
+        'folders' => [],
+        'is_folder' => true,
+        'name' => new_folder_path.split('/').pop
+      }, @session)
     end
 
     def delete
@@ -18,8 +22,18 @@ module Egnyte
     end
 
     def upload(filename, content)
-      @session.multipart_post("#{fs_path('fs-content')}#{URI.escape(path)}/#{URI.escape(filename)}", filename, content)
-      File::find(@session, "#{path}/#{filename}")
+      resp = @session.multipart_post("#{fs_path('fs-content')}#{URI.escape(path)}/#{URI.escape(filename)}", filename, content, false)
+
+      content.rewind # to calculate size, rewind content stream.
+
+      File.new({
+        'is_folder' => false,
+        'entry_id' => resp['ETag'],
+        'checksum' => resp['X-Sha512-Checksum'],
+        'last_modified' => resp['Last-Modified'],
+        'name' => filename,
+        'size' => content.size
+      }, @session)
     end
 
     def files

data/lib/egnyte/session.rb

@@ -30,34 +30,34 @@ module Egnyte
       @access_token = OAuth2::AccessToken.new(@client, token) if @strategy == :implicit
     end
 
-    def get(url)
+    def get(url, return_parsed_response=true)
       uri = URI.parse(url)
       request = Net::HTTP::Get.new( uri.request_uri )
-      resp = request( uri, request )
+      resp = request( uri, request, return_parsed_response )
     end
 
-    def delete(url)
+    def delete(url, return_parsed_response=true)
       uri = URI.parse(url)
       request = Net::HTTP::Delete.new( uri.request_uri )
-      resp = request( uri, request )
+      resp = request( uri, request, return_parsed_response )
     end
 
-    def post(url, body)
+    def post(url, body, return_parsed_response=true)
       uri = URI.parse(url)
       request = Net::HTTP::Post.new(uri.request_uri)
       request.body = body
       request.content_type = "application/json"
-      resp = request(uri, request)
+      resp = request(uri, request, return_parsed_response)
     end
 
-    def multipart_post(url, filename, data)
+    def multipart_post(url, filename, data, return_parsed_response=true)
       uri = URI.parse(url)
 
       request = Net::HTTP::Post.new(uri.request_uri)
       request.body = data.read
       request.content_type = 'application/binary'
 
-      resp = request(uri, request)
+      resp = request(uri, request, return_parsed_response)
     end
 
     # perform a streaming download of a file
@@ -74,7 +74,7 @@ module Egnyte
 
     private
 
-    def request(uri, request)
+    def request(uri, request, return_parsed_response=true)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.ssl_version = :SSLv3
@@ -88,7 +88,8 @@ module Egnyte
       # two requests per second.
       sleep(@backoff)
 
-      parse_response( response.code.to_i, response.body )
+      parsed_response = parse_response( response.code.to_i, response.body )
+      return_parsed_response ? parsed_response : response
     end
 
     def parse_response( status, body )

data/lib/egnyte/version.rb

@@ -1,3 +1,3 @@
 module Egnyte
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/folder_spec.rb

@@ -4,12 +4,60 @@ require 'spec_helper'
 
 describe Egnyte::Folder do
   before(:each) do
-    session = Egnyte::Session.new({
+    @session = Egnyte::Session.new({
       key: 'api_key',
       domain: 'test',
       access_token: 'access_token'
     }, :implicit, 0.0)
-    @client = Egnyte::Client.new(session)
+    @client = Egnyte::Client.new(@session)
+  end
+
+  describe "#upload" do
+    it "upload file to appropriate endpoint, and return a file object" do
+      stub_request(:post, "https://test.egnyte.com/pubapi/v1/fs-content/apple/banana/LICENSE.txt")
+        .with(:headers => { 'Authorization' => 'Bearer access_token' }, :body => File.open('./LICENSE.txt').read)
+        .to_return(:body => '', :status => 200, :headers => {
+          'ETag' => 'c0c6c151-104b-4ddd-a0c7-eea809fc8a6a',
+          'X-Sha512-Checksum' => '434390eddf638ab28e0f4668dca32e4a2b05c96eb3c8c0ca889788e204158cb4f240f1055ebac35745ede0e2349c83b407b9e4e0109bdc0b5ccdfe332a60fcfc',
+          'last_modified' => 'Mon, 05 Aug 2013 22:37:35 GMT'
+        })
+
+      folder = Egnyte::Folder.new({
+        'path' => 'apple/banana',
+        'name' => 'banana'
+      }, @session)
+
+      file = nil
+
+      File.open( './LICENSE.txt' ) do |data|
+        file = folder.upload('LICENSE.txt', data)
+      end
+
+      file.is_folder.should == false
+      file.name.should == 'LICENSE.txt'
+      file.entry_id.should == 'c0c6c151-104b-4ddd-a0c7-eea809fc8a6a'
+      file.checksum.should == '434390eddf638ab28e0f4668dca32e4a2b05c96eb3c8c0ca889788e204158cb4f240f1055ebac35745ede0e2349c83b407b9e4e0109bdc0b5ccdfe332a60fcfc'
+      file.last_modified.should == 'Mon, 05 Aug 2013 22:37:35 GMT'
+      file.size.should == 1071
+    end
+  end
+
+  describe "#create" do
+    it "should call post to fs/path with appropriate payload and return folder object" do
+      stub_request(:post, "https://test.egnyte.com/pubapi/v1/fs/apple/banana/New%20Folder")
+        .with(:headers => { 'Authorization' => 'Bearer access_token' }, :body => JSON.dump({"action" => "add_folder"}))
+        .to_return(:body => '', :status => 200)
+
+      folder = Egnyte::Folder.new({
+        'path' => 'apple/banana',
+        'name' => 'banana'
+      }, @session)
+
+      new_folder = folder.create('New Folder')
+      new_folder.name.should == 'New Folder'
+      new_folder.path.should == 'apple/banana/New Folder'
+      new_folder.folders.should == []
+    end
   end
 
   describe "Folder::find" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egnyte
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Benjamin Coe
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post