boxr 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15e90705ae77e54c7e29b60d798f78fb2f43df2
-  data.tar.gz: 88b53548306c6f9aecc6521f3392fe16bcfb3ce8
+  metadata.gz: 0665e63cc6208e2b553601a6a1748b3ab7e0b4b6
+  data.tar.gz: 2161c7d7914825edf273d40c1e576851bb766199
 SHA512:
-  metadata.gz: 3bb9d947f065884e1647534bab48dd7a1127d3262e55f339982fef9d4eaef930fc1f57c85436543ddbc76a63528fcf989a2ae7f350188381b6ce3b93f355a383
-  data.tar.gz: a2eb5cbc5cefb115f3f5db3b39ea7654391f4a6beb3e193b5dc3a92cf5b74728bb9e51e85a3b86e93cd904e4418be8ac63203445b2547cefce563039330d8740
+  metadata.gz: ed18bbde850f3662f24feb12b3e8243e73d2af181893a80076c006197eb949b7daba26a0919b3492dbcda4358993b24d4468a20d8c39aaab7e3de284ce1e6acf
+  data.tar.gz: 2d590a62dc56694c53a5c24b5d59e32ced3ed081173968763c73c700f517e25f0273481a5d66731c2abf7617d5dafb1e37659cbd51f703917752c823bbba07db

data/README.md

@@ -190,6 +190,9 @@ delete_old_version_of_file(file, file_version, if_match: nil)
 
 copy_file(file, parent, name: nil)
 
+embed_url(file, version: nil, disable_download: nil)
+alias :preview_url :embed_url
+
 thumbnail(file, min_height: nil, min_width: nil, max_height: nil, max_width: nil)
 
 create_shared_link_for_file(file, access: nil, unshared_at: nil, can_download: nil, can_preview: nil)

data/lib/boxr.rb

@@ -36,6 +36,16 @@ module Enumerable
   end
 end
 
+class BoxrMash < Hashie::Mash
+  def entries
+    self["entries"]
+  end
+
+  def size
+    self["size"]
+  end
+end
+
 module Boxr
   Oj.default_options = {:mode => :compat }
 
@@ -49,6 +59,7 @@ module Boxr
   BOX_CLIENT.send_timeout = 3600 #one hour; needed for lengthy uploads
   BOX_CLIENT.agent_name = "Boxr/#{Boxr::VERSION}"
   BOX_CLIENT.transparent_gzip_decompression = true 
+  #BOX_CLIENT.ssl_config.add_trust_ca("/Users/cburnette/code/ssh-keys/dev_root_ca.pem")
 
   def self.turn_on_debugging(device=STDOUT)
     BOX_CLIENT.debug_dev = device

data/lib/boxr/auth.rb

@@ -81,7 +81,7 @@ module Boxr
 
     if(res.status==200)
       body_json = Oj.load(res.body)
-      return Hashie::Mash.new(body_json)
+      return BoxrMash.new(body_json)
     else
       raise BoxrError.new(status: res.status, body: res.body, header: res.header)
     end

data/lib/boxr/client.rb

@@ -4,6 +4,9 @@ module Boxr
 
     attr_reader :access_token, :refresh_token, :client_id, :client_secret, :identifier, :as_user_id
 
+    #API_URI = "https://wcheng.inside-box.net/api/2.0"
+    #UPLOAD_URI = "https://upload.wcheng.inside-box.net/api/2.0"
+
     API_URI = "https://api.box.com/2.0"
     UPLOAD_URI = "https://upload.box.com/api/2.0"
     FILES_URI = "#{API_URI}/files"
@@ -124,7 +127,7 @@ module Boxr
         end
       end until offset - total_count >= 0
 
-      entries.flatten.map{|i| Hashie::Mash.new(i)}
+      entries.flatten.map{|i| BoxrMash.new(i)}
     end
 
     def post(uri, body, query: nil, success_codes: [201], process_body: true, content_md5: nil, content_type: nil, if_match: nil)
@@ -211,10 +214,10 @@ module Boxr
             @token_refresh_listener.call(@access_token, @refresh_token, @identifier) if @token_refresh_listener
           else
             if @as_user_id
-              new_token = Boxr::get_user_token(@as_user_id, private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, client_id: @client_id)
+              new_token = Boxr::get_user_token(@as_user_id, private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, client_id: @client_id, client_secret: @client_secret)
               @access_token = new_token.access_token
             else
-              new_token = Boxr::get_enterprise_token(private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, enterprise_id: @enterprise_id, client_id: @client_id)
+              new_token = Boxr::get_enterprise_token(private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, enterprise_id: @enterprise_id, client_id: @client_id, client_secret: @client_secret)
               @access_token = new_token.access_token
             end
           end
@@ -232,7 +235,7 @@ module Boxr
 
     def processed_response(res)
       body_json = Oj.load(res.body)
-      return Hashie::Mash.new(body_json), res
+      return BoxrMash.new(body_json), res
     end
 
     def build_fields_query(fields, all_fields_query)

data/lib/boxr/events.rb

@@ -5,7 +5,7 @@ module Boxr
       query = {stream_position: stream_position, stream_type: stream_type, limit: limit}
       
       events, response = get(EVENTS_URI, query: query)
-      Hashie::Mash.new({events: events["entries"], chunk_size: events["chunk_size"], next_stream_position: events["next_stream_position"]})
+      BoxrMash.new({events: events.entries, chunk_size: events.chunk_size, next_stream_position: events.next_stream_position})
     end
 
     def enterprise_events(created_after: nil, created_before: nil, stream_position: 0, event_type: nil, limit: 500)
@@ -17,7 +17,7 @@ module Boxr
 
         break if event_response.events.empty?
       end
-      Hashie::Mash.new({events: events, next_stream_position: stream_position})
+      BoxrMash.new({events: events, next_stream_position: stream_position})
     end
 
     def enterprise_events_stream(initial_stream_position, event_type: nil, limit: 500, refresh_period: 300)
@@ -42,7 +42,7 @@ module Boxr
       query['created_before'] = created_before.to_datetime.rfc3339 unless created_before.nil?
 
       events, response = get(EVENTS_URI, query: query)
-      Hashie::Mash.new({events: events["entries"], chunk_size: events["chunk_size"], next_stream_position: events["next_stream_position"]})
+      BoxrMash.new({events: events.entries, chunk_size: events.chunk_size, next_stream_position: events.next_stream_position})
     end
 
   end

data/lib/boxr/files.rb

@@ -116,14 +116,7 @@ module Boxr
         file_info, response = post(FILES_UPLOAD_URI, body, process_body: false, content_md5: content_md5)
       end
 
-      file_info["entries"][0]
-    end
-
-    def delete_file(file, if_match: nil)
-      file_id = ensure_id(file)
-      uri = "#{FILES_URI}/#{file_id}"
-      result, response = delete(uri, if_match: if_match)
-      result
+      file_info.entries[0]
     end
 
     def upload_new_version_of_file(path_to_file, file, content_modified_at: nil, send_content_md5: true,
@@ -142,14 +135,14 @@ module Boxr
         file_info, response = post(uri, attributes, process_body: false, content_md5: content_md5, if_match: if_match)
       end
 
-      file_info["entries"][0]
+      file_info.entries[0]
     end
 
     def versions_of_file(file)
       file_id = ensure_id(file)
       uri = "#{FILES_URI}/#{file_id}/versions"
       versions, response = get(uri)
-      versions["entries"]
+      versions.entries
     end
 
     def promote_old_version_of_file(file, file_version)
@@ -162,6 +155,13 @@ module Boxr
       new_version
     end
 
+    def delete_file(file, if_match: nil)
+      file_id = ensure_id(file)
+      uri = "#{FILES_URI}/#{file_id}"
+      result, response = delete(uri, if_match: if_match)
+      result
+    end
+
     def delete_old_version_of_file(file, file_version, if_match: nil)
       file_id = ensure_id(file)
       file_version_id = ensure_id(file_version)
@@ -182,6 +182,19 @@ module Boxr
       new_file
     end
 
+    def embed_url(file, version: nil, disable_download: nil)
+      file_id = ensure_id(file)
+      uri = "#{FILES_URI}/#{file_id}/embed_url"
+
+      query = {}
+      query[:version] = version unless version.nil?
+      query[:disable_download] = disable_download unless disable_download.nil?
+
+      result, response = get(uri, query: query)
+      result.url
+    end
+    alias :preview_url :embed_url
+
     def thumbnail(file, min_height: nil, min_width: nil, max_height: nil, max_width: nil)
       file_id = ensure_id(file)
       uri = "#{FILES_URI}/#{file_id}/thumbnail.png"

data/lib/boxr/search.rb

@@ -19,7 +19,7 @@ module Boxr
       query[:offset] = offset unless offset.nil?
 
       results, response = get(SEARCH_URI, query: query)
-      results["entries"]
+      results.entries
     end
 
   end

data/lib/boxr/tasks.rb

@@ -7,7 +7,7 @@ module Boxr
       query = build_fields_query(fields, TASK_FIELDS_QUERY)
 
       tasks, response = get(uri, query: query)
-      tasks["entries"]
+      tasks.entries
     end
 
     def create_task(file, action: :review, message: nil, due_at: nil)

data/lib/boxr/version.rb

@@ -1,3 +1,3 @@
 module Boxr
-  VERSION = "0.28.0"
+  VERSION = "0.29.0"
 end

data/spec/boxr_spec.rb

@@ -75,7 +75,7 @@ describe Boxr::Client do
 
     puts "create new folder"
     new_folder = BOX_CLIENT.create_folder(SUB_FOLDER_NAME, @test_folder)
-    expect(new_folder).to be_a Hashie::Mash
+    expect(new_folder).to be_a BoxrMash
     SUB_FOLDER = new_folder
 
     puts "update folder"
@@ -84,7 +84,7 @@ describe Boxr::Client do
 
     puts "copy folder"
     new_folder = BOX_CLIENT.copy_folder(SUB_FOLDER,@test_folder, name: "copy of #{SUB_FOLDER_NAME}")
-    expect(new_folder).to be_a Hashie::Mash
+    expect(new_folder).to be_a BoxrMash
     SUB_FOLDER_COPY = new_folder
 
     puts "create shared link for folder"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxr
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Chad Burnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler