cloudinary 1.4.0 → 1.5.2

data/lib/cloudinary/uploader.rb

@@ -16,6 +16,7 @@ class Cloudinary::Uploader
     options.keys.each { |key| options[key.to_sym] = options.delete(key) if key.is_a?(String) }
 
     params = {
+      :access_mode               => options[:access_mode],
       :allowed_formats           => Cloudinary::Utils.build_array(options[:allowed_formats]).join(","),
       :auto_tagging              => options[:auto_tagging] && options[:auto_tagging].to_f,
       :background_removal        => options[:background_removal],

data/lib/cloudinary/utils.rb

@@ -5,10 +5,9 @@ require 'uri'
 require 'aws_cf_signer'
 require 'json'
 require 'cgi'
-require 'cloudinary/akamai'
+require 'cloudinary/auth_token'
 
 class Cloudinary::Utils
-  include Cloudinary::Akamai
   # @deprecated Use Cloudinary::SHARED_CDN
   SHARED_CDN = Cloudinary::SHARED_CDN
   DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {:width => :auto, :crop => :limit}
@@ -41,7 +40,7 @@ class Cloudinary::Utils
 
     symbolize_keys!(options)
 
-    responsive_width = config_option_consume(options, :responsive_width) 
+    responsive_width = config_option_consume(options, :responsive_width)
     size = options.delete(:size)
     options[:width], options[:height] = size.split("x") if size
     width = options[:width]
@@ -282,7 +281,7 @@ class Cloudinary::Utils
         transformation =  breakpoint_settings.delete(:transformation) || breakpoint_settings.delete("transformation")
         if transformation
           breakpoint_settings[:transformation] = Cloudinary::Utils.generate_transformation_string(transformation.clone, true)
-        end 
+        end
       end
       breakpoint_settings
 
@@ -317,6 +316,10 @@ class Cloudinary::Utils
     sign_version = config_option_consume(options, :sign_version) # Deprecated behavior
     url_suffix = options.delete(:url_suffix)
     use_root_path = config_option_consume(options, :use_root_path)
+    auth_token = config_option_consume(options, :auth_token)
+    unless auth_token == false
+      auth_token = Cloudinary::AuthToken.merge_auth_token(Cloudinary.config.auth_token, auth_token)
+    end
 
     original_source = source
     return original_source if source.blank?
@@ -354,7 +357,7 @@ class Cloudinary::Utils
     version &&= "v#{version}"
 
     transformation = transformation.gsub(%r(([^:])//), '\1/')
-    if sign_url
+    if sign_url && ( !auth_token || auth_token.empty?)
       to_sign = [transformation, sign_version && version, source_to_sign].reject(&:blank?).join("/")
       i = 0
       while to_sign != CGI.unescape(to_sign) && i <10
@@ -366,6 +369,13 @@ class Cloudinary::Utils
 
     prefix = unsigned_download_url_prefix(source, cloud_name, private_cdn, cdn_subdomain, secure_cdn_subdomain, cname, secure, secure_distribution)
     source = [prefix, resource_type, type, signature, transformation, version, source].reject(&:blank?).join("/")
+    if sign_url && auth_token && !auth_token.empty?
+      auth_token[:url] = URI.parse(source).path
+      token = Cloudinary::AuthToken.generate auth_token
+      source += "?#{token}"
+    end
+
+    source
   end
 
   def self.finalize_source(source, format, url_suffix)
@@ -496,7 +506,7 @@ class Cloudinary::Utils
     return Cloudinary::Utils.cloudinary_api_url("download", options) + "?" + hash_query_params(cloudinary_params)
   end
 
-  # Utility method that uses the deprecated ZIP download API. 
+  # Utility method that uses the deprecated ZIP download API.
   # @deprecated Replaced by {download_zip_url} that uses the more advanced and robust archive generation and download API
   def self.zip_download_url(tag, options = {})
     warn "zip_download_url is deprecated. Please use download_zip_url instead."
@@ -543,14 +553,19 @@ class Cloudinary::Utils
   end
 
   def self.signed_download_url(public_id, options = {})
-    aws_private_key_path = options[:aws_private_key_path] || Cloudinary.config.aws_private_key_path || raise(CloudinaryException, "Must supply aws_private_key_path")
-    aws_key_pair_id = options[:aws_key_pair_id] || Cloudinary.config.aws_key_pair_id || raise(CloudinaryException, "Must supply aws_key_pair_id")
-    authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise(CloudinaryException, "Must supply authenticated_distribution")
-    @signers ||= Hash.new{|h,k| path, id = k; h[k] = AwsCfSigner.new(path, id)}
-    signer = @signers[[aws_private_key_path, aws_key_pair_id]]
-    url = Cloudinary::Utils.unsigned_download_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
-    expires_at = options[:expires_at] || (Time.now+3600)
-    signer.sign(url, :ending => expires_at)
+    aws_private_key_path = options[:aws_private_key_path] || Cloudinary.config.aws_private_key_path
+    if aws_private_key_path
+      aws_key_pair_id = options[:aws_key_pair_id] || Cloudinary.config.aws_key_pair_id || raise(CloudinaryException, "Must supply aws_key_pair_id")
+      authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise(CloudinaryException, "Must supply authenticated_distribution")
+      @signers ||= Hash.new{|h,k| path, id = k; h[k] = AwsCfSigner.new(path, id)}
+      signer = @signers[[aws_private_key_path, aws_key_pair_id]]
+      url = Cloudinary::Utils.unsigned_download_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
+      expires_at = options[:expires_at] || (Time.now+3600)
+      return signer.sign(url, :ending => expires_at)
+    else
+      return Cloudinary::Utils.unsigned_download_url( public_id, options)
+    end
+
   end
 
   def self.cloudinary_url(public_id, options = {})
@@ -753,7 +768,7 @@ class Cloudinary::Utils
 
   #
   # @private
-  # @param [String|Hash|Array] an eager transformation can be a string or hash, with or without a format. The parameter also accepts an array of eager transformations.
+  # @param [String|Hash|Array] eager an transformation as a string or hash, with or without a format. The parameter also accepts an array of eager transformations.
   def self.build_eager(eager)
     return nil if eager.nil?
     Cloudinary::Utils.build_array(eager).map do
@@ -769,6 +784,11 @@ class Cloudinary::Utils
     end.join("|")
   end
 
+  def self.generate_auth_token(options)
+    options = Cloudinary::AuthToken.merge_auth_token Cloudinary.config.auth_token, options
+    Cloudinary::AuthToken.generate options
+
+  end
   private
 
   def self.hash_query_params(hash)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.4.0"
+  VERSION = "1.5.2"
 end

data/spec/api_spec.rb

@@ -4,7 +4,8 @@ require 'cloudinary'
 describe Cloudinary::Api do
   break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
   include_context "cleanup", TIMESTAMP_TAG
-
+  TEST_WIDTH = rand(1000)
+  TEST_TRANSFOMATION = "c_scale,w_#{TEST_WIDTH}"
   prefix = "api_test_#{Time.now.to_i}"
   test_id_1 = "#{prefix}_1"
   test_id_2   = "#{prefix}_2"
@@ -12,11 +13,11 @@ describe Cloudinary::Api do
   before(:all) do
 
     @api = Cloudinary::Api
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>100, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_2, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>100, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>100, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=test", :eager =>[:width =>100, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=tasty", :eager =>[:width =>100, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_2, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=test", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=tasty", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
   end
 
   after(:all) do
@@ -198,37 +199,37 @@ describe Cloudinary::Api do
   
   describe 'transformations' do
     it "should allow listing transformations" do
-      transformation = @api.transformations()["transformations"].find { |transformation| transformation["name"] == "c_scale,w_100" }
+      transformation = @api.transformations(max_results: 500)["transformations"].find { |transformation| transformation["name"] == TEST_TRANSFOMATION }
       expect(transformation).not_to be_blank
       expect(transformation["used"]).to eq(true)
     end
 
     it "should allow getting transformation metadata" do
-      transformation = @api.transformation("c_scale,w_100")
+      transformation = @api.transformation(TEST_TRANSFOMATION)
       expect(transformation).not_to be_blank
-      expect(transformation["info"]).to eq(["crop" => "scale", "width" => 100])
-      transformation = @api.transformation("crop" => "scale", "width" => 100)
+      expect(transformation["info"]).to eq(["crop" => "scale", "width" => TEST_WIDTH])
+      transformation = @api.transformation("crop" => "scale", "width" => TEST_WIDTH)
       expect(transformation).not_to be_blank
-      expect(transformation["info"]).to eq(["crop" => "scale", "width" => 100])
+      expect(transformation["info"]).to eq(["crop" => "scale", "width" => TEST_WIDTH])
     end
 
     it "should allow updating transformation allowed_for_strict" do
-      @api.update_transformation("c_scale,w_100", :allowed_for_strict => true)
-      transformation = @api.transformation("c_scale,w_100")
+      @api.update_transformation(TEST_TRANSFOMATION, :allowed_for_strict => true)
+      transformation = @api.transformation(TEST_TRANSFOMATION)
       expect(transformation).not_to be_blank
       expect(transformation["allowed_for_strict"]).to eq(true)
-      @api.update_transformation("c_scale,w_100", :allowed_for_strict => false)
-      transformation = @api.transformation("c_scale,w_100")
+      @api.update_transformation(TEST_TRANSFOMATION, :allowed_for_strict => false)
+      transformation = @api.transformation(TEST_TRANSFOMATION)
       expect(transformation).not_to be_blank
       expect(transformation["allowed_for_strict"]).to eq(false)
     end
 
     it "should fetch two different derived images using next_cursor" do
-      result = @api.transformation("c_scale,w_100", :max_results=>1)
+      result = @api.transformation(TEST_TRANSFOMATION, :max_results=>1)
       expect(result["derived"]).not_to be_blank
       expect(result["derived"].length).to eq(1)
       expect(result["next_cursor"]).not_to be_blank
-      result2 = @api.transformation("c_scale,w_100", :max_results=>1, :next_cursor=>result["next_cursor"])
+      result2 = @api.transformation(TEST_TRANSFOMATION, :max_results=>1, :next_cursor=>result["next_cursor"])
       expect(result2["derived"]).not_to be_blank
       expect(result2["derived"].length).to eq(1)
       expect(result2["derived"][0]["id"]).not_to eq(result["derived"][0]["id"] )
@@ -263,9 +264,9 @@ describe Cloudinary::Api do
 
     end
     it "should allow deleting implicit transformation" do
-      @api.transformation("c_scale,w_100")
-      @api.delete_transformation("c_scale,w_100")
-      expect { @api.transformation("c_scale,w_100") }.to raise_error(Cloudinary::Api::NotFound)
+      @api.transformation(TEST_TRANSFOMATION)
+      @api.delete_transformation(TEST_TRANSFOMATION)
+      expect { @api.transformation(TEST_TRANSFOMATION) }.to raise_error(Cloudinary::Api::NotFound)
     end
   end
   
@@ -374,7 +375,7 @@ describe Cloudinary::Api do
   end
 
   it "should throw if folder is missing" do
-    Cloudinary::Api.subfolders("I_do_not_exist")
+    expect{Cloudinary::Api.subfolders("I_do_not_exist")}.to raise_error(Cloudinary::Api::NotFound)
   end
 
   describe '.restore'  do
@@ -395,4 +396,45 @@ describe Cloudinary::Api do
 
 
   end
+  describe "access_mode" do
+    i = 0
+
+    publicId = ""
+    access_mode_tag = ''
+    before(:each) do
+      i += 1
+      access_mode_tag = TEST_TAG + "access_mode" + i.to_s
+      result = Cloudinary::Uploader.upload TEST_IMG, access_mode: "authenticated", tags: [TEST_TAG, TIMESTAMP_TAG, access_mode_tag]
+      publicId = result["public_id"]
+      expect(result["access_mode"]).to eq("authenticated")
+    end
+
+    it "should update access mode by ids" do
+      result = Cloudinary::Api.update_resources_access_mode_by_ids "public", [publicId]
+
+      expect(result["updated"]).to be_an_instance_of(Array)
+      expect(result["updated"].length).to eq(1)
+      resource = result["updated"][0]
+      expect(resource["public_id"]).to eq(publicId)
+      expect(resource["access_mode"]).to eq('public')
+    end
+    it "should update access mode by prefix" do
+      result = Cloudinary::Api.update_resources_access_mode_by_prefix "public", publicId[0..-3]
+
+      expect(result["updated"]).to be_an_instance_of(Array)
+      expect(result["updated"].length).to eq(1)
+      resource = result["updated"][0]
+      expect(resource["public_id"]).to eq(publicId)
+      expect(resource["access_mode"]).to eq('public')
+    end
+    it "should update access mode by tag" do
+      result = Cloudinary::Api.update_resources_access_mode_by_tag "public", access_mode_tag
+
+      expect(result["updated"]).to be_an_instance_of(Array)
+      expect(result["updated"].length).to eq(1)
+      resource = result["updated"][0]
+      expect(resource["public_id"]).to eq(publicId)
+      expect(resource["access_mode"]).to eq('public')
+    end
+  end
 end

data/spec/archive_spec.rb

@@ -92,7 +92,7 @@ describe Cloudinary::Uploader do
               file_count
             )
     it "should include keys: #{expected_keys.join(', ')}" do
-      expect(archive_result.keys).to match_array(expected_keys)
+      expect(archive_result.keys).to include(*expected_keys)
     end
   end
   describe '.create_zip' do

data/spec/auth_token_spec.rb

@@ -0,0 +1,82 @@
+require 'rspec'
+require 'spec_helper'
+require 'cloudinary'
+
+KEY     = "00112233FF99"
+ALT_KEY = "CCBB2233FF00"
+
+describe 'auth_token' do
+  before :all do
+    @url_backup = ENV["CLOUDINARY_URL"]
+  end
+  before do
+    Cloudinary.config_from_url "cloudinary://a:b@test123"
+    Cloudinary.config.auth_token = { :key => KEY, :duration => 300, :start_time => 11111111 }
+  end
+  after do
+    ENV["CLOUDINARY_URL"] = @url_backup
+    Cloudinary::config_from_url @url_backup
+  end
+  it "should generate with start and duration" do
+    token = Cloudinary::Utils.generate_auth_token :start_time => 1111111111, :acl => "/image/*", :duration => 300
+    expect(token).to eq '__cld_token__=st=1111111111~exp=1111111411~acl=%2fimage%2f%2a~hmac=0d5b0c9c1485ee162c459879fe62e06caa23bc26fec92d58bd100f2e1592eac6'
+  end
+
+  describe "authenticated url" do
+    before do
+      Cloudinary.config :private_cdn => true
+
+    end
+    it "should add token if authToken is globally set and signed = true" do
+      url = Cloudinary::Utils.cloudinary_url "sample.jpg", :sign_url => true, :resource_type => "image", :type => "authenticated", :version => "1486020273"
+      expect(url).to eq("http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3")
+
+    end
+    it "should add token for 'public' resource" do
+      url = Cloudinary::Utils.cloudinary_url "sample.jpg", :sign_url => true, :resource_type => "image", :type => "public", :version => "1486020273"
+      expect(url).to eq("http://test123-res.cloudinary.com/image/public/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=c2b77d9f81be6d89b5d0ebc67b671557e88a40bcf03dd4a6997ff4b994ceb80e")
+
+    end
+    it "should not add token if signed is false" do
+      url = Cloudinary::Utils.cloudinary_url "sample.jpg", :type => "authenticated", :version => "1486020273"
+      expect(url).to eq("http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg")
+
+    end
+    it "should not add token if authToken is globally set but null auth token is explicitly set and signed = true" do
+      url = Cloudinary::Utils.cloudinary_url "sample.jpg", :auth_token => false, :sign_url => true, :type => "authenticated", :version => "1486020273"
+      expect(url).to eq("http://test123-res.cloudinary.com/image/authenticated/s--v2fTPYTu--/v1486020273/sample.jpg")
+
+    end
+    it "explicit authToken should override global setting" do
+      url = Cloudinary::Utils.cloudinary_url "sample.jpg", :sign_url => true, :auth_token => { :key => ALT_KEY, :start_time => 222222222, :duration => 100 }, :type => "authenticated", :transformation => { :crop => "scale", :width => 300 }
+      expect(url).to eq("http://test123-res.cloudinary.com/image/authenticated/c_scale,w_300/sample.jpg?__cld_token__=st=222222222~exp=222222322~hmac=7d276841d70c4ecbd0708275cd6a82e1f08e47838fbb0bceb2538e06ddfa3029")
+
+    end
+    it "should compute expiration as start time + duration" do
+      token = { :key => KEY, :start_time => 11111111, :duration => 300 }
+      url   = Cloudinary::Utils.cloudinary_url "sample.jpg", :sign_url => true, :auth_token => token, :resource_type => "image", :type => "authenticated", :version => "1486020273"
+      expect(url).to eq("http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3")
+
+    end
+    it "should raise if key is not provided" do
+      Cloudinary.config.auth_token[:key] = nil
+      token = { :expiration => 111111, :duration => 0 }
+      expect{Cloudinary::Utils.generate_auth_token(token)}.to raise_error
+    end
+    it "should raise if expiration and duration are not provided" do
+      token = { :key => KEY, :expiration => 0, :duration => 0 }
+      expect{Cloudinary::Utils.generate_auth_token(token)}.to raise_error
+    end
+  end
+  describe "authentication token" do
+    it "should generate token string" do
+      user                      = "foobar" # we can't rely on the default "now" value in tests
+      tokenOptions              = { :key => KEY, :duration => 300, :acl => "/*/t_#{user}" }
+      tokenOptions[:start_time] = 222222222 # we can't rely on the default "now" value in tests
+      cookieToken               = Cloudinary::Utils.generate_auth_token tokenOptions
+      expect(cookieToken).to eq("__cld_token__=st=222222222~exp=222222522~acl=%2f%2a%2ft_foobar~hmac=1284376353c1c43d6f6a98f2813c5596f4ff6f34d837cd853fd8c3c9e7f8428c")
+
+    end
+  end
+end
+

data/spec/cloudinary_helper_spec.rb

@@ -4,6 +4,8 @@ require 'cloudinary'
 require 'action_view'
 require 'cloudinary/helper'
 
+KEY     = "00112233FF99"
+
 helper_class = Class.new do
   include CloudinaryHelper
 end
@@ -127,4 +129,18 @@ RSpec.describe CloudinaryHelper do
       expect(tag['http-equiv']).to eq('Accept-CH')
     end
   end
+
+  context "auth_token" do
+    it "should add token to an image tag url" do
+      tag = helper.cl_image_tag "sample.jpg",
+                                :cloud_name => 'test123',
+                                :sign_url => true,
+                                :type => "authenticated",
+                                :version => "1486020273",
+                                :auth_token => {key: KEY, start_time: 11111111, duration: 300}
+      expect(tag).to match /<img.*src="http:\/\/res.cloudinary.com\/test123\/image\/authenticated\/v1486020273\/sample.jpg\?__cld_token__=st=11111111~exp=11111411~hmac=9bd6f41e2a5893da8343dc8eb648de8bf73771993a6d1457d49851250caf3b80.*>/
+
+    end
+
+  end
 end

data/spec/cloudinary_spec.rb

@@ -14,4 +14,19 @@ describe Cloudinary do
     expect(Cloudinary.USER_AGENT).to match( %r"Spec\/1.0 \(Test\) CloudinaryRuby/[\d.]+")
 
   end
+
+  describe 'config' do
+    before do
+      @url_backup = ENV["CLOUDINARY_URL"]
+    end
+    after do
+      ENV["CLOUDINARY_URL"] = @url_backup
+      Cloudinary::config_from_url @url_backup
+    end
+    it "should allow nested values in CLOUDINARY_URL" do
+      ENV["CLOUDINARY_URL"]  = "cloudinary://key:secret@test123?foo[bar]=value"
+      Cloudinary::config_from_url ENV["CLOUDINARY_URL"]
+      expect(Cloudinary::config.foo.bar).to eq 'value'
+    end
+  end
 end

data/spec/utils_methods_spec.rb

@@ -15,38 +15,5 @@ describe Utils do
   it "should parse a percent range value" do
     expect(Utils.instance_eval { norm_range_value("20p") }).to eq("20p")
   end
-  describe 'Utils.generate_token' do
-    config_backup = Cloudinary.config.clone
-    before do
-      Cloudinary.config.akamai_key = '00112233FF99'
-    end
-    after do
-      Cloudinary.config.each_pair { |k, _| Cloudinary.config.delete_field(k) }
-      Cloudinary.config(config_backup.to_h)
-    end
-    it "should generate an Akamai token with start_time and window" do
-      token = Utils.generate_token start_time: 1111111111, acl: '/image/*', window: 300
-      expect(token).to eq('__cld_token__=st=1111111111~exp=1111111411~acl=/image/*~hmac=0854e8b6b6a46471a80b2dc28c69bd352d977a67d031755cc6f3486c121b43af')
-    end
-    it "should generate an Akamai token with window" do
-      first_exp = Time.new.getgm.to_i + 300
-      # expiration is calculated automatically as now + window
-      token = Utils.generate_token acl: '*', window: 300
-      second_exp = Time.new.getgm.to_i + 300
-      match = /exp=(\d+)/.match(token)
-      expect(match[1]).to be_truthy
-      expiration = match[1].to_i
-      expect(expiration).to be_between(first_exp, second_exp)
-      expect(Utils.generate_token acl: '*', end_time: expiration).to eq(token)
-    end
 
-    it "should accept a key" do
-      expect(Utils.generate_token acl: '*', end_time: 10000000, key: '00aabbff')
-          .to eq('__cld_token__=exp=10000000~acl=*~hmac=030eafb6b19e499659d699b3d43e7595e35e3c0060e8a71904b3b8c8759f4890')
-    end
-    it "should throw if no end_time or window is provided" do
-      expect { Utils.generate_token acl: '*' }.to raise_error
-
-    end
-  end
 end