Make code compatible with Rails 3

Author: tocker

.gitignore

@@ -3,10 +3,9 @@
 /.config
 capybara-*.html
 .rspec
-/log
-/tmp
-/db/*.sqlite3
-/db/*.sqlite3-journal
+log/
+db/*.sqlite3
+db/*.sqlite3-journal
 /public/system
 /coverage/
 /InstalledFiles
@@ -15,7 +14,7 @@ capybara-*.html
 /test/tmp/
 /spec/tmp
 /test/version_tmp/
-/tmp/
+tmp/
 **.orig
 rerun.txt
 pickle-email-*.html
@@ -42,14 +41,15 @@ build/
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-.ruby-version
-.ruby-gemset
+.ruby-version*
+.ruby-gemset*
+.rvmrc*
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
 # if using bower-rails ignore default bower_components path bower.json files
-/vendor/assets/bower_components
+vendor/assets/bower_components
 *.bowerrc
 bower.json
 

Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
-
+ruby RUBY_VERSION
 # Specify your gem's dependencies in cloudinary.gemspec
 gemspec

cloudinary.gemspec

@@ -20,8 +20,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rest-client"
   s.add_dependency "aws_cf_signer"
   s.add_development_dependency "rspec", '>=2.11'
-  s.add_development_dependency "actionpack"
+  s.add_development_dependency "rspec-rails"
+
+  if RUBY_VERSION > "1.9"
+    s.add_dependency "rest-client"
+    s.add_development_dependency "actionpack"
+    s.add_development_dependency "simplecov"
+  else
+    s.add_dependency "i18n", "<0.7.0"
+    s.add_dependency "rest-client", "<=1.6.8"
+    s.add_development_dependency "actionpack", "~>3.2.0"
+  end
+
 end

lib/cloudinary/active_support/core_ext/hash/keys.rb

@@ -0,0 +1,166 @@
+class Hash
+  # Returns a new hash with all keys converted using the block operation.
+  #
+  #  hash = { name: 'Rob', age: '28' }
+  #
+  #  hash.transform_keys{ |key| key.to_s.upcase }
+  #  # => {"NAME"=>"Rob", "AGE"=>"28"}
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = self.class.new
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+
+  # Destructively convert all keys using the block operations.
+  # Same as transform_keys but modifies +self+.
+  def transform_keys!
+    return enum_for(:transform_keys!) unless block_given?
+    keys.each do |key|
+      self[yield(key)] = delete(key)
+    end
+    self
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  #
+  #   hash = { name: 'Rob', age: '28' }
+  #
+  #   hash.stringify_keys
+  #   # => {"name"=>"Rob", "age"=>"28"}
+  def stringify_keys
+    transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings. Same as
+  # +stringify_keys+, but modifies +self+.
+  def stringify_keys!
+    transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  #
+  #   hash = { 'name' => 'Rob', 'age' => '28' }
+  #
+  #   hash.symbolize_keys
+  #   # => {:name=>"Rob", :age=>"28"}
+  def symbolize_keys
+    transform_keys{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options,  :symbolize_keys
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
+  def symbolize_keys!
+    transform_keys!{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options!, :symbolize_keys!
+
+  # Validate all keys in a hash match <tt>*valid_keys</tt>, raising
+  # ArgumentError on a mismatch.
+  #
+  # Note that keys are treated differently than HashWithIndifferentAccess,
+  # meaning that string and symbol keys will not match.
+  #
+  #   { name: 'Rob', years: '28' }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: :years. Valid keys are: :name, :age"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys('name', 'age') # => raises "ArgumentError: Unknown key: :name. Valid keys are: 'name', 'age'"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys(:name, :age)   # => passes, raises nothing
+  def assert_valid_keys(*valid_keys)
+    valid_keys.flatten!
+    each_key do |k|
+      unless valid_keys.include?(k)
+        raise ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}")
+      end
+    end
+  end
+
+  # Returns a new hash with all keys converted by the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_keys{ |key| key.to_s.upcase }
+  #  # => {"PERSON"=>{"NAME"=>"Rob", "AGE"=>"28"}}
+  def deep_transform_keys(&block)
+    _deep_transform_keys_in_object(self, &block)
+  end
+
+  # Destructively convert all keys by using the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_transform_keys!(&block)
+    _deep_transform_keys_in_object!(self, &block)
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #   hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #   hash.deep_stringify_keys
+  #   # => {"person"=>{"name"=>"Rob", "age"=>"28"}}
+  def deep_stringify_keys
+    deep_transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_stringify_keys!
+    deep_transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+. This includes the keys from the root hash
+  # and from all nested hashes and arrays.
+  #
+  #   hash = { 'person' => { 'name' => 'Rob', 'age' => '28' } }
+  #
+  #   hash.deep_symbolize_keys
+  #   # => {:person=>{:name=>"Rob", :age=>"28"}}
+  def deep_symbolize_keys
+    deep_transform_keys{ |key| key.to_sym rescue key }
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_symbolize_keys!
+    deep_transform_keys!{ |key| key.to_sym rescue key }
+  end
+
+  private
+    # support methods for deep transforming nested hashes and arrays
+    def _deep_transform_keys_in_object(object, &block)
+      case object
+      when Hash
+        object.each_with_object({}) do |(key, value), result|
+          result[yield(key)] = _deep_transform_keys_in_object(value, &block)
+        end
+      when Array
+        object.map {|e| _deep_transform_keys_in_object(e, &block) }
+      else
+        object
+      end
+    end
+
+    def _deep_transform_keys_in_object!(object, &block)
+      case object
+      when Hash
+        object.keys.each do |key|
+          value = object.delete(key)
+          object[yield(key)] = _deep_transform_keys_in_object!(value, &block)
+        end
+        object
+      when Array
+        object.map! {|e| _deep_transform_keys_in_object!(e, &block)}
+      else
+        object
+      end
+    end
+end

lib/cloudinary/active_support/core_ext/hash/readme.md

@@ -0,0 +1 @@
+Files in this folder are taken from Rails 4.

lib/cloudinary/video_helper.rb

@@ -1,5 +1,6 @@
-require 'active_support/core_ext/hash/keys'
-
+if !Hash.respond_to?(:deep_symbolize_keys)
+  require 'cloudinary/active_support/core_ext/hash/keys'
+end
 module CloudinaryHelper
   include ActionView::Context
   DEFAULT_POSTER_OPTIONS = { :format => 'jpg', :resource_type => 'video' }
@@ -28,7 +29,7 @@ def cl_video_tag(source, options = {}, &block)
     options = Hash[options].deep_symbolize_keys
 
     options[:source_types] ||= DEFAULT_SOURCE_TYPES
-
+    video_attributes.keep_if{ |key, _| options.has_key?(key)} # required prior to Rails 4.x
     video_options = options.extract!(*video_attributes)
     if video_options.has_key? :poster
       poster = video_options.delete(:poster)
@@ -58,7 +59,7 @@ def cl_video_tag(source, options = {}, &block)
       cloudinary_tag(source, options) do |_, tag_options|
         content_tag('video', tag_options.merge(video_options)) do
           source_tags = source_types.map do |type|
-            transformation = (source_transformation[type.to_sym] || {}).symbolize_keys
+            transformation = source_transformation[type.to_sym] || {}
             cloudinary_tag("#{source}.#{type}", tag_options.merge(transformation)) do |url, _|
               mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
               tag("source", :src => url, :type => mime_type)
@@ -97,6 +98,26 @@ def cl_video_thumbnail_path(source, options={})
   def strip_known_ext(name)
     name.sub(/\.(#{DEFAULT_SOURCE_TYPES.join("|")})$/, '')
   end
+
+  def safe_join(array, sep=$,)
+    sep = ERB::Util.unwrapped_html_escape(sep)
+    array.flatten.map! { |i| ERB::Util.unwrapped_html_escape(i) }.join(sep).html_safe
+  end unless method_defined?( :safe_join)
+
+  # HTML escapes strings but doesn't wrap them with an ActiveSupport::SafeBuffer.
+  # This method is not for public consumption! Seriously!
+  def unwrapped_html_escape(s) # :nodoc:
+    s = s.to_s
+    if s.html_safe?
+      s
+    else
+      s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
+    end
+  end unless method_defined?( :unwrapped_html_escape)
+
+  HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' } unless defined?( HTML_ESCAPE)
+  HTML_ESCAPE_REGEXP = /[&"'><]/ unless defined?(HTML_ESCAPE_REGEXP)
+
 end
 
 

samples/basic-rails/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.13'
-gem 'cloudinary'
+gem 'rails', '3.2.21'
+gem 'cloudinary', :path => "../.."

samples/basic/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'cloudinary'
+gem 'cloudinary', :path => "../.."

samples/photo_album/Gemfile

@@ -6,7 +6,7 @@ gem 'jquery-rails'
 
 gem 'carrierwave'
 
-gem 'cloudinary', '~> 1.0.79'
+gem 'cloudinary', :path => "../.."
 
 group :assets do
   gem 'uglifier', '>= 1.0.3'

spec/cloudinary_helper_spec.rb

@@ -36,7 +36,7 @@
     let(:test_tag) { TestTag.new( helper.cl_image_tag('sample.jpg', options)) }
 
     context ":responsive_width" do
-      let(:options) { {responsive_width: true, cloud_name: "test"} }
+      let(:options) { {:responsive_width => true, :cloud_name => "test"} }
       it "should use data-src for responsive_width" do
         expect(test_tag.name).to match( 'img')
         expect(test_tag['class']).to eq("cld-responsive")
@@ -45,7 +45,7 @@
     end
 
     context ":dpr_auto" do
-      let(:options) { {dpr: :auto, cloud_name: "test"} }
+      let(:options) { {:dpr => :auto, :cloud_name => "test"} }
       it "should use data-src for dpr auto" do
         expect(test_tag.name).to match( 'img')
         expect(test_tag['class']).to eq( 'cld-hidpi')

spec/spec_helper.rb

@@ -49,8 +49,8 @@ def [](symbol_or_string)
   end
 
   def method_missing(symbol, *args)
-    if m = /children_by_(?<name>\w+)/.match( symbol.to_s) and !args.empty?
-      @children.select{ |c| c[m[:name]] == args[0]}
+    if (m = /children_by_(\w+)/.match(symbol.to_s)) and !args.empty?
+      @children.select{ |c| c[m[1]] == args[0]}
     else
       super
     end

spec/utils_spec.rb

@@ -367,9 +367,9 @@
   end
 
   it "should support responsive width" do
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_limit,w_auto/test", { responsive: true })
+    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_limit,w_auto/test", { :responsive => true })
     Cloudinary.config.responsive_width_transformation = {:width => :auto, :crop => :pad}
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_pad,w_auto/test", { responsive: true })
+    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_pad,w_auto/test", { :responsive => true })
   end
 
   it "should correctly encode double arrays" do

spec/video_tag_spec.rb

@@ -3,8 +3,18 @@
 require 'cloudinary'
 require 'action_view'
 require 'cloudinary/helper'
-
+require 'rails/version'
 include CloudinaryHelper
+include ActionView::Helpers::AssetTagHelper
+
+if Rails::VERSION::MAJOR == 3
+  def config
+    @config ||= {}
+  end
+  def controller
+    @controller ||={}
+  end
+end
 
 describe CloudinaryHelper do
   before(:each) do
@@ -33,7 +43,7 @@
                                             :muted    => true,
                                             :preload  => true }) }
       it "should suport video tag parameters" do
-        expect(test_tag.attributes.keys).to include("autoplay", "controls", "loop", "muted", "poster", "preload")
+        expect(test_tag.attributes.keys).to include("autoplay", "controls", "loop", "muted", "preload")
       end
     end
     { :autoplay => true, :controls => false, :loop => false, :muted => true, :preload => true }