vidispine 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd19ae6c7308f20a78830b2fd0eb01894fc3fd1
-  data.tar.gz: 91e0f6c339c12f3c42df64f47c50cb9f3a5ce3bf
+  metadata.gz: f0cbef97ea08620518d549c8e63535b4f874f837
+  data.tar.gz: c9390762b54cb983df4162a76db719d2292a28a2
 SHA512:
-  metadata.gz: 92dfee18a8d4097c7656768f7893313fbc6b68af8b03cdbc29343192663b492fc5a18c058daf3ddbcfca8908a6025d0d2ab4cdbec216b54a58945e2126520679
-  data.tar.gz: 170acf9adc3ba88657229b3c3b6ab568c466fa7f7feedce0301eb1291d80392d6a2afcb7f4d062870022eff1eb63aa35b9c3267099d007d334df3c7cbae96eb0
+  metadata.gz: 0700cdddca6b418fdf8625782f6a1101bd2f3dd7f3a32f96dda9202355862ccdc236ecff8a7a1ef24c58853446a23691c8a78227ee1311aff0c96d509825c4d5
+  data.tar.gz: f1315859eeab23b15169e13b02887150323c2a29b2f1637a337a98ab9ab2a7a7be18ccf55243e07ba592ee8771cf6e17c053be210e5d0d8a2cae652e6f90cadd

data/lib/vidispine/api/client.rb

@@ -355,7 +355,7 @@ module Vidispine
         _request = Requests::BaseRequest.new(
           args,
           {
-            :http_path   => '/item/#{item_id}/field-group',
+            :http_path   => '/item/#{path_arguments[:item_id]}/field-group',
             :http_method => :get,
             :parameters  => [
               { :name => :item_id, :send_in => :path, :required => true },
@@ -371,7 +371,7 @@ module Vidispine
         _request = Requests::BaseRequest.new(
             args,
             {
-              :http_path => '/item/#{item_id}/field-group/#{field_group}',
+              :http_path => '/item/#{path_arguments[:item_id]}/field-group/#{path_arguments[:field_group]}',
               :http_method => :put,
               :default_parameter_send_in_value => :path,
               :parameters => [
@@ -880,7 +880,7 @@ module Vidispine
               :notification,
               :notificationData,
               :priority,
-              :jobmetadata
+              :jobmetadata,
             ]
           }.merge(options)
         )
@@ -900,13 +900,13 @@ module Vidispine
           {
             :http_path => 'storage/#{path_arguments[:storage_id]}/file',
             :http_method => :post,
+            :default_parameter_send_in_value => :body,
             :parameters => [
               { :name => :storage_id, :send_in => :path, :required => true },
-
-              :createOnly,
+              { :name => :createOnly, :send_in => :query },
+              :path,
               :state,
-
-              { :name => :path, :send_in => :body }
+              :uri,
             ]
           }.merge(options)
         )
@@ -956,7 +956,6 @@ module Vidispine
           }.merge(options)
         )
         process_request(_request, options)
-
       end
 
       # @see http://apidoc.vidispine.com/4.2/ref/storage/file.html#list-files-in-storage

data/lib/vidispine/api/client/http_client.rb

@@ -143,7 +143,6 @@ module Vidispine
         def response_parsed
           @response_parsed ||= begin
             response_body = response.respond_to?(:body) ? response.body : ''
-            logger.debug { "Parsing Response. #{response_body.inspect}" }
 
             case response.content_type
             when 'application/json'
@@ -151,6 +150,9 @@ module Vidispine
             else
                response_body
             end
+          rescue => e
+            logger.debug { "Error Parsing Response. #{e.message}\n#{response_body.inspect}" }
+             raise
           end
         end
 
@@ -216,9 +218,13 @@ module Vidispine
           _request = klass.new(@uri.request_uri, _headers)
 
           if _request.request_body_permitted?
-            _body = (body and !body.is_a?(String)) ? JSON.generate(body) : body
-            logger.debug { "Processing Body: '#{_body}'" }
-            _request.body = _body if _body
+            begin
+              _body = (body and !body.is_a?(String)) ? JSON.generate(body) : body
+              _request.body = _body if _body
+            rescue => e
+              logger.error { "Exception Processing Request Body: #{e.message}\n#{_body}"}
+              raise
+            end
           end
 
           _request

data/lib/vidispine/api/utilities.rb

@@ -519,6 +519,10 @@ module Vidispine
 
         # collections = ( (collections_get || { })['collection'] || [ ] )
 
+        comparison_method, comparison_value = options.fetch(:case_sensitive, true) ? [ :eql?, true ] : [ :casecmp, 0 ]
+        collections_search_method = return_first_match ? :find : :select
+
+        collection = nil
         first = 1
         limit = 1000
         collections = [ ]
@@ -526,13 +530,16 @@ module Vidispine
           r = collections_get(:first => first, :number => limit)
           _collections = r['collection']
           break if _collections.empty?
+
+          if return_first_match
+            collection = _collections.send(collections_search_method) { |c| c['name'].send(comparison_method, collection_name) == comparison_value }
+            break if collection
+          end
+
           collections.concat _collections
           first += _collections.length
         end
-
-        comparison_method, comparison_value = options.fetch(:case_sensitive, true) ? [ :eql?, true ] : [ :casecmp, 0 ]
-        collections_search_method = return_first_match ? :find : :select
-        collections.send(collections_search_method) { |c| c['name'].send(comparison_method, collection_name) == comparison_value }
+        return_first_match ? collection : collections.send(collections_search_method) { |c| c['name'].send(comparison_method, collection_name) == comparison_value }
       end
 
       # Adds a file using the files path
@@ -1554,13 +1561,10 @@ module Vidispine
           if (file || { })['fileAlreadyExists']
             file_already_existed = true
             _message = file['fileAlreadyExists']
-            logger.warn { "Running Recreation of Existing File Work Around: #{_message}" }
+            logger.warn { "Running Re-creation of Existing File Workaround: #{_message}" }
             storage_file_get_response = file = storage_file_get(:storage_id => storage_id, :file_id => _message['fileId'], :include_item => include_item)
           end
           raise "Error Creating File on Storage. Response: #{response.inspect}" unless (file || { })['id']
-
-          # Workaround: Ran into an issue with a v4.15 installation where setting file state on creation wasn't working
-          storage_file_state_set(:file_id => file['id'], :state => creation_state) if file['state'] != creation_state
         end
 
         logger.debug { "Method: #{__method__} Response: #{file.inspect}" }

data/lib/vidispine/version.rb

@@ -1,3 +1,3 @@
 module Vidispine
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidispine
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler