cloudinary 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3837b9826e6f31a35e478b9d8bbf81027cee43ece65f7df161b748fd5c21dd9
-  data.tar.gz: 3b47da18531bbfe2252f6cfe4a071bc5972c286c2f5777758d1b1a7e1a30b07e
+  metadata.gz: 2e5827b8b849956cb26923c951ff72b205ff34e898309513ec1a18eca3abd47f
+  data.tar.gz: 53acb20dcbd39a0dfa3d99c912c128e0731950893066a102bda1e4d267c1ebc2
 SHA512:
-  metadata.gz: 34d0a6214325094a27683345da51e605b7ba6f6ba5761d4c64478dea618dbf3d4ce14a255bf69d513704d72dca6ef5a27ee4bc6e5e81d66e5548341f9e7c2e8c
-  data.tar.gz: 383bbafb8b06b9bda3fdedbde2f6b7248bcee0bacd5576e98b8e9b79d9ff45cd7d1025056fe1edde412fbf4a04855ba4ea3af197c260374827026f7a0b883f55
+  metadata.gz: efd2057b536c8bbd339efce5046e23a1ee9d8c35cd398354f1ec3d72dcb98f9f2c0d7696441097b9e9de576dd98ae97c594e0368937f9ff60a52c5cd6556e98a
+  data.tar.gz: 19215c9db03f24c24b24aabfaf1bb887eaac5bd2c493890e2426a8523503c3235de85be0a3a243ce2ac31b52c8463f5ce4ef7f1db5775a06082436dc1610baca

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+
+1.13.0 / 2019-11-14
+===================
+
+New functionality and features
+------------------------------
+  * Add `SassC` `cloudinary-url` function
+  
+Other Changes
+-------------
+
+  * Fix ActiveStorage download not using `ssl` for `https`
+  * Fix resource type detection in ActiveStorage
+  * Fix `storage_type` instance method in `Cloudinary::CarrierWave` module
+  * Fix sample project, limit sqlite3 to a compatible version
+
 1.12.0 / 2019-10-02
 =============
 

data/lib/active_storage/service/cloudinary_service.rb

@@ -102,12 +102,11 @@ module ActiveStorage
       uri = URI(url)
       if block_given?
         instrument :streaming_download, key: key do
-          Net::HTTP.start(uri.host, uri.port) do |http|
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
             request = Net::HTTP::Get.new uri
             http.request request do |response|
               response.read_body &block
             end
-
           end
         end
       else
@@ -130,7 +129,7 @@ module ActiveStorage
                     else range.end
                     end
         req['range'] = "bytes=#{[range.begin, range_end].join('-')}"
-        res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
           http.request(req)
         end
         res.body.force_encoding(Encoding::BINARY)
@@ -165,14 +164,23 @@ module ActiveStorage
     end
 
     def resource_type(io, key = "")
-      return 'image' unless key.respond_to? :attributes
-      options = key.attributes
+      options = key.respond_to?(:attributes) ? key.attributes : {}
       content_type = options[:content_type] || (io.nil? ? '' : Marcel::MimeType.for(io))
-      case content_type.split('/')[0]
-      when 'video'
+      type, subtype = content_type.split('/')
+      case type
+      when 'video', 'audio'
         'video'
       when 'text'
         'raw'
+      when 'application'
+        case subtype
+        when 'pdf', 'postscript'
+          'image'
+        when 'vnd.apple.mpegurl', 'x-mpegurl', 'mpegurl' # m3u8
+          'video'
+        else
+          'raw'
+        end
       else
         'image'
       end

data/lib/cloudinary/carrier_wave.rb

@@ -10,7 +10,8 @@ module Cloudinary::CarrierWave
   def self.included(base)
     base.storage Cloudinary::CarrierWave::Storage
     base.extend ClassMethods
-    base.class_attribute :storage_type, :metadata
+    base.class_attribute :metadata
+    base.class_attribute :storage_type, instance_reader: false
     override_in_versions(base, :blank?, :full_public_id, :my_public_id, :all_versions_processors, :stored_version)
   end
 

data/lib/cloudinary/helper.rb

@@ -286,7 +286,7 @@ module CloudinaryHelper
     Cloudinary::Utils.private_download_url(public_id, format, options)
   end
 
-  # Helper method that uses the deprecated ZIP download API. 
+  # Helper method that uses the deprecated ZIP download API.
   # Replaced by cl_download_zip_url that uses the more advanced and robust archive generation and download API
   # @deprecated
   def cl_zip_download_url(tag, options = {})
@@ -296,7 +296,7 @@ module CloudinaryHelper
   # @see {Cloudinary::Utils.download_archive_url}
   def cl_download_archive_url(options = {})
     Cloudinary::Utils.download_archive_url(options)
-  end  
+  end
 
   # @see {Cloudinary::Utils.download_zip_url}
   def cl_download_zip_url(options = {})
@@ -318,7 +318,7 @@ module CloudinaryHelper
       if Cloudinary.config.enhance_image_tag
         alias_method :image_tag, :image_tag_with_cloudinary
         alias_method :image_path, :image_path_with_cloudinary
-      end    
+      end
     end
   end
 
@@ -419,3 +419,30 @@ rescue LoadError
   # no sass support. Ignore.
 end
 
+begin
+  require 'sassc'
+  require 'sassc/script/functions'
+  module SassC::Script::Functions
+    # Helper method for generating cloudinary_url in scss files.
+    #
+    # As opposed to sass(deprecated), optional named arguments are not supported, use hash map instead.
+    #
+    # Example:
+    #   Sass: cloudinary-url("sample", $quality: "auto", $fetch_format: "auto");
+    #  becomes
+    #   SassC: cloudinary-url("sample", ("quality": "auto", "fetch_format": "auto"));
+    #
+    # @param [::SassC::Script::Value::String] public_id The public ID of the resource
+    # @param [::SassC::Script::Value::Map] sass_options Additional options
+    #
+    # @return [::SassC::Script::Value::String]
+    def cloudinary_url(public_id, sass_options = {})
+      options = {}
+      sass_options.to_h.each { |k, v| options[k.value] = v.value }
+      url = Cloudinary::Utils.cloudinary_url(public_id.value, {:type => :asset}.merge(options))
+      ::SassC::Script::Value::String.new("url(#{url})")
+    end
+  end
+rescue LoadError
+  # no sassc support. Ignore.
+end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/spec/active_storage/service/cloudinary_service_spec.rb

@@ -7,13 +7,17 @@ if RUBY_VERSION > '2.2.2'
   CONFIGURATION_PATH = Pathname.new(File.expand_path("service/configurations.yml", __dir__))
   SERVICE = ActiveStorage::Service.configure(:cloudinary, SERVICE_CONFIGURATIONS)
 
+  TEST_IMG_PATH = Pathname.new(TEST_IMG)
+  TEST_VIDEO_PATH = Pathname.new(TEST_VIDEO)
+  TEST_RAW_PATH = Pathname.new(TEST_RAW)
+
   describe 'active_storage' do
     let(:key) {ActiveStorage::BlobKey.new({key: SecureRandom.base58(24), filename: BASENAME})}
 
     before :all do
       @key = ActiveStorage::BlobKey.new key: SecureRandom.base58(24), filename: BASENAME
       @service = self.class.const_get(:SERVICE)
-      @service.upload @key, TEST_IMG, tags: [TEST_TAG, TIMESTAMP_TAG, AS_TAG]
+      @service.upload @key, TEST_IMG_PATH, tags: [TEST_TAG, TIMESTAMP_TAG, AS_TAG]
     end
 
     after :all do
@@ -88,5 +92,16 @@ if RUBY_VERSION > '2.2.2'
       expect(Cloudinary::Uploader).to receive(:upload).with(TEST_IMG, hash_including(tags: override_tags))
       @service.upload(key, TEST_IMG, tags: override_tags)
     end
+
+    it "should correctly identify resource_type" do
+      expect(Cloudinary::Uploader).to receive(:upload).with(TEST_IMG_PATH, hash_including(resource_type: 'image'))
+      @service.upload(key, TEST_IMG_PATH)
+
+      expect(Cloudinary::Uploader).to receive(:upload).with(TEST_VIDEO_PATH, hash_including(resource_type: 'video'))
+      @service.upload(key, TEST_VIDEO_PATH)
+
+      expect(Cloudinary::Uploader).to receive(:upload).with(TEST_RAW_PATH, hash_including(resource_type: 'raw'))
+      @service.upload(key, TEST_RAW_PATH)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -342,8 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cloudinary
-rubygems_version: 2.7.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service