RubyGems - cloudinary - Versions diffs - 1.11.1 → 1.12.0 - Mend

cloudinary 1.11.1 → 1.12.0

Files changed (90) hide show

data/spec/active_storage/dummy/public/500.html ADDED

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+<body class="rails-default-error-page">
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
+  </div>
+</body>
+</html>

data/spec/active_storage/dummy/public/apple-touch-icon-precomposed.png ADDED

File without changes

data/spec/active_storage/dummy/public/apple-touch-icon.png ADDED

File without changes

data/spec/active_storage/dummy/public/favicon.ico ADDED

File without changes

data/spec/active_storage/fixtures/files/colors.bmp ADDED

Binary file

data/spec/active_storage/fixtures/files/empty_file.txt ADDED

File without changes

data/spec/active_storage/fixtures/files/favicon.ico ADDED

Binary file

data/spec/active_storage/fixtures/files/icon.psd ADDED

Binary file

data/spec/active_storage/fixtures/files/icon.svg ADDED

@@ -0,0 +1,13 @@
+<!-- The XML declaration is intentionally omitted. -->
+<svg width="792px" height="584px" viewBox="0 0 792 584" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path d="M9.51802657,28.724593 C9.51802657,18.2155955 18.1343454,9.60822622 28.6542694,9.60822622 L763.245541,9.60822622 C773.765465,9.60822622 782.381784,18.2155955 782.381784,28.724593 L782.381784,584 L792,584 L792,28.724593 C792,12.911054 779.075522,0 763.245541,0 L28.7544592,0 C12.9244782,0 0,12.911054 0,28.724593 L0,584 L9.61821632,584 C9.51802657,584 9.51802657,28.724593 9.51802657,28.724593 L9.51802657,28.724593 Z" id="Shape" opacity="0.3" fill="#CCCCCC"></path>
+    <circle id="Oval" fill="#FFCC33" cx="119.1" cy="147.2" r="33"></circle>
+    <circle id="Oval" fill="#3399FF" cx="119.1" cy="281.1" r="33"></circle>
+    <circle id="Oval" fill="#FF3333" cx="676.1" cy="376.8" r="33"></circle>
+    <circle id="Oval" fill="#FFCC33" cx="119.1" cy="477.2" r="33"></circle>
+    <rect id="Rectangle-path" opacity="0.75" fill="#CCCCCC" x="176.5" y="130.5" width="442.1" height="33.5"></rect>
+    <rect id="Rectangle-path" opacity="0.75" fill="#CCCCCC" x="176.5" y="183.1" width="442.1" height="33.5"></rect>
+    <rect id="Rectangle-path" opacity="0.75" fill="#CCCCCC" x="176.5" y="265.8" width="442.1" height="33.5"></rect>
+    <rect id="Rectangle-path" opacity="0.75" fill="#CCCCCC" x="176.5" y="363.4" width="442.1" height="33.5"></rect>
+    <rect id="Rectangle-path" opacity="0.75" fill="#CCCCCC" x="176.5" y="465.3" width="442.1" height="33.5"></rect>
+</svg>

data/spec/active_storage/fixtures/files/image.gif ADDED

Binary file

data/spec/active_storage/fixtures/files/racecar.jpg ADDED

Binary file

data/spec/active_storage/fixtures/files/racecar.tif ADDED

Binary file

data/spec/active_storage/fixtures/files/racecar_rotated.jpg ADDED

Binary file

data/spec/active_storage/fixtures/files/report.pdf ADDED

Binary file

data/spec/active_storage/fixtures/files/rotated_video.mp4 ADDED

Binary file

data/spec/active_storage/fixtures/files/video.mp4 ADDED

Binary file

data/spec/active_storage/fixtures/files/video_with_rectangular_samples.mp4 ADDED

Binary file

data/spec/active_storage/fixtures/files/video_with_undefined_display_aspect_ratio.mp4 ADDED

Binary file

data/spec/active_storage/fixtures/files/video_without_video_stream.mp4 ADDED

Binary file

data/spec/active_storage/service/cloudinary_service_spec.rb ADDED

@@ -0,0 +1,92 @@
+if RUBY_VERSION > '2.2.2'
+  require 'spec_helper'
+  AS_TAG = "active_storage_" + SUFFIX
+  BASENAME = File.basename(TEST_IMG, '.*')
+  CONFIGURATION_PATH = Pathname.new(File.expand_path("service/configurations.yml", __dir__))
+  SERVICE = ActiveStorage::Service.configure(:cloudinary, SERVICE_CONFIGURATIONS)
+  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]
+    end
+    after :all do
+      Cloudinary::Api.delete_resources_by_tag AS_TAG
+    end
+    describe :url_for_direct_upload do
+      it "should use the key" do
+        key = SecureRandom.base58(24)
+        url = @service.url_for_direct_upload(key)
+        expect(url).not_to include(BASENAME)
+        expect(url).to include("public_id=#{key}")
+      end
+      it "should include the key in a context field" do
+        key = SecureRandom.base58(24)
+        url = @service.url_for_direct_upload(key)
+        expect(url).to include("context=active_storage_key%3D#{key}")
+      end
+    end
+    it "should support uploading to Cloudinary" do
+      url = @service.url_for_direct_upload(key, tags: [TEST_TAG, TIMESTAMP_TAG, AS_TAG])
+      uri = URI.parse url
+      request = Net::HTTP::Put.new uri.request_uri
+      file = File.open(TEST_IMG)
+      request.body_stream = file
+      request['content-length'] = file.size
+      request['content-type'] = 'image/png'
+      response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        http.request request
+      end
+      result = Cloudinary::Utils.json_decode(response.body)
+      expect(result['error']).not_to be_truthy
+      #Same test as uploader_spec "should successfully upload file"
+      expect(result["width"]).to eq(TEST_IMG_W)
+      expect(result["height"]).to eq(TEST_IMG_H)
+      expected_signature = Cloudinary::Utils.api_sign_request({:public_id => result["public_id"], :version => result["version"]}, Cloudinary.config.api_secret)
+      expect(result["signature"]).to eq(expected_signature)
+    end
+    it "should check if resource exists" do
+      expect(@service.exist?(@key)).to be_truthy
+      expect(@service.exist?(@key + "nonsense")).to be_falsey
+    end
+    it "should delete a resource" do
+      @service.delete @key
+      expect(@service.exist?(@key)).to be_falsey
+    end
+    it "should fail to delete nonexistent key" do
+      expect {@service.delete SecureRandom.base58(24)}.not_to raise_error
+    end
+    it "should support transformations" do
+      url = @service.url(@key, crop: 'scale', width: 100)
+      expect(url).to match(/c_scale,w_100/)
+    end
+    it "should use global configuration options" do
+      tags = SERVICE_CONFIGURATIONS[:cloudinary][:tags]
+      expect(tags).not_to be_empty, "Please set a tags value under cloudinary in #{CONFIGURATION_PATH}"
+      expect(Cloudinary::Uploader).to receive(:upload).with(TEST_IMG, hash_including(tags: tags))
+      @service.upload(key, TEST_IMG, tags: tags)
+    end
+    it "should accept options that override global configuration" do
+      tags = SERVICE_CONFIGURATIONS[:cloudinary][:tags]
+      expect(tags).not_to be_empty, "Please set a tags value under cloudinary in #{CONFIGURATION_PATH}"
+      override_tags = [TEST_TAG, TIMESTAMP_TAG, AS_TAG]
+      expect(override_tags).not_to eql(tags), "Overriding tags should be different from configuration"
+      expect(Cloudinary::Uploader).to receive(:upload).with(TEST_IMG, hash_including(tags: override_tags))
+      @service.upload(key, TEST_IMG, tags: override_tags)
+    end
+  end
+end

data/spec/active_storage/service/configurations.yml ADDED

@@ -0,0 +1,4 @@
+cloudinary:
+  service: Cloudinary
+  tags:
+    - ActiveStorageTestTag

data/spec/active_storage/test_helper.rb ADDED

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+ENV['RAILS_ENV'] ||= 'test'
+require_relative './dummy/config/environment'
+require "bundler/setup"
+require "active_support"
+require "rails"
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "active_storage/engine"
+require "net/http"
+require "active_support/core_ext/securerandom"
+require "active_storage/database/setup"
+begin
+  require "byebug"
+rescue LoadError
+end
+require "active_job"
+ActiveJob::Base.queue_adapter = :test
+ActiveJob::Base.logger = ActiveSupport::Logger.new(nil)
+require "yaml"
+SERVICE_CONFIGURATIONS = begin
+  erb = ERB.new(Pathname.new(File.expand_path("service/configurations.yml", __dir__)).read)
+  configuration = YAML.load(erb.result) || {}
+  configuration.deep_symbolize_keys
+rescue Errno::ENOENT
+  puts "Missing service configuration file in test/service/configurations.yml"
+  {}
+end
+ActiveStorage.logger = ActiveSupport::Logger.new(nil)
+ActiveStorage.verifier = ActiveSupport::MessageVerifier.new("Testing")
+require "global_id"
+GlobalID.app = "ActiveStorageExampleApp"
+ActiveRecord::Base.send :include, GlobalID::Identification

data/spec/api_spec.rb CHANGED

@@ -35,6 +35,14 @@ describe Cloudinary::Api do
     end
   end
+  it "should allow using derived_next_cursor when listing details of a single resource" do
+    expected = {
+      [:payload, :derived_next_cursor] => "b16b8bd80426df43a107f26b0348"
+    }
+    expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+    @api.resource("test", {"derived_next_cursor" => "b16b8bd80426df43a107f26b0348"})
+  end
   it "should allow listing resource_types" do
     expect(@api.resource_types()["resource_types"]).to include("image")
   end
@@ -137,6 +145,15 @@ describe Cloudinary::Api do
     expect(resource["quality_analysis"]).to have_key("focus")
   end
+  it "should support the cinemagraph_analysis parameter" do
+    expected = {
+        [:payload, :cinemagraph_analysis] => true,
+        [:method] => :get
+    }
+    expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+    @api.resource(test_id_1, :cinemagraph_analysis => true)
+  end
   it "should allow deleting derived resource" do
     derived_resource_id = "derived_id"
     expect(RestClient::Request).to receive(:execute).with(deep_hash_value( {[:payload, :derived_resource_ids] => derived_resource_id}))
@@ -359,7 +376,7 @@ describe Cloudinary::Api do
   end
   it "should support requesting raw conversion" do
-    result = Cloudinary::Uploader.upload("spec/docx.docx", :resource_type => :raw, :tags => [TEST_TAG, TIMESTAMP_TAG])
+    result = Cloudinary::Uploader.upload(TEST_RAW, :resource_type => :raw, :tags => [TEST_TAG, TIMESTAMP_TAG])
     expect{Cloudinary::Api.update(result["public_id"], {:resource_type => :raw, :raw_convert => :illegal})}.to raise_error(Cloudinary::Api::BadRequest, /^Illegal value|not a valid/)
   end
@@ -395,15 +412,55 @@ describe Cloudinary::Api do
     Cloudinary::Api.resources_by_moderation(:manual, :approved, :max_results => 1000)
   end
-  it "should support listing folders" do
-    expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:url] => /.*\/folders$/, [:method] => :get))
-    Cloudinary::Api.root_folders
-    expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:url] => /.*\/folders\/test_folder1$/, [:method] => :get))
-    Cloudinary::Api.subfolders("test_folder1")
-  end
-  it "should throw if folder is missing" do
-    expect{Cloudinary::Api.subfolders("I_do_not_exist")}.to raise_error(Cloudinary::Api::NotFound)
+  describe 'folders' do
+    it 'should create folder' do
+      expected = {
+          [:url] => /.*\/folders\/#{UNIQUE_TEST_FOLDER}$/,
+          [:method] => :post
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      @api.create_folder(UNIQUE_TEST_FOLDER)
+    end
+    it "should support listing folders" do
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:url] => /.*\/folders$/, [:method] => :get))
+      Cloudinary::Api.root_folders
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:url] => /.*\/folders\/test_folder1$/, [:method] => :get))
+      Cloudinary::Api.subfolders("test_folder1")
+    end
+    it "should URL escape the folder name" do
+      expected = {
+        [:url] => %r".*\/folders\/sub%5Efolder%20test$"
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      Cloudinary::Api.subfolders("sub^folder test")
+    end
+    it "should throw if folder is missing" do
+      expect{Cloudinary::Api.subfolders("I_do_not_exist")}.to raise_error(Cloudinary::Api::NotFound)
+    end
+    it 'should include max_results and next_cursor for root_folders call' do
+      expected = {
+          [:payload, :max_results] => 3,
+          [:payload, :next_cursor] => NEXT_CURSOR,
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      @api.root_folders :max_results => 3, :next_cursor => NEXT_CURSOR
+    end
+    it 'should include max_results and next_cursor for subfolders call' do
+      expected = {
+          [:payload, :max_results] => 3,
+          [:payload, :next_cursor] => NEXT_CURSOR,
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      @api.subfolders GENERIC_FOLDER_NAME, :max_results => 3, :next_cursor => NEXT_CURSOR
+    end
+    it "should support deleting a folder" do
+      expected = {
+        :url => %r"/folders/#{GENERIC_FOLDER_NAME}$",
+        :method => :delete
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      @api.delete_folder(GENERIC_FOLDER_NAME)
+    end
   end
   describe '.restore'  do
@@ -421,9 +478,8 @@ describe Cloudinary::Api do
       expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:payload, :template] => "http://res.cloudinary.com"))
       Cloudinary::Api.update_upload_mapping(mapping, "template" =>"http://res.cloudinary.com")
     end
   end
   describe "access_mode" do
     i = 0

data/spec/archive_spec.rb CHANGED

@@ -126,4 +126,20 @@ describe Cloudinary::Uploader do
       Cloudinary::Uploader.create_zip({ :tags => TEST_TAG })
     end
   end
-end
+  describe '.create_archive based on fully_qualified_public_ids' do
+    it 'should allow you to generate an archive by specifying multiple resource_types' do
+      test_ids = %W(image/upload/#{TEST_IMG} video/upload/#{TEST_VIDEO} raw/upload/#{TEST_RAW})
+      expected = {
+        [:payload, :fully_qualified_public_ids] => test_ids,
+        [:url]                                  => %r"/auto/generate_archive$"
+      }
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      Cloudinary::Uploader.create_archive(
+        {
+          :resource_type              => :auto,
+          :fully_qualified_public_ids => test_ids
+        }
+      )
+    end
+  end
+end

data/spec/cloudinary_helper_spec.rb CHANGED

@@ -307,6 +307,8 @@ RSpec.describe CloudinaryHelper do
         expect(helper.image_path('/bar')).to eq('/bar')
       end
       it "should not transform images staring with /images unless asset is found and static_support is true" do
+        skip if RUBY_VERSION >= '2.2.2'
         Cloudinary.config.static_image_support = false
         expect(helper.image_path('/images/foo.jpg')).to eq('/images/foo.jpg')
         expect(helper.image_path('some-folder/foo.gif')).to eq("/images/some-folder/foo.gif")

data/spec/cloudinary_spec.rb CHANGED

@@ -2,17 +2,24 @@ require 'spec_helper'
 require 'cloudinary'
 describe Cloudinary do
-  before :all do
+  before :each do
     @user_platform = Cloudinary.user_platform
   end
-  after :all do
+  after :each do
     Cloudinary.user_platform = @user_platform
   end
-  it 'should add a user platform to USER_AGENT' do
-    Cloudinary.user_platform = "Spec/1.0 (Test)"
-    expect(Cloudinary.USER_AGENT).to match( %r"Spec\/1.0 \(Test\) CloudinaryRuby/[\d.]+")
+  CLOUDINARY_USER_AGENT_REGEXP    = %r"^CloudinaryRuby\/[\d.]+ \(Ruby [\d\.]+-p\d+\)$"
+  CLOUDINARY_USER_PLATFORM_REGEXP = %r"^Rails\/[\d.]+ CloudinaryRuby\/[\d.]+ \(Ruby [\d\.]+-p\d+\)$"
+  it "should return the USER_AGENT without user_platform if there's no Rails or set to empty" do
+    Cloudinary.user_platform = ""
+    expect(Cloudinary.USER_AGENT).to match(CLOUDINARY_USER_AGENT_REGEXP)
+  end
+  it 'should add a user platform to USER_AGENT' do
+    Cloudinary.user_platform = "Rails/5.6.7"
+    expect(Cloudinary.USER_AGENT).to match(CLOUDINARY_USER_PLATFORM_REGEXP)
   end
   describe 'config' do
@@ -28,5 +35,22 @@ describe Cloudinary do
       Cloudinary::config_from_url ENV["CLOUDINARY_URL"]
       expect(Cloudinary::config.foo.bar).to eq 'value'
     end
+    it "should set accept a CLOUDINARY_URL with the correct scheme (cloudinary)" do
+        valid_cloudinary_url = "cloudinary://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test"
+        expect{Cloudinary::config_from_url valid_cloudinary_url}.not_to raise_error
+    end
+    it "should raise an exception if the CLOUDINARY_URL doesn't start with 'cloudinary://'" do
+      invalid_cloudinary_urls = [
+        "CLOUDINARY_URL=cloudinary://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test",
+        "https://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test",
+        "://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test",
+        " "
+      ]
+      invalid_cloudinary_urls.each do |cloudinary_url|
+        expect{Cloudinary::config_from_url cloudinary_url}
+          .to raise_error(/bad URI|Invalid CLOUDINARY_URL/)
+      end
+    end
   end
-end
+end