Merge branch 'release/0.1.3'

Author: p2d0

project.clj

@@ -1,4 +1,4 @@
-(defproject gfycat-api "0.1.2"
+(defproject gfycat-api "0.1.3"
             :description "Clojure wrapper for Gfycat API"
             :url "http://example.com/FIXME"
             :license {:name "EPL-2.0"

src/gfycat_api/core.clj

@@ -1,32 +1,30 @@
 (ns gfycat-api.core
   (:require [clojure.data.json :as json]
             [clj-http.client :as client]
-            )
+            [gfycat-api.util :as util])
   (:gen-class))
 
-(defn- clojure-stylify [key]
-  (keyword (clojure.string/replace key #"_" "-")))
-(def client-info (json/read-str (slurp ".client_info.json")
-                                :key-fn clojure-stylify))
-
 (defn- gfycat-request [path query-params]
   (-> (client/get (str "https://api.gfycat.com/v1/" path)
                   {:content-type :json
                    :accept "text/html"
                    :query-params query-params})
       :body
-      (json/read-str :key-fn clojure-stylify)))
+      (json/read-str :key-fn util/clojure-stylify)))
 
-(defn get-token []
-      (try
-        (gfycat-request "oauth/token"
-                                       {"grant_type" "client_credentials"
-                                        "client_id" (:client-id client-info)
-                                        "client_secret" (:client-secret client-info)})
-        (catch Exception e (prn (ex-data e)  ))))
+(defn get-token [client-id client-secret]
+  (if (and client-id client-secret)
+    (try
+      (gfycat-request "oauth/token"
+                      {"grant_type" "client_credentials"
+                       "client_id" client-id
+                       "client_secret" client-secret})
+      (catch Exception e (prn (ex-data e))))))
 
 (defn search
-  ([token query & [count cursor]]
-   (gfycat-request "gfycats/search" {"search_text" query
-                                     "count" count
-                                     "cursor" cursor})))
+  "doesnt require a token"
+  ([query & [count cursor token]]
+   (let [{found :found :as search-result} (gfycat-request "gfycats/search" {"search_text" query
+                                                                            "count" count
+                                                                            "cursor" cursor})]
+     (if (> found 0) search-result))))

src/gfycat_api/util.clj

@@ -1,6 +1,4 @@
 (ns gfycat-api.util)
 
-(defn get-gfycats-with [keys search-result]
-  "returns list of gfycats with selected parameters,
-   removes all other parameters"
-  (map #(select-keys % keys) (:gfycats search-result)))
+(defn clojure-stylify [key]
+  (keyword (clojure.string/replace key #"_" "-")))

test/gfycat_api/core_test.clj

@@ -1,15 +1,28 @@
 (ns gfycat-api.core-test
   (:require [clojure.test :refer [deftest is testing]]
+            [clojure.data.json :as json]
             [gfycat-api.core :as core]
-            ))
+            [gfycat-api.util :as util]))
 
-#_(deftest get-token-test
-    (let [token (core/get-token)]
-      (is (not (nil? token)))
-      (is (= (:expires-in token) 3600))))
-#_(def token (:access-token (core/get-token)))
-#_(deftest search-test
-    (testing "should return one gfycat search result"
-      (let [search-result (core/search token "thanos power up" 1)]
-        (is (= (:cursor search-result) ""))))
-    (testing "searchnig with cursor"))
+(def client-info (json/read-str (slurp ".client_info.json")
+                                :key-fn util/clojure-stylify))
+
+(deftest get-token-test
+  (let [token (core/get-token (:client-id client-info) (:client-secret client-info))]
+    (is (not (nil? token)))
+    (is (= (:expires-in token) 3600)))
+  (testing "should return nil if no client id or client-secret"
+    (is (= nil (core/get-token nil nil)))))
+
+(def token (:access-token (core/get-token (:client-id client-info) (:client-secret client-info))))
+(deftest search-test
+  (testing "should return one gfycat search result"
+    (let [search-result (core/search "thanos power up" 1)]
+      (is (= (:cursor search-result) ""))))
+  #_(testing "search with token"
+    (let [search-result (core/search nil "thanos power up" 1)]
+      (is (= (count (:gfycats search-result)) 1))))
+  (testing "should return nil on empty search"
+            (let [search-result (core/search "" 1)]
+              (is (= search-result nil))))
+  (testing "searchnig with cursor"))

test/gfycat_api/fixtures.clj

@@ -88,6 +88,7 @@
      :published 1
      :rating "PG"
      :height 720
-     :views 27828}]
+     :views 27828
+}]
    :related ["compositing" "facebook" "free" "gif" "graphics" "illustrator" "instagram" "motion" "photoshop" "snapchat" "illustrator" " instagram" " facebook" " graphics" " snapchat" " free" " adobe creative cloud" " visual effects" " ambient effects" " free footage" " after effects" " compositing" " photoshop" " gif" " motion"]
    :found 2})

test/gfycat_api/util_test.clj

@@ -3,8 +3,3 @@
    [clojure.test :refer [deftest is testing]]
    [gfycat-api.fixtures :as fixtures]
    [gfycat-api.util :as util]))
-
-(deftest search-result-filtering
-  (is (= (util/get-gfycats-with [:title] fixtures/single-gfycat-search-result)
-         '({:title
-            "Canadian Flag waving animated using MIR plug in after effects - free motion graphics"}))))