sony-ci-api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c344e4f79a93bc0fab03b439d9279c3a49a4710d
-  data.tar.gz: 8071312023cf6bb2652931f383c431888a11401e
+  metadata.gz: c56ac6f9cc51f695641456413698265e1d82ec2e
+  data.tar.gz: dab28c484e7a829b236331ee28888597f72a4872
 SHA512:
-  metadata.gz: bc671a8b8b8c98a98d06b32cd15715e687cf97b6c3210d02fae851f27d722f2812fb4831cc94769ab8fdf971c65cc71707945ebc02facd6577c33e1881d165f8
-  data.tar.gz: 626375b4070d753c6a3239f09905d5d185f871234159304e2d7ca83d3af1d3e171b8728949e26361dc5ea6f0408239a2192aaacd34665e9edcf232411c6cf5f2
+  metadata.gz: 269293d95e6e5af47ab029cc23d7b0496c579d8f5d257852fc555a7158d038abc8e2018a38875bc5a00d7d50c7acbe969227b98d833a7ce131a5674222deacf0
+  data.tar.gz: 145424cd8926db041ec2739cf8e7b05a66ec6a15d599ade73b10498b99017e0e5349974e0593ce441b8380be76185cc024e0d13835cd94d6674199a35f887c7a

data/bin/sony-ci-api

@@ -15,7 +15,7 @@ ci = SonyCiAdmin.new(
 begin
   case args.keys.sort
 
-  when ['log', 'up']
+  when %w(log up)
     fail ArgumentError.new if args['log'].empty? || args['up'].empty?
     args['up'].each { |path| ci.upload(path, args['log'].first) }
 

data/lib/sony-ci-api.rb

@@ -1,4 +1,4 @@
 require_relative 'sony-ci-api/sony_ci_admin'
-# Nothing else: The outside world doesn't need to worry 
-# about the particular classes which are required, and 
-# sony_ci_admin.rb loads its own dependencies.
+# Nothing else: The outside world doesn't need to worry
+# about the particular classes which are required, and
+# sony_ci_admin.rb loads its own dependencies.

data/lib/sony-ci-api/sony_ci_admin.rb

@@ -19,7 +19,7 @@ class SonyCiAdmin < SonyCiBasic
   end
 
   # Full metadata for a windowed set of items.
-  def list(limit=50, offset=0)
+  def list(limit = 50, offset = 0)
     Lister.new(self).list(limit, offset)
   end
 
@@ -38,6 +38,10 @@ class SonyCiAdmin < SonyCiBasic
     Detailer.new(self).detail(asset_id)
   end
 
+  def multi_details(asset_ids, fields)
+    Detailer.new(self).multi_details(asset_ids, fields)
+  end
+
   class Detailer < SonyCiClient #:nodoc:
     def initialize(ci)
       @ci = ci
@@ -50,6 +54,17 @@ class SonyCiAdmin < SonyCiBasic
       handle_errors(curl)
       JSON.parse(curl.body_str)
     end
+
+    def multi_details(asset_ids, fields)
+      curl = Curl::Easy.http_post('https:''//api.cimediacloud.com/assets/details/bulk',
+                                  JSON.generate('assetIds' => asset_ids,
+                                                'fields' => fields)
+                                 ) do |c|
+        add_headers(c, 'application/json')
+      end
+      handle_errors(curl)
+      JSON.parse(curl.body_str)
+    end
   end
 
   class Deleter < SonyCiClient #:nodoc:
@@ -105,9 +120,7 @@ class SonyCiAdmin < SonyCiBasic
       if file.size >= 5 * 1024 * 1024
         initiate_multipart_upload(file)
         part = 0
-        while part do
-          part = do_multipart_upload_part(file, part) 
-        end
+        part = do_multipart_upload_part(file, part) while part
         complete_multipart_upload
       else
         singlepart_upload(file)
@@ -151,7 +164,7 @@ class SonyCiAdmin < SonyCiBasic
     end
 
     CHUNK_SIZE = 10 * 1024 * 1024
-    
+
     def do_multipart_upload_part(file, part)
       fragment = file.read(CHUNK_SIZE)
       return unless fragment
@@ -159,7 +172,7 @@ class SonyCiAdmin < SonyCiBasic
         add_headers(c, 'application/octet-stream')
       end
       handle_errors(curl)
-      return part + 1
+      part + 1
     end
 
     def complete_multipart_upload
@@ -170,4 +183,3 @@ class SonyCiAdmin < SonyCiBasic
     end
   end
 end
-

data/lib/sony-ci-api/sony_ci_basic.rb

@@ -9,7 +9,7 @@ class SonyCiBasic
   attr_reader :workspace_id
 
   # Either +credentials_path+ or a +credentials+ object itself must be supplied.
-  def initialize(opts={}) # rubocop:disable PerceivedComplexity, CyclomaticComplexity
+  def initialize(opts = {}) # rubocop:disable PerceivedComplexity, CyclomaticComplexity
     unrecognized_opts = opts.keys - [:verbose, :credentials_path, :credentials]
     fail "Unrecognized options #{unrecognized_opts}" unless unrecognized_opts == []
 
@@ -20,7 +20,7 @@ class SonyCiBasic
     credentials = opts[:credentials] || YAML.load_file(opts[:credentials_path])
 
     credentials.keys.sort.tap do |actual|
-      expected = ['username', 'password', 'client_id', 'client_secret', 'workspace_id'].sort
+      expected = %w(username password client_id client_secret workspace_id).sort
       fail "Expected #{expected} in ci credentials, not #{actual}" if actual != expected
     end
 
@@ -60,7 +60,7 @@ class SonyCiBasic
     def download(asset_id)
       hit = @@cache[asset_id]
       if !hit || hit[:expires] < Time.now
-        
+
         curl = Curl::Easy.http_get('https'"://api.cimediacloud.com/assets/#{asset_id}/download") do |c|
           add_headers(c)
         end

data/lib/sony-ci-api/sony_ci_client.rb

@@ -1,5 +1,5 @@
 class SonyCiClient #:nodoc:
-  def add_headers(curl, mime=nil)
+  def add_headers(curl, mime = nil)
     # on_missing and on_failure exist...
     # but any exceptions are caught and turned into warnings:
     # You need to check the response code at the end
@@ -8,7 +8,8 @@ class SonyCiClient #:nodoc:
     curl.headers['Authorization'] = "Bearer #{@ci.access_token}"
     curl.headers['Content-Type'] = mime if mime
   end
+
   def handle_errors(curl)
-    raise "#{curl.status}: #{curl.url}" if curl.response_code.to_s !~ /^2../
+    fail "#{curl.status}: #{curl.url}\nHEADERS: #{curl.headers}\nPOST: #{curl.post_body}\nRESPONSE: #{curl.body}" if curl.response_code.to_s !~ /^2../
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sony-ci-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chuck McCallum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies: []
 description: Wrapper for the Sony Ci API (http://developers.cimediacloud.com/)
 email: chuck_mccallum@wgbh.org