cloudinary 1.0.27 → 1.0.28

data/.gitignore

@@ -2,3 +2,4 @@ pkg
 .project
 .rvmrc
 assets/
+vendor/assets/

data/Rakefile

@@ -2,7 +2,9 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 task :fetch_assets do
-  system "/bin/rm -rf assets; mkdir -p assets; cd assets; curl -L https://github.com/cloudinary/cloudinary_js/tarball/master | tar zxvf - --strip=1"
+  system "/bin/rm -rf vendor/assets; mkdir -p vendor/assets; cd vendor/assets; curl -L https://github.com/cloudinary/cloudinary_js/tarball/master | tar zxvf - --strip=1"
+  system "mkdir -p vendor/assets/javascripts; mv vendor/assets/js vendor/assets/javascripts/cloudinary"
+  File.open("vendor/assets/javascripts/cloudinary/index.js", "w"){|f| f.puts "//= require_tree ."}
 end
 
 task :build=>:fetch_assets

data/cloudinary.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cloudinary"
 
-  s.files         = `git ls-files`.split("\n") + Dir.glob("assets/*/*")
+  s.files         = `git ls-files`.split("\n") + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/cloudinary/carrier_wave.rb

@@ -32,13 +32,20 @@ module Cloudinary::CarrierWave
     if args.first && !args.first.is_a?(Hash)
       super
     else
-      return super if self.blank?
+      if self.blank?
+        url = self.default_url
+        return url if !url.blank?
+        public_id = self.default_public_id
+        return nil if public_id.nil?
+      else
+        public_id = self.full_public_id
+      end      
       options = args.extract_options!
       options = self.transformation.merge(options) if self.version_name.present?
-      Cloudinary::Utils.cloudinary_url(self.full_public_id, {:format=>self.format}.merge(options))
+      Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format}.merge(options))
     end
   end
-      
+
   def full_public_id
     return nil if self.blank?
     return self.my_public_id if self.stored_version.blank?
@@ -49,6 +56,11 @@ module Cloudinary::CarrierWave
     return nil if self.blank?
     return [self.full_public_id, self.format].join(".")
   end
+
+  # default public_id to use if no uploaded file. Override with public_id of an uploaded image if you want a default image.
+  def default_public_id
+    nil
+  end
       
   # public_id to use for uploaded file. Can be overridden by caller. Random public_id will be used otherwise.  
   def public_id

data/lib/cloudinary/helper.rb

@@ -109,7 +109,11 @@ module CloudinaryHelper
   CLOUDINARY_JS_CONFIG_PARAMS = [:api_key, :cloud_name, :private_cdn, :secure_distribution, :cdn_subdomain]
   def cloudinary_js_config
     params = {}
-    CLOUDINARY_JS_CONFIG_PARAMS.each{|param| params[param] = Cloudinary.config.send(param)}    
+    CLOUDINARY_JS_CONFIG_PARAMS.each do
+      |param| 
+      value = Cloudinary.config.send(param)
+      params[param] = value if !value.nil?
+    end    
     content_tag("script", "$.cloudinary.config(#{params.to_json});".html_safe, :type=>"text/javascript")      
   end
 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.27"
+  VERSION = "1.0.28"
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-26 00:00:00 +03:00
+date: 2012-07-03 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,12 +76,12 @@ files:
 - lib/tasks/cloudinary.rake
 - spec/spec_helper.rb
 - spec/utils_spec.rb
-- assets/html/cloudinary_cors.html
-- assets/js/jquery.cloudinary.js
-- assets/js/jquery.fileupload.js
-- assets/js/jquery.iframe-transport.js
-- assets/js/jquery.ui.widget.js
-- assets/test/SpecRunner.html
+- vendor/assets/javascripts/cloudinary/index.js
+- vendor/assets/javascripts/cloudinary/jquery.cloudinary.js
+- vendor/assets/javascripts/cloudinary/jquery.fileupload.js
+- vendor/assets/javascripts/cloudinary/jquery.iframe-transport.js
+- vendor/assets/javascripts/cloudinary/jquery.ui.widget.js
+- vendor/assets/html/cloudinary_cors.html
 has_rdoc: true
 homepage: http://cloudinary.com
 licenses: []