cloudinary 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154b7abbf7ae3c462f1277f49dfed3cfdd4ef60c
-  data.tar.gz: 56a961c58cc636da0830ba4e1db3f486fe1dffd4
+  metadata.gz: 7614adaac6c80b6af25b391e1224a492c609fde8
+  data.tar.gz: 726d2520ec2adbb6d91b5ec6b1bceb46071d58e9
 SHA512:
-  metadata.gz: 7fc132e944b87f3bd829f3e45a16609c7e4743a8fa331fad6d62a490a6f1625c533ea26b9eb50d1da71123abc5948166d5b606694b4765562877d255f54f93e9
-  data.tar.gz: 5a1ca4908473ea368ed4a2c1753852879fc75bf3dba22819f44637728de83c6a69f0a48482b5729e46d9f582a3c70748deeaad5dc683a8a2fa831ec784c3b302
+  metadata.gz: 760b8e34412a2e4272edc42032aa6abf92cb655472dccd4c35e39126adbce44660b44a0210956ebf28708bc5bb234504f17799023b7062bf6812c257d7aca072
+  data.tar.gz: 9b8869009e05cb9ee5b100cd5652a49e653aedd992dc350a55375a527dff0b5209d0fdadce221d8c7253a3c4b7dca66d2e5b8bcfcd1fb469b8bfa692d562604a

data/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+1.8.0 / 2017-05-01
+==================
+
+New functionality and features
+------------------------------
+
+  * Add Search API
+  * Sync static for non image assets (#241) fixes #27
+
+Other Changes
+-------------
+
+  * Fix Carrierwave signed URL.
+
 1.7.0 / 2017-04-09
 ==================
 

data/cloudinary.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "aws_cf_signer"
   s.add_development_dependency "rspec", '>=3.5'
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rake"
 
   if RUBY_VERSION > "2.0"
     s.add_dependency "rest-client"

data/lib/cloudinary.rb

@@ -22,6 +22,7 @@ module Cloudinary
   autoload :PreloadedFile, "cloudinary/preloaded_file"
   autoload :Static, "cloudinary/static"
   autoload :CarrierWave, "cloudinary/carrier_wave"
+  autoload :Search, "cloudinary/search"
 
   CF_SHARED_CDN         = "d3jpl91pxevbkh.cloudfront.net"
   AKAMAI_SHARED_CDN     = "res.cloudinary.com"

data/lib/cloudinary/api.rb

@@ -1,4 +1,5 @@
 require 'rest_client'
+require 'json'
 
 class Cloudinary::Api
   class Error < CloudinaryException; end
@@ -316,7 +317,14 @@ class Cloudinary::Api
     # Add authentication
     api_url.sub!(%r(^(https?://)), "\\1#{api_key}:#{api_secret}@")
 
-    RestClient::Request.execute(:method => method, :url => api_url, :payload => params.reject { |k, v| v.nil? || v=="" }, :timeout => timeout, :headers => { "User-Agent" => Cloudinary::USER_AGENT }) do
+    headers = { "User-Agent" => Cloudinary::USER_AGENT }
+    if options[:content_type]== :json
+      payload = params.to_json
+      headers.merge!("Content-Type"=> 'application/json', "Accept"=> 'application/json')
+    else
+      payload = params.reject { |k, v| v.nil? || v=="" }
+    end
+    RestClient::Request.execute(:method => method, :url => api_url, :payload => payload, :timeout => timeout, :headers => headers) do
     |response, request, tmpresult|
       return Response.new(response) if response.code == 200
       exception_class = case response.code

data/lib/cloudinary/carrier_wave.rb

@@ -44,8 +44,9 @@ module Cloudinary::CarrierWave
         public_id = self.default_public_id
         return nil if public_id.nil?
       else
-        public_id = options.include?(:version) ? self.my_public_id : self.full_public_id
-      end      
+        public_id = self.my_public_id
+        options[:version] ||= self.stored_version
+      end
       options = self.transformation.merge(options) if self.version_name.present?
       
       Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format, :resource_type=>self.resource_type, :type=>self.storage_type}.merge(options))

data/lib/cloudinary/search.rb

@@ -0,0 +1,55 @@
+class Cloudinary::Search
+  def initialize
+    @query_hash = {
+      :sort_by    => [],
+      :aggregate  => [],
+      :with_field   => []
+    }
+  end
+
+  ## implicitly generate an instance delegate the method
+  def self.method_missing(method_name, *arguments)
+    instance = new
+    instance.send(method_name, *arguments)
+  end
+
+  def expression(value)
+    @query_hash[:expression] = value
+    self
+  end
+
+  def max_results(value)
+    @query_hash[:max_results] = value
+    self
+  end
+
+  def next_cursor(value)
+    @query_hash[:next_cursor] = value
+    self
+  end
+
+  def sort_by(field_name, dir = 'desc')
+    @query_hash[:sort_by].push(field_name => dir)
+    self
+  end
+
+  def aggregate(value)
+    @query_hash[:aggregate].push(value)
+    self
+  end
+
+  def with_field(value)
+    @query_hash[:with_field].push(value)
+    self
+  end
+
+  def to_h
+    @query_hash.select { |_, value| !value.nil? && !(value.is_a?(Array) && value.empty?) }
+  end
+
+  def execute(options = {})
+    options[:content_type] = :json
+    uri = 'resources/search'
+    Cloudinary::Api.call_api(:post, uri, to_h, options)
+  end
+end

data/lib/cloudinary/static.rb

@@ -3,126 +3,236 @@ require 'time'
 require 'set'
 class Cloudinary::Static
   IGNORE_FILES = [".svn", "CVS", "RCS", ".git", ".hg"]
-  SUPPORTED_IMAGES = [/\.(gif|jpe?g|png|bmp|ico|webp|wdp|jxr|jp2|svg|pdf)$/i]
-  STATIC_IMAGE_DIRS = ["app/assets/images", "lib/assets/images", "vendor/assets/images", "public/images"]
+  DEFAULT_IMAGE_DIRS = ["app/assets/images", "lib/assets/images", "vendor/assets/images", "public/images"]
+  DEFAULT_IMAGE_EXTENSION_MASK = 'gif|jpe?g|png|bmp|ico|webp|wdp|jxr|jp2|svg|pdf'
   METADATA_FILE = ".cloudinary.static"
   METADATA_TRASH_FILE = ".cloudinary.static.trash"
-  
-  def self.discover
-    ignore_files = Cloudinary.config.ignore_files || IGNORE_FILES 
-    relative_dirs = Cloudinary.config.static_image_dirs || STATIC_IMAGE_DIRS
-    dirs = relative_dirs.map{|dir| self.root.join(dir)}.select(&:exist?)
-    dirs.each do
-      |dir|
-      dir.find do
-        |path|
-        file = path.basename.to_s
-        if ignore_files.any?{|pattern| pattern.is_a?(String) ? pattern == file : file.match(pattern)}
-          Find.prune
-          next
-        elsif path.directory?
+
+  class << self
+    def sync(options={})
+      options = options.clone
+      delete_missing = options.delete(:delete_missing)
+      found_paths = Set.new
+      found_public_paths = {}
+      found_public_ids = Set.new
+      metadata = build_metadata
+      metadata_lines = []
+      counts = { :not_changed => 0, :uploaded => 0, :deleted => 0, :not_found => 0}
+      discover_all do |path, public_path|
+        next if found_paths.include?(path)
+        if found_public_paths[public_path]
+          print "Warning: duplicate #{public_path} in #{path} - already taken from #{found_public_paths[public_path]}\n"
           next
-        elsif SUPPORTED_IMAGES.none?{|pattern| pattern.is_a?(String) ? pattern == file : file.match(pattern)}
-          next          
+        end
+        found_paths << path
+        found_public_paths[public_path] = path
+        data = root.join(path).read(:mode=>"rb")
+        ext = path.extname
+        format = ext[1..-1]
+        md5 = Digest::MD5.hexdigest(data)
+        public_id = "#{public_path.basename(ext)}-#{md5}"
+        found_public_ids << public_id
+        item_metadata = metadata.delete(public_path.to_s)
+        if item_metadata && item_metadata["public_id"] == public_id # Signature match
+          counts[:not_changed] += 1
+          print "#{public_path} - #{public_id} - Not changed\n"
+          result = item_metadata
         else
-          relative_path = path.relative_path_from(self.root)
-          public_path = path.relative_path_from(dir.dirname)
-          yield(relative_path, public_path)
+          counts[:uploaded] += 1
+          print "#{public_path} - #{public_id} - Uploading\n"
+          result = Cloudinary::Uploader.upload(Cloudinary::Blob.new(data, :original_filename=>path.to_s),
+            options.merge(:format=>format, :public_id=>public_id, :type=>:asset, :resource_type=>resource_type(path.to_s))
+          ).merge("upload_time"=>Time.now)
         end
+        metadata_lines << [public_path, public_id, result["upload_time"].to_i, result["version"], result["width"], result["height"]].join("\t")+"\n"
       end
+      File.open(metadata_file_path, "w"){|f| f.print(metadata_lines.join)}
+      metadata.to_a.each do |path, info|
+        counts[:not_found] += 1
+        print "#{path} - #{info["public_id"]} - Not found\n"      
+      end
+      # Files no longer needed 
+      trash = metadata.to_a + build_metadata(metadata_trash_file_path, false).reject{|public_path, info| found_public_ids.include?(info["public_id"])}
+      
+      if delete_missing
+        trash.each do
+          |path, info|
+          counts[:deleted] += 1
+          print "#{path} - #{info["public_id"]} - Deleting\n"
+          Cloudinary::Uploader.destroy(info["public_id"], options.merge(:type=>:asset))
+        end
+        FileUtils.rm_f(metadata_trash_file_path)
+      else
+        # Add current removed file to the trash file.
+        metadata_lines = trash.map do
+          |public_path, info|
+          [public_path, info["public_id"], info["upload_time"].to_i, info["version"], info["width"], info["height"]].join("\t")+"\n"
+        end
+        File.open(metadata_trash_file_path, "w"){|f| f.print(metadata_lines.join)}
+      end
+  
+      print "\nCompleted syncing static resources to Cloudinary\n"
+      print counts.sort.reject{|k,v| v == 0}.map{|k,v| "#{v} #{k.to_s.gsub('_', ' ').capitalize}"}.join(", ") + "\n"
     end
-  end
 
-  def self.root
-    Cloudinary.app_root
-  end
+    # ## Cloudinary::Utils support ###
+    def public_id_and_resource_type_from_path(path)
+      metadata = build_metadata
+      path = path.sub(/^\//, '')
+      data = metadata[path]
+      unless data
+        public_prefixes.each do |prefix|
+          if metadata[File.join(prefix, path)]
+            data = metadata[File.join(prefix, path)]
+            break
+          end
+        end
+      end
+      return unless data
+      [data['public_id'], resource_type(path)]
+    end
 
-  def self.metadata_file_path
-    self.root.join(METADATA_FILE)
-  end
+    private
+    def root
+      Cloudinary.app_root
+    end
 
-  def self.metadata_trash_file_path
-    self.root.join(METADATA_TRASH_FILE)
-  end
-  
-  def self.metadata(metadata_file = metadata_file_path, hash=true) 
-    metadata = []
-    if File.exist?(metadata_file)
-      IO.foreach(metadata_file) do
+    def metadata_file_path
+      root.join(METADATA_FILE)
+    end
+
+    def metadata_trash_file_path
+      root.join(METADATA_TRASH_FILE)
+    end
+
+    def build_metadata(metadata_file = metadata_file_path, hash = true)
+      metadata = []
+      if File.exist?(metadata_file)
+        IO.foreach(metadata_file) do
         |line|
-        line.strip!
-        next if line.blank?
-        path, public_id, upload_time, version, width, height = line.split("\t")
-        metadata << [path, {
-          "public_id" => public_id, 
-          "upload_time" => Time.at(upload_time.to_i).getutc, 
-          "version" => version,
-          "width" => width.to_i,
-          "height" => height.to_i
-        }]
+          line.strip!
+          next if line.blank?
+          path, public_id, upload_time, version, width, height = line.split("\t")
+          metadata << [path, {
+            "public_id" => public_id,
+            "upload_time" => Time.at(upload_time.to_i).getutc,
+            "version" => version,
+            "width" => width.to_i,
+            "height" => height.to_i
+          }]
+        end
       end
+      hash ? Hash[*metadata.flatten] : metadata
     end
-    hash ? Hash[*metadata.flatten] : metadata
-  end
 
-  def self.sync(options={})
-    options = options.clone
-    delete_missing = options.delete(:delete_missing)
-    metadata = self.metadata
-    found_paths = Set.new
-    found_public_ids = Set.new
-    metadata_lines = []
-    counts = { :not_changed => 0, :uploaded => 0, :deleted => 0, :not_found => 0}
-    self.discover do
-      |path, public_path|
-      next if found_paths.include?(path)
-      found_paths << path
-      data = self.root.join(path).read(:mode=>"rb")
-      ext = path.extname
-      format = ext[1..-1]
-      md5 = Digest::MD5.hexdigest(data)
-      public_id = "#{public_path.basename(ext)}-#{md5}"
-      found_public_ids << public_id
-      current_metadata = metadata.delete(public_path.to_s)      
-      if current_metadata && current_metadata["public_id"] == public_id # Signature match
-        counts[:not_changed] += 1
-        $stderr.print "#{public_path} - #{public_id} - Not changed\n"
-        result = current_metadata
-      else
-        counts[:uploaded] += 1
-        $stderr.print "#{public_path} - #{public_id} - Uploading\n"
-        result = Cloudinary::Uploader.upload(Cloudinary::Blob.new(data, :original_filename=>path.to_s),
-          options.merge(:format=>format, :public_id=>public_id, :type=>:asset)
-        ).merge("upload_time"=>Time.now)        
+    def discover_all(&block)
+      static_file_config.each do |group, data|
+        print "-> Syncing #{group}...\n"
+        discover(absolutize(data['dirs']), extension_matcher_for(group), &block)
+        print "=========================\n"
+      end
+    end
+
+    def discover(dirs, matcher)
+      return unless matcher
+
+      dirs.each do |dir|
+        print "Scanning #{dir.relative_path_from(root)}...\n"
+        dir.find do |path|
+          file = path.basename.to_s
+          if ignore_file?(file)
+            Find.prune
+            next
+          elsif path.directory? || !matcher.call(path.to_s)
+            next
+          else
+            relative_path = path.relative_path_from(root)
+            public_path = path.relative_path_from(dir.dirname)
+            yield(relative_path, public_path)
+          end
+        end
       end
-      metadata_lines << [public_path, public_id, result["upload_time"].to_i, result["version"], result["width"], result["height"]].join("\t")+"\n"
     end
-    File.open(self.metadata_file_path, "w"){|f| f.print(metadata_lines.join)}
-    metadata.to_a.each do |path, info|
-      counts[:not_found] += 1
-      $stderr.print "#{path} - #{info["public_id"]} - Not found\n"      
+
+    def ignore_file?(file)
+      matches?(file, Cloudinary.config.ignore_files || IGNORE_FILES)
     end
-    # Files no longer needed 
-    trash = metadata.to_a + self.metadata(metadata_trash_file_path, false).reject{|public_path, info| found_public_ids.include?(info["public_id"])} 
-    
-    if delete_missing
-      trash.each do
-        |path, info|
-        counts[:deleted] += 1
-        $stderr.print "#{path} - #{info["public_id"]} - Deleting\n"
-        Cloudinary::Uploader.destroy(info["public_id"], options.merge(:type=>:asset))
+
+    # Test for matching either strings or regexps
+    def matches?(target, patterns)
+      Array(patterns).any? {|pattern| pattern.is_a?(String) ? pattern == target : target.match(pattern)}
+    end
+
+    def extension_matcher_for(group)
+      group = group.to_s
+      return unless static_file_config[group]
+      @matchers = {}
+      @matchers[group] ||= ->(target) do
+        !!target.match(extension_mask_to_regex(static_file_config[group]['file_mask']))
       end
-      FileUtils.rm_f(self.metadata_trash_file_path)
-    else
-      # Add current removed file to the trash file.
-      metadata_lines = trash.map do
-        |public_path, info|
-        [public_path, info["public_id"], info["upload_time"].to_i, info["version"], info["width"], info["height"]].join("\t")+"\n"
+    end
+
+    def static_file_config
+      @static_file_config ||= begin
+        config = Cloudinary.config.static_files || {}
+
+        # Default
+        config['images'] ||= {}
+        config['images']['dirs'] ||= Cloudinary.config.static_image_dirs # Backwards compatibility
+        config['images']['dirs'] ||= DEFAULT_IMAGE_DIRS
+        config['images']['file_mask'] ||= DEFAULT_IMAGE_EXTENSION_MASK
+        # Validate
+        config.each do |group, data|
+          unless data && data['dirs'] && data['file_mask']
+            print "In config, static_files group '#{group}' needs to have both 'dirs' and 'file_mask' defined.\n"
+            exit
+          end
+        end
+
+        config
       end
-      File.open(self.metadata_trash_file_path, "w"){|f| f.print(metadata_lines.join)}    
+    end
+
+    def reset_static_file_config!
+      @static_file_config = nil
+    end
+
+    def image?(path)
+      extension_matcher_for(:images).call(path)
+    end
+
+    def resource_type(path)
+      if image?(path)
+        :image
+      else
+        :raw
+      end
+    end
+
+    def extension_mask_to_regex(extension_mask)
+      extension_mask && /\.(?:#{extension_mask})$/i
+    end
+
+    def public_prefixes
+      @public_prefixes ||= static_file_config.reduce([]) do |result, (group, data)|
+        result << data['dirs'].map { |dir| Pathname.new(dir).basename.to_s }
+      end.flatten.uniq
+    end
+
+    def absolutize(dirs)
+      dirs.map do |relative_dir|
+        absolute_dir = root.join(relative_dir)
+        if absolute_dir.exist?
+          absolute_dir
+        else
+          print "Skipping #{relative_dir} (does not exist)\n"
+          nil
+        end
+      end.compact
     end
     
-    $stderr.print "\nCompleted syncing static resources to Cloudinary\n"
-    $stderr.print counts.sort.reject{|k,v| v == 0}.map{|k,v| "#{v} #{k.to_s.gsub('_', ' ').capitalize}"}.join(", ") + "\n"
+    def print(s)
+      $stderr.print(s)
+    end
   end
 end

data/lib/cloudinary/utils.rb

@@ -376,21 +376,20 @@ class Cloudinary::Utils
     source = source.to_s
     if !force_remote
       return original_source if (type.nil? || type == "asset") && source.match(%r(^https?:/)i)
-      if source.start_with?("/")
+      if type == "asset"
+        # config.static_image_support left for backwards compatibility
+        if (Cloudinary.config.static_file_support || Cloudinary.config.static_image_support) && defined?(Cloudinary::Static)
+          source, resource_type = Cloudinary::Static.public_id_and_resource_type_from_path(source)
+        end
+        return original_source unless source
+        source += File.extname(original_source) if !format
+      elsif source.start_with?("/")
         if source.start_with?("/images/")
           source = source.sub(%r(/images/), '')
         else
           return original_source
         end
       end
-      @metadata ||= defined?(Cloudinary::Static) ? Cloudinary::Static.metadata : {}
-      if type == "asset" && @metadata["images/#{source}"]
-        return original_source if !Cloudinary.config.static_image_support
-        source = @metadata["images/#{source}"]["public_id"]
-        source += File.extname(original_source) if !format
-      elsif type == "asset"
-        return original_source # requested asset, but no metadata - probably local file. return.
-      end
     end
 
     resource_type, type = finalize_resource_type(resource_type, type, url_suffix, use_root_path, shorten)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/lib/tasks/cloudinary.rake

@@ -1,7 +1,9 @@
-namespace :cloudinary do
-  desc "Sync static resources with cloudinary"
-  task :sync_static => :environment do
-    delete_missing = ENV["DELETE_MISSING"] == 'true' || ENV["DELETE_MISSING"] == '1'
-    Cloudinary::Static.sync(:delete_missing=>delete_missing)
+unless Rake::Task.task_defined?('cloudinary:sync_static') # prevent double-loading/execution
+  namespace :cloudinary do
+    desc "Sync static resources with cloudinary"
+    task :sync_static do
+      delete_missing = ENV['DELETE_MISSING'] == 'true' || ENV['DELETE_MISSING'] == '1'
+      Cloudinary::Static.sync(:delete_missing => delete_missing)
+    end
   end
-end
+end

data/spec/api_spec.rb

@@ -10,14 +10,15 @@ describe Cloudinary::Api do
   test_id_1 = "#{prefix}_1"
   test_id_2   = "#{prefix}_2"
   test_id_3   = "#{prefix}_3"
+  test_key = "test_key_#{SUFFIX}"
   before(:all) do
 
     @api = Cloudinary::Api
     Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
     Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_2, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
     Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "key=value", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=test", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
-    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "test-key=tasty", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_1, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "#{test_key}=test", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
+    Cloudinary::Uploader.upload(TEST_IMG, :public_id => test_id_3, :tags => [TEST_TAG, TIMESTAMP_TAG], :context => "#{test_key}=tasty", :eager =>[:width =>TEST_WIDTH, :crop =>:scale])
   end
 
   after(:all) do
@@ -79,9 +80,9 @@ describe Cloudinary::Api do
   end
   
   it "should allow listing resources by context" do
-    resources = @api.resources_by_context('test-key')["resources"]
+    resources = @api.resources_by_context(test_key)["resources"]
     expect(resources.count).to eq(2)
-    resources = @api.resources_by_context('test-key','test')["resources"]
+    resources = @api.resources_by_context(test_key,'test')["resources"]
     expect(resources.count).to eq(1)
   end
 

data/spec/data/sync_static/app/assets/javascripts/1.coffee

@@ -0,0 +1 @@
+coffeescript = true

data/spec/data/sync_static/app/assets/javascripts/1.js

@@ -0,0 +1 @@
+{ alert("I am javascript!");}

data/spec/data/sync_static/app/assets/stylesheets/1.css

@@ -0,0 +1,3 @@
+p#css {
+    color: red;
+}

data/spec/rake_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+require 'cloudinary'
+
+require 'tmpdir'
+require 'pathname'
+
+describe 'cloudinary:sync_static' do
+  include_context 'rake' # context needs to have the exact rake task as name
+  include Helpers::TempFileHelpers
+
+  before(:all) do
+    copy_root_to_temp('spec/data/sync_static/')
+
+    # Reuse some existing spec assets so as not to add weight to the project
+    copy_file_to_temp('spec/logo.png', 'app/assets/images/logo1.png')
+    copy_file_to_temp('spec/logo.png', 'app/assets/images/logo2.png')
+    copy_file_to_temp('samples/basic/lake.jpg', 'app/assets/images/lake1.jpg')
+    copy_file_to_temp('samples/basic/lake.jpg', 'public/images/lake2.jpg')
+  end
+
+  after(:all) do
+    clean_up_temp_files!
+  end
+
+  before (:each) do
+    allow(Cloudinary).to receive(:app_root).and_return(Pathname.new(temp_root))
+    Cloudinary::Static.send(:reset_static_file_config!)
+  end
+
+  after (:each) do
+    # destroy all uploaded assets
+    Cloudinary::Static.send(:build_metadata).each do |_, data|
+      Cloudinary::Uploader.destroy(data['public_id'], {:type => :asset})
+    end
+    # delete metadata_file_path
+    FileUtils.rm_f(Cloudinary::Static.send(:metadata_file_path))
+    FileUtils.rm_f(Cloudinary::Static.send(:metadata_trash_file_path))
+  end
+
+  it 'should find correct file when running in default configuration' do
+    # with default settings, 4 images only will be uploaded
+    subject.invoke
+    expect(Cloudinary::Static.send(:build_metadata).size).to eq 4
+  end
+
+  it 'should respect deprecated static_image_dirs config setting' do
+    allow(Cloudinary.config).to receive(:static_image_dirs).and_return(['public/images'])
+    subject.invoke
+    expect(Cloudinary::Static.send(:build_metadata).size).to eq 1
+  end
+
+  it 'should allow to specify only dirs in images group, taking the file_mask from default' do
+    allow(Cloudinary.config).to receive(:static_files).and_return({
+                                                                    'images' => {
+                                                                      'dirs' => ['public/images']
+                                                                    }
+                                                                  })
+    subject.invoke
+    expect(Cloudinary::Static.send(:build_metadata).size).to eq 1
+  end
+
+  it 'should allow to specify only file_mask in images group, taking the dirs from default' do
+    allow(Cloudinary.config).to receive(:static_files).and_return({
+                                                                    'images' => {
+                                                                      'file_mask' => 'png'
+                                                                    }
+                                                                  })
+    subject.invoke
+    expect(Cloudinary::Static.send(:build_metadata).size).to eq 2
+  end
+
+  it 'should allow to specify regex expressions in file_mask' do
+    allow(Cloudinary.config).to receive(:static_files).and_return({
+                                                                    'images' => {
+                                                                      'file_mask' => 'p.?g|jp.?'
+                                                                    },
+                                                                    'javascripts' => {
+                                                                      'dirs' => ['app/assets/javascripts'],
+                                                                      'file_mask' => 'js'
+                                                                    },
+                                                                    'stylesheets' => {
+                                                                      'dirs' => ['app/assets/stylesheets'],
+                                                                      'file_mask' => 'css'
+                                                                    }
+                                                                  })
+    subject.invoke
+    expect(Cloudinary::Static.send(:build_metadata).size).to eq 6
+  end
+
+  context 'Cloudinary::Utils.cloudinary_url' do
+    def all_asset_forms_of(public_id)
+      [public_id, "/#{public_id}", public_id.split('/').last]
+    end
+
+    RSpec::Matchers.define :be_asset_mapped_by_cloudinary_url_to do |expected|
+      match do |actual|
+        actual.all? do |public_path|
+          Cloudinary::Utils.cloudinary_url(public_path, :cloud_name => 'test', :type => 'asset') == expected
+        end
+      end
+    end
+
+    before(:each) do
+      allow(Cloudinary.config).to receive(:static_files).and_return({
+                                                                      'images' => {
+                                                                        'dirs' => ['app/assets/images'],
+                                                                        'file_mask' => 'p.?g|jp.?'
+                                                                      },
+                                                                      'javascripts' => {
+                                                                        'dirs' => ['app/assets/javascripts'],
+                                                                        'file_mask' => 'js'
+                                                                      },
+                                                                      'stylesheets' => {
+                                                                        'dirs' => ['app/assets/stylesheets'],
+                                                                        'file_mask' => 'css'
+                                                                      }
+                                                                    })
+
+    end
+
+    it 'should return Cloudinary asset urls for assets when Cloudinary.config.static_file_support is true' do
+      allow(Cloudinary.config).to receive(:static_file_support).and_return(true)
+      subject.invoke
+
+      expect(all_asset_forms_of('images/logo1.png')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
+      expect(all_asset_forms_of('javascripts/1.js')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-b01de57adb485efdde843154d030644e.js')
+      expect(all_asset_forms_of('stylesheets/1.css')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-f24cc6123afd401ab86d8596cabc619f.css')
+
+      # without :type => 'asset'
+      expect(Cloudinary::Utils.cloudinary_url('logo1.png')).not_to include('7dc60722d4653261648038b579fdb89e')
+    end
+
+    it 'should return Cloudinary asset urls for assets when Cloudinary.config.static_image_support is true (backwards compatibility)' do
+      allow(Cloudinary.config).to receive(:static_image_support).and_return(true)
+      subject.invoke
+
+      expect(all_asset_forms_of('images/logo1.png')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
+    end
+  end
+
+end

data/spec/search_spec.rb

@@ -0,0 +1,109 @@
+require 'spec_helper'
+require 'cloudinary'
+
+describe Cloudinary::Search do
+  context 'unit' do
+    it 'should create empty json' do
+      query_hash = Cloudinary::Search.to_h
+      expect(query_hash).to eq({})
+    end
+
+    it 'should always return same object in fluent interface' do
+      instance = Cloudinary::Search.new
+      %w(expression sort_by max_results next_cursor aggregate with_field).each do |method|
+        same_instance = instance.send(method, 'emptyarg')
+        expect(instance).to eq(same_instance)
+      end
+    end
+
+    it 'should add expression to query' do
+      query = Cloudinary::Search.expression('format:jpg').to_h
+      expect(query).to eq(expression: 'format:jpg')
+    end
+
+    it 'should add sort_by to query' do
+      query = Cloudinary::Search.sort_by('created_at', 'asc').sort_by('updated_at', 'desc').to_h
+      expect(query).to eq(sort_by: [{ 'created_at' => 'asc' }, { 'updated_at' => 'desc' }])
+    end
+
+    it 'should add max_results to query' do
+      query = Cloudinary::Search.max_results('format:jpg').to_h
+      expect(query).to eq(max_results: 'format:jpg')
+    end
+
+    it 'should add next_cursor to query' do
+      query = Cloudinary::Search.next_cursor('format:jpg').to_h
+      expect(query).to eq(next_cursor: 'format:jpg')
+    end
+
+    it 'should add aggregations arguments as array to query' do
+      query = Cloudinary::Search.aggregate('format').aggregate('size_category').to_h
+      expect(query).to eq(aggregate: %w(format size_category))
+    end
+
+    it 'should add with_field to query' do
+      query = Cloudinary::Search.with_field('context').with_field('tags').to_h
+      expect(query).to eq(with_field: %w(context tags))
+    end
+  end
+
+  context 'integration' do
+    SEARCH_TAG = TIMESTAMP_TAG + "_search"
+    include_context 'cleanup', SEARCH_TAG
+    prefix = "api_test_#{SUFFIX}"
+    test_id_1 = "#{prefix}_1"
+    test_id_2   = "#{prefix}_2"
+    test_id_3   = "#{prefix}_3"
+    before(:all) do
+      Cloudinary::Uploader.upload(TEST_IMG, public_id: test_id_1, tags: [TEST_TAG, TIMESTAMP_TAG, SEARCH_TAG], context: 'stage=in_review')
+      Cloudinary::Uploader.upload(TEST_IMG, public_id: test_id_2, tags: [TEST_TAG, TIMESTAMP_TAG, SEARCH_TAG], context: 'stage=new')
+      Cloudinary::Uploader.upload(TEST_IMG, public_id: test_id_3, tags: [TEST_TAG, TIMESTAMP_TAG, SEARCH_TAG], context: 'stage=validated')
+      sleep(3)
+    end
+
+    it "should return all images tagged with #{SEARCH_TAG}" do
+      results = Cloudinary::Search.expression("tags:#{SEARCH_TAG}").execute
+      expect(results['resources'].count).to eq 3
+    end
+
+    it "should return resource #{test_id_1}" do
+      results = Cloudinary::Search.expression("public_id:#{test_id_1}").execute
+      expect(results['resources'].count).to eq 1
+    end
+
+    it 'should paginate resources limited by tag and ordered by ascending public_id' do
+      results = Cloudinary::Search.max_results(1).expression("tags:#{SEARCH_TAG}").sort_by('public_id', 'asc').execute
+      expect(results['resources'].count).to eq 1
+      expect(results['resources'][0]['public_id']).to eq test_id_1
+      expect(results['total_count']).to eq 3
+
+      results = Cloudinary::Search.max_results(1).expression("tags:#{SEARCH_TAG}").sort_by('public_id', 'asc').next_cursor(results['next_cursor']).execute
+      expect(results['resources'].count).to eq 1
+      expect(results['resources'][0]['public_id']).to eq test_id_2
+      expect(results['total_count']).to eq 3
+
+      results = Cloudinary::Search.max_results(1).expression("tags:#{SEARCH_TAG}").sort_by('public_id', 'asc').next_cursor(results['next_cursor']).execute
+      expect(results['resources'].count).to eq 1
+      expect(results['resources'][0]['public_id']).to eq test_id_3
+      expect(results['total_count']).to eq 3
+      expect(results['next_cursor']).to be_nil
+    end
+
+    it 'should include context' do
+      results = Cloudinary::Search.expression("tags:#{SEARCH_TAG}").with_field('context').execute
+      expect(results['resources'].count).to eq 3
+      results['resources'].each do |res|
+        expect(res['context'].keys).to eq ['stage']
+      end
+    end
+    it 'should include context, tags and image_metadata' do
+      results = Cloudinary::Search.expression("tags:#{SEARCH_TAG}").with_field('context').with_field('tags').with_field('image_metadata').execute
+      expect(results['resources'].count).to eq 3
+      results['resources'].each do |res|
+        expect(res['context'].keys).to eq ['stage']
+        expect(res.key?('image_metadata')).to eq true
+        expect(res['tags'].count).to eq 3
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -16,6 +16,14 @@ KEY     = "00112233FF99"
 ALT_KEY = "CCBB2233FF00"
 
 
+Dir[File.join(File.dirname(__FILE__), '/support/**/*.rb')].each {|f| require f}
+
+module RSpec
+  def self.project_root
+    File.join(File.dirname(__FILE__), '..')
+  end
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   unless RSpec::Version::STRING.match( /^3/)
@@ -136,7 +144,13 @@ end
 RSpec::Matchers.define :be_served_by_cloudinary do
   match do |url|
     if url.is_a? Array
-      url = Cloudinary::Utils.cloudinary_url( url[0], url[1])
+      url, options = url
+      url = Cloudinary::Utils.cloudinary_url(url, options.clone)
+      if Cloudinary.config.upload_prefix
+        res_prefix_uri = URI.parse(Cloudinary.config.upload_prefix)
+        res_prefix_uri.path = '/res'
+        url.gsub!(/https?:\/\/res.cloudinary.com/, res_prefix_uri.to_s)
+      end
     end
     code = 0
     @url = url

data/spec/support/helpers/temp_file_helpers.rb

@@ -0,0 +1,22 @@
+module Helpers
+  module TempFileHelpers
+    def clean_up_temp_files!
+      FileUtils.remove_entry temp_root
+    end
+
+    def temp_root
+      @temp_root ||= Dir.mktmpdir 'test_root'
+    end
+
+    def copy_root_to_temp(source)
+      source = File.join(RSpec.project_root, source) unless Pathname.new(source).directory?
+      FileUtils.copy_entry source, temp_root
+    end
+
+    def copy_file_to_temp(source, dest)
+      dest_path = File.join(temp_root, dest)
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      FileUtils.copy_entry(File.join(RSpec.project_root, source), dest_path)
+    end
+  end
+end

data/spec/support/shared_contexts/rake.rb

@@ -0,0 +1,19 @@
+require "rake"
+
+# From https://robots.thoughtbot.com/test-rake-tasks-like-a-boss
+shared_context "rake" do
+  let(:rake)      { Rake::Application.new }
+  let(:task_name) { self.class.top_level_description }
+  let(:task_path) { "lib/tasks/#{task_name.split(":").first}" }
+  subject         { rake[task_name] }
+
+  def loaded_files_excluding_current_rake_file
+     $".reject {|file| file == Pathname.new(RSpec.project_root).join("#{task_path}.rake").to_s }
+  end
+
+  before do
+    Rake.application = rake
+    Rake.application.rake_require(task_path, [RSpec.project_root], loaded_files_excluding_current_rake_file)
+    Rake::Task.define_task(:environment)
+  end
+end

data/spec/utils_methods_spec.rb

@@ -15,5 +15,4 @@ describe Utils do
   it "should parse a percent range value" do
     expect(Utils.instance_eval { norm_range_value("20p") }).to eq("20p")
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -54,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +162,7 @@ files:
 - lib/cloudinary/ostruct2.rb
 - lib/cloudinary/preloaded_file.rb
 - lib/cloudinary/railtie.rb
+- lib/cloudinary/search.rb
 - lib/cloudinary/static.rb
 - lib/cloudinary/uploader.rb
 - lib/cloudinary/utils.rb
@@ -159,11 +174,18 @@ files:
 - spec/auth_token_spec.rb
 - spec/cloudinary_helper_spec.rb
 - spec/cloudinary_spec.rb
+- spec/data/sync_static/app/assets/javascripts/1.coffee
+- spec/data/sync_static/app/assets/javascripts/1.js
+- spec/data/sync_static/app/assets/stylesheets/1.css
 - spec/docx.docx
 - spec/favicon.ico
 - spec/logo.png
+- spec/rake_spec.rb
+- spec/search_spec.rb
 - spec/spec_helper.rb
 - spec/streaminig_profiles_api_spec.rb
+- spec/support/helpers/temp_file_helpers.rb
+- spec/support/shared_contexts/rake.rb
 - spec/uploader_spec.rb
 - spec/utils_methods_spec.rb
 - spec/utils_spec.rb
@@ -211,11 +233,18 @@ test_files:
 - spec/auth_token_spec.rb
 - spec/cloudinary_helper_spec.rb
 - spec/cloudinary_spec.rb
+- spec/data/sync_static/app/assets/javascripts/1.coffee
+- spec/data/sync_static/app/assets/javascripts/1.js
+- spec/data/sync_static/app/assets/stylesheets/1.css
 - spec/docx.docx
 - spec/favicon.ico
 - spec/logo.png
+- spec/rake_spec.rb
+- spec/search_spec.rb
 - spec/spec_helper.rb
 - spec/streaminig_profiles_api_spec.rb
+- spec/support/helpers/temp_file_helpers.rb
+- spec/support/shared_contexts/rake.rb
 - spec/uploader_spec.rb
 - spec/utils_methods_spec.rb
 - spec/utils_spec.rb