cloudinary 1.0.77 → 1.0.78

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGI0OTQxN2RmMjg3MzA5N2M0NTE5ZjkxZjE4MjFjZWI1ODA3MjBjNQ==
-  data.tar.gz: !binary |-
-    MDBmYTIzYTA0MjYwMDQ2MGIxYWNkYzU4YmZkZGI2NjlmNTQzNzJlNw==
-SHA512:
-  metadata.gz: !binary |-
-    MDVjNzA1NjdhNjZmNjI3OTllNjAzYTU4ZDQ1MDkyOTU1OWNiMjljNmIyZGQ0
-    ZWVmZjc1NWQ1OTUyOGE5MmIzYTI0MTU0MmQ2YzcwYWFhN2MxNzE4NTY0ZjY1
-    YTg4ZmZlYzA0Mzk1ZDhmMzZkYjhhNjRkNWI4NjBjNDYwOWI0ZTI=
-  data.tar.gz: !binary |-
-    NTk3ZjljM2I1YmI4Yzk3MmQ5YTZjYjk0MzhiYWM3ZTkxNDJjMTUyYmUzNDFj
-    MzgyYzU3NDI1YThmMzg2NmE4ZGIyOTg5ZmVjYjBmZjg0OThjYWNlNjg0Mjlk
-    ZmNhMDk4MTQ4YmIwZWVmNjExM2UzOTQwYzc0ZTI3Yjk2ZWUxNzU=
+--- 
+SHA1: 
+  metadata.gz: 1b465c67371871382525ab5dd84b4ac295ca59f9
+  data.tar.gz: a46f2de133c16575112eaefb0c92955080f759a4
+SHA512: 
+  metadata.gz: 21755db5865749be5a67c64ce750d8666618325d0f7d1b5713e0297aa02f30d40d20da5859896036aeb3f6f0312dd2c1b47b0b0cc5e539bd9333bf474653abbb
+  data.tar.gz: a2b04439ffaae15f62100723b97a4ac52e0c543e07f5e2af3f5e644ac1957c962b7cadf522d932641915c9f2c960db8e1119e0db401126860f63dd8596c8ef2a

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 1.0.78 - 2014-11-04
+  * Add app_root method that handled Rails.root, which is a String in old Rails versions.
+  * Issue #127 - solve cyclical dependency in case cloudinary was included after Rails was initialized.
+
 = Version 1.0.77 - 2014-09-22
   * Update Cloudinary's jQuery plugin to v1.0.20.
   * Support invalidation in bulk deletion requests.

data/lib/cloudinary.rb

@@ -7,10 +7,6 @@ require "erb"
 require "cloudinary/version"
 require "cloudinary/exceptions"
 require "cloudinary/missing"
-require "cloudinary/helper" if defined?(::ActionView::Base)
-require "cloudinary/controller" if defined?(::ActionController::Base)
-require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
-require "cloudinary/engine" if defined?(Rails) && defined?(Rails::Engine)
 
 module Cloudinary
   autoload :Utils, 'cloudinary/utils'
@@ -80,6 +76,15 @@ module Cloudinary
     end    
   end
   
+  def self.app_root
+    if (defined?(Rails) && Rails.root)
+      # Rails 2.2 return String for Rails.root
+      Rails.root.is_a?(Pathname) ? Rails.root : Pathname.new(Rails.root)
+    else
+      Pathname.new(".")
+    end
+  end
+
   private
   
   def self.config_env
@@ -90,11 +95,17 @@ module Cloudinary
   
   def self.config_dir
     return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"] 
-    return Rails.root.join("config") if defined?(Rails)
-    Pathname.new("config")
+    self.app_root.join("config")
   end
   
   def self.set_config(new_config)
     new_config.each{|k,v| @@config.send(:"#{k}=", v) if !v.nil?}
   end
 end
+
+# Prevent require loop if included after Rails is already initialized.
+require "cloudinary/helper" if defined?(::ActionView::Base)
+require "cloudinary/controller" if defined?(::ActionController::Base)
+require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
+require "cloudinary/engine" if defined?(Rails) && defined?(Rails::Engine)
+

data/lib/cloudinary/static.rb

@@ -32,11 +32,11 @@ class Cloudinary::Static
       end
     end
   end
-  
+
   def self.root
-    (defined?(Rails) && Rails.root) || Pathname.new(".")
+    Cloudinary.app_root
   end
-  
+
   def self.metadata_file_path
     self.root.join(METADATA_FILE)
   end

data/lib/cloudinary/utils.rb

@@ -248,7 +248,7 @@ class Cloudinary::Utils
   end
 
   def self.asset_file_name(path)
-    data = Rails.root.join(path).read(:mode=>"rb")
+    data = Cloudinary.app_root.join(path).read(:mode=>"rb")
     ext = path.extname
     md5 = Digest::MD5.hexdigest(data)
     public_id = "#{path.basename(ext)}-#{md5}"

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.77"
+  VERSION = "1.0.78"
 end

metadata

@@ -1,82 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cloudinary
-version: !ruby/object:Gem::Version
-  version: 1.0.77
+version: !ruby/object:Gem::Version 
+  version: 1.0.78
 platform: ruby
-authors:
+authors: 
 - Nadav Soferman
 - Itai Lahan
 - Tal Lev-Ami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-11-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws_cf_signer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aws_cf_signer
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: actionpack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id005
 description: Client library for easily using the Cloudinary service
-email:
+email: 
 - nadav.soferman@cloudinary.com
 - itai.lahan@cloudinary.com
 - tal.levami@cloudinary.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - CHANGELOG
@@ -128,30 +111,29 @@ files:
 - vendor/assets/javascripts/cloudinary/load-image.min.js
 - vendor/assets/javascripts/cloudinary/processing.js
 homepage: http://cloudinary.com
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: cloudinary
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
-test_files:
+test_files: 
 - spec/api_spec.rb
 - spec/cloudinary_helper_spec.rb
 - spec/docx.docx