Merge branch 'feature/refactoring' into develop

* feature/refactoring:
  return nil on search result empty
  realised token is not needed
  remove get-gfycat-with

Author: p2d0

src/gfycat_api/core.clj

@@ -1,11 +1,9 @@
 (ns gfycat-api.core
   (:require [clojure.data.json :as json]
             [clj-http.client :as client]
-            [gfycat-api.util :as util]
-            )
+            [gfycat-api.util :as util])
   (:gen-class))
 
-
 (defn- gfycat-request [path query-params]
   (-> (client/get (str "https://api.gfycat.com/v1/" path)
                   {:content-type :json
@@ -15,15 +13,18 @@
       (json/read-str :key-fn util/clojure-stylify)))
 
 (defn get-token [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)  ))))
+  (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

@@ -2,57 +2,3 @@
 
 (defn clojure-stylify [key]
   (keyword (clojure.string/replace key #"_" "-")))
-
-(defn get-gfycats-with [keys search-result]
-  "returns list of gfycats with selected parameters,
-   removes all other parameters
-   possible params:
-     :title
-   gifs urls:
-     :gif100px
-     :max2mbgif
-     :gifurl
-     :mp4url
-     :webmurl
-     :max1mbgif
-  other:
-     :framerate
-     :gfynumber
-     :width
-     :gatekeeper
-     :mobileposterurl
-     :source
-     :likes
-     :curated
-     :createdate
-     :languagetext2
-     :nsfw
-     :extralemmas
-     :hasaudio
-     :max5mbgif
-     :languagecategories
-     :mp4size
-     :url
-     :mobileurl
-     :gfyid
-     :gfyname
-     :posterurl
-     :hastransparency
-     :webpurl
-     :username
-     :published
-     :rating
-     :height
-     :views
-     :description
-     :tags
-     :webmsize
-     :gfyslug
-     :miniurl
-     :numframes
-     :dislikes
-     :avgcolor
-     :miniposterurl
-     :thumb100posterurl
-     :domainwhitelist"
-  (map #(select-keys % keys) (:gfycats search-result)))

test/gfycat_api/core_test.clj

@@ -1,21 +1,28 @@
 (ns gfycat-api.core-test
   (:require [clojure.test :refer [deftest is testing]]
-        [clojure.data.json :as json]
+            [clojure.data.json :as json]
             [gfycat-api.core :as core]
-[gfycat-api.util :as util]
-            ))
+            [gfycat-api.util :as util]))
 
 (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))))
+  (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 token "thanos power up" 1)]
-        (is (= (:cursor search-result) ""))))
-    (testing "searchnig with cursor"))
+  (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/util_test.clj

@@ -3,9 +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 :gfyId] fixtures/single-gfycat-search-result)
-         '({:title
-            "Canadian Flag waving animated using MIR plug in after effects - free motion graphics"
-            :gfyId "fondfocusedclownanemonefish"}))))