cloudinary 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebe3f99a4c5e55a3287d9d64442f4c11ff0cdbef
-  data.tar.gz: b0a18af4fbc649482c454a7799146879811b9c13
+  metadata.gz: 0fcfb2ec23208e42dc314f218a803b9ddc0d62fc
+  data.tar.gz: d77b2eceee548a28eccca9f3b653cc8946936d2b
 SHA512:
-  metadata.gz: 575ef273a4d869096ceca7113ef7b2d759ecdef854db325134d5e5cc997dc7695c42008befdc3f896b9103bedde431496f2ad03187a07646b475546da837719a
-  data.tar.gz: bcbca570b27ca7582ebda1c1ac36ebf49fc1295f59fedc5fa82f4f63dacaadc7dc876756f3930101986a5ee40c9f5aa39938f35db549f042549e53a844281e16
+  metadata.gz: 326be4f55c3abb55067a0dd4353e2b9bf4607a09f068bc78569094f4bb50006dfed3474863ffcea9a486b3f515ef7dc074d2833b54d8de1924cc8289edddafc7
+  data.tar.gz: 755b17418a13dd7749947a78af187c01edec641a82097425af880a66b43a7d2b30036940f0e397788c6d65a1b7e84dbf9fcc053c90f81a2282bf52a3b74ccfb3

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+1.2.2 / 2016-07-16
+==================
+
+  * Update gemspec to differentiate between ruby 1.9 and 2.0
+  * Add `:max_results => 500` to tags test.
+  * Add json spec. Add explicit exception names to `raise_error`.
+
 1.2.1 / 2016-07-16
 ==================
 

data/cloudinary.gemspec

@@ -25,10 +25,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "rubyzip"
 
-  if RUBY_VERSION > "1.9"
+  if RUBY_VERSION > "2.0"
     s.add_dependency "rest-client"
     s.add_development_dependency "actionpack"
     s.add_development_dependency "simplecov"
+  elsif RUBY_VERSION > "1.9"
+    s.add_dependency "rest-client", '< 2.0'
+    s.add_dependency 'json', '~> 1.8'
+    s.add_development_dependency "actionpack", '< 5.0'
+    s.add_development_dependency "simplecov"
   else
     s.add_dependency "i18n", "<0.7.0"
     s.add_dependency "rest-client", "<=1.6.8"

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/api_spec.rb

@@ -141,7 +141,7 @@ describe Cloudinary::Api do
   end
 
   it "should allow listing tags" do
-    tags = @api.tags()["tags"]
+    tags = @api.tags(:max_results => 500)["tags"]
     expect(tags).to include(TEST_TAG)
   end
 
@@ -262,7 +262,7 @@ describe Cloudinary::Api do
     @api.create_upload_preset(:name => "api_test_upload_preset4", :folder => "folder", :tags => [TEST_TAG, TIMESTAMP_TAG])
     preset = @api.upload_preset("api_test_upload_preset4")
     @api.delete_upload_preset("api_test_upload_preset4")
-    expect{preset = @api.upload_preset("api_test_upload_preset4")}.to raise_error
+    expect{preset = @api.upload_preset("api_test_upload_preset4")}.to raise_error(Cloudinary::Api::NotFound)
   end
   
   it "should allow updating upload_presets", :upload_preset => true do

data/spec/uploader_spec.rb

@@ -50,7 +50,7 @@ describe Cloudinary::Uploader do
     it 'should not allow renaming to an existing ID' do
       id             = @resource_2_id
       @resource_2_id = @resource_1_id+"2" # if rename doesn't fail, this is the new ID
-      expect { Cloudinary::Uploader.rename(id, @resource_1_id+"2") }.to raise_error
+      expect { Cloudinary::Uploader.rename(id, @resource_1_id+"2") }.to raise_error(CloudinaryException)
       @resource_2_id = id
     end
     context ':overwrite => true' do
@@ -151,7 +151,7 @@ describe Cloudinary::Uploader do
   end
   
   it "should prevent non whitelisted formats from being uploaded if allowed_formats is specified", :allowed=>true do
-    expect{Cloudinary::Uploader.upload(TEST_IMG, :allowed_formats => ["jpg"], :tags => [TEST_TAG, TIMESTAMP_TAG])}.to raise_error
+    expect{Cloudinary::Uploader.upload(TEST_IMG, :allowed_formats => ["jpg"], :tags => [TEST_TAG, TIMESTAMP_TAG])}.to raise_error(CloudinaryException)
   end
   
   it "should allow non whitelisted formats if type is specified and convert to that type", :allowed=>true do
@@ -244,7 +244,7 @@ describe Cloudinary::Uploader do
     end
 
     it "should fail if timeout is reached" do
-      expect{Cloudinary::Uploader.upload(Pathname.new(TEST_IMG), :tags => [TEST_TAG, TIMESTAMP_TAG])}.to raise_error
+      expect{Cloudinary::Uploader.upload(Pathname.new(TEST_IMG), :tags => [TEST_TAG, TIMESTAMP_TAG])}.to raise_error(RestClient::RequestTimeout)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer