scrivito_sdk 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6f6eeb2b370c0b1c082d72ab79945fc5e6e829
-  data.tar.gz: 951c6bf4700f0b98d2ae83bb8d21b7fb180ef65c
+  metadata.gz: f33f97ff4b8f4963b1af0d002f3b0aeec65eed41
+  data.tar.gz: ba738b23d73a7a6a65946e7d88f193835c947815
 SHA512:
-  metadata.gz: 0b610d0d3e736a780c64ec0f35f7ebddb32376dc1a62bdf4e8ff788199a63ad6e24459e10ac8e938f24c07454b37f94b884dff24ed675d3428419ffa18abbe94
-  data.tar.gz: 5bcac040e866182fe1e42162fef81c5d094d07f8a72000c7e808d4c017e535280fcb23e36a8b774a7f8c3cf7748f799f42dbbc67f775dc3a5e448dd6de3b9475
+  metadata.gz: 4608377dc73061e31818562db827f225fd76c260e0bbcfea90fb8b002bf8086a62fc411a164ff580d8d9a87b3ddecf1633a47a1eafed3e792a6a746bd158dc7d
+  data.tar.gz: c4cae0d622dee84ab6c4826de37b740c0b540d9ca3377ebec374bfeb038bbe9e3409ea85254e2d41035b9d3161e1532e6a41132b1a68da7316e26a48d5039ba1

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Thu Nov 26 13:03:28 2015
+## Certificate data from Mozilla as of: Mon Nov 30 13:21:18 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_ui.js

@@ -30581,9 +30581,6 @@ var scrivito = {};
     // File must be appended last, otherwise S3 will complain.
     form_data.append('file', binary.blob || binary.file);
 
-    permission.blob.filename = binary.filename;
-    permission.blob.content_type = binary.content_type;
-
     return $.ajax({type: 'POST', url: permission.url, data: form_data,
       // These are needed in order for jQuery to work properly with a FormData.
       contentType: false,

data/lib/scrivito/cms_rest_api.rb

@@ -69,20 +69,14 @@ module Scrivito
     def self.upload_future_binary(binary, obj_id)
       if binary.id_to_be_copied
         id = normalize_path_component(binary.id_to_be_copied)
-        put("blobs/#{id}/copy", {
-          destination_obj_id: obj_id,
-          filename: binary.filename,
-          content_type: binary.content_type,
-        })
+        put("blobs/#{id}/copy", destination_obj_id: obj_id, filename: binary.filename,
+          content_type: binary.content_type)
       else
         upload_permission = get('blobs/upload_permission')
-        upload = perform_file_upload(
-          file: binary.file_to_be_uploaded,
-          filename: binary.filename,
-          content_type: binary.content_type,
-          upload_permission: upload_permission,
-        )
-        activate_upload(upload: upload, obj_id: obj_id)
+        upload = perform_file_upload(binary.file_to_be_uploaded, binary.content_type,
+          upload_permission)
+        activate_upload(upload: upload, obj_id: obj_id, filename: binary.filename,
+          content_type: binary.content_type)
       end
     end
 
@@ -189,15 +183,16 @@ module Scrivito
         end
       end
 
-      def perform_file_upload(file:, filename:, content_type:, upload_permission:)
+      def perform_file_upload(file, content_type, upload_permission)
         uri = URI.parse(upload_permission['url'])
+
         File.open(file) do |open_file|
           upload_io = UploadIO.new(open_file, content_type, File.basename(file))
           params = upload_permission['fields'].merge('file' => upload_io)
           request = Net::HTTP::Post::Multipart.new(uri.path, params)
           response = ConnectionManager.request(uri, request)
           if response.code.starts_with?('2')
-            upload_permission['blob'].merge('filename' => filename, 'content_type' => content_type)
+            upload_permission['blob']
           else
             raise ScrivitoError, "File upload failed with code #{response.code}"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable