cloudinary 1.0.5 → 1.0.6

data/lib/cloudinary.rb

@@ -10,7 +10,8 @@ require 'active_support'
 require "cloudinary/missing"
 require "cloudinary/carrier_wave" if defined?(::CarrierWave)
 require "cloudinary/helper" if defined?(::ActionView::Base)
-require "cloudinary/railtie" if defined?(Rails)
+require "cloudinary/controller" if defined?(::ActionController::Base)
+require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
 
 module Cloudinary  
   @@config = nil

data/lib/cloudinary/controller.rb

@@ -0,0 +1,13 @@
+module CloudinaryController
+  protected
+  
+  def valid_cloudinary_response?
+    received_signature = request.query_parameters[:signature]
+    calculated_signature = Cloudinary::Utils.api_sign_request(
+      request.query_parameters.select{|key, value| [:public_id, :version].include?(key.to_sym)},
+      Cloudinary.config.api_secret)
+    return received_signature == calculated_signature
+  end  
+end
+
+ActionController::Base.send :include, CloudinaryController

data/lib/cloudinary/helper.rb

@@ -1,5 +1,3 @@
-# Copyright Cloudinary
-
 module CloudinaryHelper
   include ActionView::Helpers::AssetTagHelper  
   alias :original_image_tag :image_tag
@@ -77,6 +75,35 @@ module CloudinaryHelper
     stylesheet_link_tag(cl_sprite_url(source, options))
   end
 
+  # cl_form_tag was originally contributed by Milovan Zogovic
+  def cl_form_tag(callback_url, options={}, &block)
+    form_options = options.delete(:form) || {}
+    form_options[:method] = :post
+    form_options[:multipart] = true
+     
+    options[:timestamp] = Time.now.to_i
+    options[:callback] = callback_url    
+    options[:transformation] = Cloudinary::Utils.generate_transformation_string(options[:transformation]) if options[:transformation]
+    options[:tags] = Cloudinary::Utils.build_array(options[:tags]).join(",") if options[:tags]  
+    options[:signature] = Cloudinary::Utils.api_sign_request(options, Cloudinary.config.api_secret)  
+    options[:api_key] = Cloudinary.config.api_key
+  
+    api_url = Cloudinary::Utils.cloudinary_api_url("upload", 
+                {:resource_type => options.delete(:resource_type), :upload_prefix => options.delete(:upload_prefix)})
+
+    form_tag(api_url, form_options) do
+      content = []
+  
+      options.each do |name, value|
+        content << hidden_field_tag(name, value)
+      end
+  
+      content << capture(&block)
+  
+      content.join("\n").html_safe
+    end
+  end
+
   def cloudinary_url(source, options = {})
     options[:secure] = request.ssl? if !options.include?(:secure) && defined?(request) && request && request.respond_to?(:ssl?)
     Cloudinary::Utils.cloudinary_url(source, options)

data/lib/cloudinary/uploader.rb

@@ -99,12 +99,12 @@ class Cloudinary::Uploader
     
     params[:signature] = Cloudinary::Utils.api_sign_request(params.reject{|k,v| non_signable.include?(k)}, api_secret)
     params[:api_key] = api_key
-    cloudinary = options.delete(:upload_prefix) || Cloudinary.config.upload_prefix || "https://api.cloudinary.com"
 
-    resource_type = options.delete(:resource_type) || "image"
     result = nil
-    cloud_name = Cloudinary.config.cloud_name || raise("Must supply cloud_name")
-    RestClient::Request.execute(:method => :post, :url => "#{cloudinary}/v1_1/#{cloud_name}/#{resource_type}/#{action}", :payload => params.reject{|k, v| v.blank?}, :timeout=>60) do
+    
+    api_url = Cloudinary::Utils.cloudinary_api_url(action, {:resource_type => options.delete(:resource_type), :upload_prefix => options.delete(:upload_prefix)})
+    
+    RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject{|k, v| v.blank?}, :timeout=>60) do
       |response, request, tmpresult|
       raise "Server returned unexpected status code - #{response.code} - #{response.body}" if ![200,400,500].include?(response.code)
       begin

data/lib/cloudinary/utils.rb

@@ -99,6 +99,13 @@ class Cloudinary::Utils
      type, transformation, version ? "v#{version}" : nil,
      source].reject(&:blank?).join("/").gsub(%r(([^:])//), '\1/')
   end
+  
+  def self.cloudinary_api_url(action = 'upload', options = {})
+    cloudinary = options[:upload_prefix] || Cloudinary.config.upload_prefix || "https://api.cloudinary.com"
+    cloud_name = Cloudinary.config.cloud_name || raise("Must supply cloud_name")
+    resource_type = options[:resource_type] || "image"
+    return [cloudinary, "v1_1", cloud_name, resource_type, action].join("/")
+  end
 
   def self.asset_file_name(path)
     data = Rails.root.join(path).read(:mode=>"rb")

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 +03:00
+date: 2012-04-11 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,9 @@ files:
 - lib/cloudinary.rb
 - lib/cloudinary/blob.rb
 - lib/cloudinary/carrier_wave.rb
+- lib/cloudinary/controller.rb
 - lib/cloudinary/downloader.rb
 - lib/cloudinary/helper.rb
-- lib/cloudinary/helpers.rb
 - lib/cloudinary/migrator.rb
 - lib/cloudinary/missing.rb
 - lib/cloudinary/railtie.rb

data/lib/cloudinary/helpers.rb

@@ -1,7 +0,0 @@
-# Copyright Cloudinary
-
-module CloudinaryHelper
-    
-end
-
-ActionView::Base.send :include, CloudinaryHelper