cloudinary 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -10,12 +10,13 @@ class Cloudinary::Uploader
10
10
  :transformation => Cloudinary::Utils.generate_transformation_string(options),
11
11
  :public_id=> options[:public_id],
12
12
  :format=>options[:format],
13
- :tags=>options[:tags] && Array(options[:tags]).join(",")}.reject{|k,v| v.blank?}
13
+ :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}.reject{|k,v| v.blank?}
14
14
  if options[:eager]
15
15
  params[:eager] = options[:eager].map do
16
- |transformation|
17
- transformation, format = Array(transformation) # format is optional
18
- [Cloudinary::Utils.generate_transformation_string(transformation.clone), format].compact.join("/")
16
+ |transformation, format|
17
+ transformation = transformation.clone
18
+ format = transformation.delete(:format) || format
19
+ [Cloudinary::Utils.generate_transformation_string(transformation), format].compact.join("/")
19
20
  end.join("|")
20
21
  end
21
22
  if file.respond_to?(:read) || file =~ /^https?:/
@@ -69,7 +70,7 @@ class Cloudinary::Uploader
69
70
  {
70
71
  :timestamp=>Time.now.to_i,
71
72
  :tag=>tag,
72
- :public_ids => Array(public_ids),
73
+ :public_ids => Cloudinary::Utils.build_array(public_ids),
73
74
  :command => command
74
75
  }
75
76
  end
@@ -18,7 +18,7 @@ class Cloudinary::Utils
18
18
 
19
19
  gravity = options.delete(:gravity)
20
20
  quality = options.delete(:quality)
21
- named_transformation = Array(options.delete(:transformation)).join(".")
21
+ named_transformation = build_array(options.delete(:transformation)).join(".")
22
22
  prefix = options.delete(:prefix)
23
23
 
24
24
  params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :q=>quality, :g=>gravity, :p=>prefix}
@@ -95,4 +95,12 @@ class Cloudinary::Utils
95
95
  end
96
96
  defined?(JSON) ? JSON.parse(str) : ActiveSupport::JSON.decode(str)
97
97
  end
98
+
99
+ def self.build_array(array)
100
+ case array
101
+ when Array then array
102
+ when nil then []
103
+ else [array]
104
+ end
105
+ end
98
106
  end
@@ -1,4 +1,4 @@
1
1
  # Copyright Cloudinary
2
2
  module Cloudinary
3
- VERSION = "1.0.0"
3
+ VERSION = "1.0.1"
4
4
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: cloudinary
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.0.0
5
+ version: 1.0.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
14
 
15
- date: 2012-02-22 00:00:00 +02:00
15
+ date: 2012-03-12 00:00:00 +02:00
16
16
  default_executable:
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency