Merge branch 'feature/search-by-context'

Author: Amir Tocker

lib/api.js

@@ -1,10 +1,10 @@
 _ = require("lodash")
-if process.env.CLOUDINARY_TEST_UNSECURE == 'http'
+config = require("./config")
+if config().upload_prefix && config().upload_prefix[0..4] == 'http:'
   https = require('http')
 else
   https = require('https')
 utils = require("./utils")
-config = require("./config")
 querystring = require("querystring")
 Q = require('q')
 
@@ -104,6 +104,14 @@ exports.resources_by_tag = (tag, callback, options = {}) ->
   uri = ["resources", resource_type, "tags", tag]
   call_api("get", uri, api.only(options, "next_cursor", "max_results", "tags", "context", "direction", "moderations"), callback, options)
 
+exports.resources_by_context= (key,value, callback, options = {}) ->
+  resource_type = options["resource_type"] ? "image"
+  uri = ["resources", resource_type, "context"]
+  params = api.only(options, "next_cursor", "max_results", "tags", "context", "direction", "moderations")
+  params.key = key
+  params.value = value if value?
+  call_api("get", uri,params , callback, options)
+
 exports.resources_by_moderation = (kind, status, callback, options = {}) ->
   resource_type = options["resource_type"] ? "image"
   uri = ["resources", resource_type, "moderations", kind, status]

lib/api.js.map

@@ -1,10 +1,13 @@
 _ = require("lodash")
-https = require('https')
+config = require("./config")
+if config().upload_prefix && config().upload_prefix[0..4] == 'http:'
+  https = require('http')
+else
+  https = require('https')
 #http = require('http')
 UploadStream = require('./upload_stream')
 utils = require("./utils")
 util = require("util")
-config = require("./config")
 fs = require('fs')
 path = require('path')
 Q = require('q')
@@ -361,4 +364,4 @@ exports.image_upload_tag = (field, options = {}) ->
   return '<input ' + utils.html_attrs(tag_options) + '/>'
 
 exports.unsigned_image_upload_tag = (field, upload_preset, options = {}) ->
-  exports.image_upload_tag(field, utils.merge(options, unsigned: true, upload_preset: upload_preset))
+  exports.image_upload_tag(field, utils.merge(options, unsigned: true, upload_preset: upload_preset))

lib/uploader.js

@@ -7,6 +7,7 @@ utils.v1_adapters exports, api,
   resource_types: 0,
   resources: 0,
   resources_by_tag: 1,
+  resources_by_context: 2,
   resources_by_moderation: 2,
   resources_by_ids: 1
   resource: 1,
@@ -42,4 +43,4 @@ utils.v1_adapters exports, api,
   create_streaming_profile: 1,
   publish_by_ids: 1,
   publish_by_tag: 1,
-  publish_by_prefix: 1
+  publish_by_prefix: 1

lib/uploader.js.map

@@ -87,6 +87,8 @@ describe "api", ->
   PUBLIC_ID_2 = PUBLIC_ID_PREFIX + "_2_" + SUFFIX
   PUBLIC_ID_3 = PUBLIC_ID_PREFIX + "_3_" + SUFFIX
   PUBLIC_ID_4 = PUBLIC_ID_PREFIX + "_4_" + SUFFIX
+  PUBLIC_ID_5 = PUBLIC_ID_PREFIX + "_5_" + SUFFIX
+  PUBLIC_ID_6 = PUBLIC_ID_PREFIX + "_6_" + SUFFIX
 
   NAMED_TRANSFORMATION = "api_test_transformation" + SUFFIX
   API_TEST_UPLOAD_PRESET1 = "api_test_upload_preset_1_" + SUFFIX
@@ -114,17 +116,19 @@ describe "api", ->
       callback(result)
 
   before (done) ->
-    @timeout 0
+    @timeout helper.TIMEOUT_LONG
     @timestamp_tag = "#{TEST_TAG}_#{cloudinary.utils.timestamp()}"
 
-    Q.all [
+    Q.allSettled [
       cloudinary.v2.uploader.upload(IMAGE_FILE, public_id: PUBLIC_ID, tags: [TEST_TAG, @timestamp_tag], context: "key=value", eager: [EXPLICIT_TRANSFORMATION])
-      cloudinary.v2.uploader.upload(IMAGE_FILE, public_id: PUBLIC_ID_2, tags: [TEST_TAG, @timestamp_tag], context: "key=value", eager: [EXPLICIT_TRANSFORMATION])]
+      cloudinary.v2.uploader.upload(IMAGE_FILE, public_id: PUBLIC_ID_2, tags: [TEST_TAG, @timestamp_tag], context: "key=value", eager: [EXPLICIT_TRANSFORMATION])
+      cloudinary.v2.uploader.upload(IMAGE_FILE, public_id: PUBLIC_ID_5, tags: [TEST_TAG, @timestamp_tag], context: "test-key=test", eager: [EXPLICIT_TRANSFORMATION])
+      cloudinary.v2.uploader.upload(IMAGE_FILE, public_id: PUBLIC_ID_6, tags: [TEST_TAG, @timestamp_tag], context: "test-key=alt-test", eager: [EXPLICIT_TRANSFORMATION])]
     .finally ->
       done()
 
   after (done) ->
-    @timeout 0
+    @timeout helper.TIMEOUT_LONG
     @timestamp_tag = "#{TEST_TAG}_#{cloudinary.utils.timestamp()}"
 
     Q.all [
@@ -190,6 +194,20 @@ describe "api", ->
         done()
 
 
+    it "should allow listing resources by context only", (done) ->
+      @timeout helper.TIMEOUT_MEDIUM
+      cloudinary.v2.api.resources_by_context "test-key",null, (error, result) ->
+        return done(new Error error.message) if error?
+        expect(result.resources).to.have.length(2)
+        done()
+
+    it "should allow listing resources by context key and value", (done) ->
+      @timeout helper.TIMEOUT_MEDIUM
+      cloudinary.v2.api.resources_by_context "test-key","test", (error, result) ->
+        return done(new Error error.message) if error?
+        expect(result.resources).to.have.length(1)
+        done()
+
     it "should allow listing resources by public ids", (done) ->
       @timeout helper.TIMEOUT_MEDIUM
       cloudinary.v2.api.resources_by_ids [PUBLIC_ID, PUBLIC_ID_2], context: true, tags: true, (error, result) ->