vidispine 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad78c8b766bf87d952d77f3a73a667d887b064f
-  data.tar.gz: eb13dce39554cdd7a0b4b1b00e212ecb7a5abe72
+  metadata.gz: b57220a13423aaf8fab088c32d0f837222ed74f2
+  data.tar.gz: f853f25d95937d7ef4b58d8b4236156e9f67437d
 SHA512:
-  metadata.gz: 18a6979587fe7a8d85f90dcb248c7cb45558e6d8393a0064a921fa6d8000a7206b33b5f9d483f5bf5fee1ff7d074cfd6905e58b8849f3e9989361991efed13bf
-  data.tar.gz: 867ace58974e2d2615bfba584b00585010db7438aeff9dd6dc6c520944898be4990d7f3b9409fd1370e45662340e535885523501245c39526b244656d97a5c86
+  metadata.gz: e1b99aa261d29fcbcd41f270762d174b4f98222554504f45e8a5e047153e7ea46926a03d5d77a5b4cfc116f86a4ffb80b7f992890dda387c6be9fbb1ab35050f
+  data.tar.gz: 43e181f59a8e2ace6afd9a4ddcdf0a06b1efa496a7bc2d8ca60b28ca2d0371b39b6c0256decbbfac3664437dc8639862c346b06ac6fa6b52a37e6aa288e40f6c

data/lib/vidispine/api/client.rb

@@ -849,12 +849,13 @@ module Vidispine
         process_request(_request, options)
       end
       
-      # @note UNDOCUMENTED API METHOD
       # @param [Hash] args
       # @option args [String] :storage_id (Required)
       # @option args [String] :path (Required)
       # @option args [Boolean] :create_only
       # @option args [String] :state
+      #
+      # @see http://apidoc.vidispine.com/latest/ref/storage/file.html#create-a-file-entity-in-the-database
       def storage_file_create(args = { }, options = { })
         _request = Requests::BaseRequest.new(
           args,

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

@@ -188,10 +188,12 @@ module Vidispine
         # @option args [Any] :body (nil)
         # @param [Hash] options
         # @option options [Hash] :default_request_headers (@default_request_headers)
+        # @option options [Hash] :headers
+        # @option options [Hash] :query
         def build_request(method_name = :get, args = { }, options = { })
           headers = args[:headers] || options[:headers] || { }
           path = args[:path] || ''
-          query = args[:query] || { }
+          query = args[:query] || options[:query] || { }
           body = args[:body]
 
           # Allow the default request headers to be overridden

data/lib/vidispine/api/client/requests/base_request.rb

@@ -200,7 +200,7 @@ module Vidispine
 
           def query
             @query ||= begin
-              query_arguments.is_a?(Hash) ? query_arguments.map { |k,v| "#{CGI.escape(k.to_s).gsub('+', '%20')}=#{CGI.escape(v.respond_to?(:to_s) ? v.to_s : v).gsub('+', '%20')}" }.join('&') : query_arguments
+              query_arguments.is_a?(Hash) ? (client.http_client.default_query_data.merge(query_arguments)).map { |k,v| "#{CGI.escape(k.to_s).gsub('+', '%20')}=#{CGI.escape(v.respond_to?(:to_s) ? v.to_s : v).gsub('+', '%20')}" }.join('&') : query_arguments
             end
           end
 

data/lib/vidispine/api/utilities.rb

@@ -7,12 +7,14 @@ module Vidispine
 
     class Utilities < Client
 
+      DEFAULT_REQUIRE_METADATA_MAP_MATCH = false
+
       attr_accessor :default_metadata_map, :default_storage_map
 
       def initialize(args = { })
         @default_storage_map = args[:storage_map] || { }
         @default_metadata_map = args[:metadata_map] || { }
-
+        @default_require_metadata_map_match = args.fetch(:require_metadata_map_match, DEFAULT_REQUIRE_METADATA_MAP_MATCH)
         super
       end
 
@@ -309,9 +311,11 @@ module Vidispine
       # @return [Hash]
       def self.build_metadata_document(metadata_in, map = { }, options = { })
         # map = (options[:default_metadata_map]).merge((options[:metadata_map] || { }).merge(map))
+        require_map_match = options.fetch(:require_metadata_map_match, DEFAULT_REQUIRE_METADATA_MAP_MATCH)
         groups = { }
         metadata_in.each do |k,v|
           _map = map[k]
+          _map = k if _map.nil? && !require_map_match
           next unless _map
           _map = [ _map ] unless _map.is_a?(Array)
           _map.each do |_map_|
@@ -349,19 +353,20 @@ module Vidispine
 
       def build_metadata_document(metadata_in, map = { }, options = { })
         map = (options[:default_metadata_map] || default_metadata_map).merge((options[:metadata_map] || { }).merge(map))
+        _require_metadata_map_match = options[:require_metadata_map_match]
+        options[:require_metadata_map_match] = @default_require_metadata_map_match if _require_metadata_map_match.nil?
         self.class.build_metadata_document(metadata_in, map, options)
       end
 
-      # @return [Array]
-      def build_metadata_documents(metadata_in, map = { }, options = { })
-        map = (options[:default_metadata_map] || default_metadata_map).merge(map.merge(options[:metadata_map] || { }))
+      def self.build_metadata_documents(metadata_in, map = { }, options = { })
+        require_map_match = options.fetch(:require_metadata_map_match, DEFAULT_REQUIRE_METADATA_MAP_MATCH)
         groups = { }
         metadata_in.each do |k,v|
-          _map = map[k]
+          _map = require_map_match ? map[k] : map.fetch(k, k)
           next unless _map
           _map = [ _map ] unless _map.is_a?(Array)
           _map.each do |_map_|
-            _map_ = { :field => _map_ } if _map_.is_a?(String)
+            _map_ = { :field => _map_ } if _map_.is_a?(String) || _map.is_a?(Symbol)
             #puts "##{_map_[:group].inspect} #{_map_.class.name} #{_map_.inspect}"
             (groups[_map_[:group]] ||= { })[_map_[:field]] = v
           end
@@ -385,6 +390,15 @@ module Vidispine
         docs
       end
 
+
+      # @return [Array]
+      def build_metadata_documents(metadata_in, map = { }, options = { })
+        map = (options[:default_metadata_map] || default_metadata_map).merge(map.merge(options[:metadata_map] || { }))
+        _require_metadata_map_match = options[:require_metadata_map_match]
+        options[:require_metadata_map_match] = @default_require_metadata_map_match if _require_metadata_map_match.nil?
+        self.class.build_metadata_documents(metadata_in, map, options)
+      end
+
       # @param [String|Hash] field_group
       # @return [Hash]
       def cantemo_metadata_field_group_map(field_group, options = { })
@@ -534,6 +548,8 @@ module Vidispine
         args = symbolize_keys(args, false)
         _response = { }
 
+        original_shape_tag_name = args[:original_shape_tag_name] || 'original'
+
         # 1. Receive a File Path
         file_path = args[:file_path]
         raise ArgumentError, ':file_path is a required argument.' unless file_path
@@ -648,10 +664,14 @@ module Vidispine
           _response[:collection_object_add] = collection_object_add_response
         end
 
+        create_thumbnails = args.fetch(:create_thumbnails, true)
+        create_posters = args.fetch(:create_posters, 3)
+
         unless shape
           # 6. Add the file as the original shape
           logger.debug { 'Adding the file as the Original Shape.' }
-          item_shape_import_response = item_shape_import(:item_id => item_id, :file_id => file_id, :tag => 'original')
+          item_shape_import_response = import_placeholder_item(:item_id => item_id, :file_id => file_id, :tag => original_shape_tag_name)
+          # item_shape_import_response = item_shape_import(:item_id => item_id, :file_id => file_id, :tag => original_shape_tag_name)
           _response[:item_shape_import] = item_shape_import_response
 
           job_id = item_shape_import_response['jobId']
@@ -693,8 +713,6 @@ module Vidispine
           end
 
           # 8. Generate the Thumbnails and Poster Frame
-          create_thumbnails = args.fetch(:create_thumbnails, true)
-          create_posters = args.fetch(:create_posters, 3)
           if (create_thumbnails or create_posters)
             logger.debug { 'Generating Thumbnails(s) and Poster Frame.' }
             args_out = { :item_id => item_id }

data/lib/vidispine/version.rb

@@ -1,3 +1,3 @@
 module Vidispine
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidispine
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler