Merge pull request #6 from nnichols/major-ver

Major version release
nnichols · Jul 28, 2020 · cae5b24 · cae5b24
2 parents 98d8797 + c3067b3
commit cae5b24
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.0.0 / 2020 Jul 28
+
+> This release removes the palette namespace, as it has been more appropriately migrated to com.wallbrew/brewtility
+
+* **Update** ^^^
+
 ## v0.10.0 / 2020 Jul 18
 
 > This release adds several `only` functions for singleton collections

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nnichols",
-  "version": "0.10.0",
+  "version": "1.0.0",
   "description": "A bunch of functions and definitions I'm sick of copy/pasting",
   "main": "index.js",
   "directories": {

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject nnichols "0.10.0"
+(defproject nnichols "1.0.0"
             :description "A bunch of functions and definitions I'm sick of copy/pasting"
             :url "https://github.com/nnichols/nnichols"
             :license {:name "MIT"

diff --git a/src/nnichols/palette.cljc b/src/nnichols/palette.cljc
diff --git a/src/nnichols/util.cljc b/src/nnichols/util.cljc
@@ -36,7 +36,8 @@
   "Attempt to return the first and only element in `coll`.
    If the collection does not contain exactly one element, throw an exception"
   [coll]
-  (if (seq (rest coll))
+  (if (or (empty? coll)
+          (seq (rest coll)))
     (throw (ex-info "Collection does not contain exactly one element!" {}))
     (first coll)))
 

diff --git a/test/nnichols/http_test.cljc b/test/nnichols/http_test.cljc
@@ -1,7 +1,7 @@
 (ns nnichols.http-test
   (:require [nnichols.http :as http]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest bodiless-json-response
   (testing "Response maps are properly created"

diff --git a/test/nnichols/palette_test.cljc b/test/nnichols/palette_test.cljc
diff --git a/test/nnichols/parse_test.cljc b/test/nnichols/parse_test.cljc
@@ -3,7 +3,7 @@
             [nnichols.util :as nu]
             [nnichols.predicate :as npr]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest parse-radix-test
   (testing "Strings are turned into the positive integer they represent"

diff --git a/test/nnichols/predicate_test.cljc b/test/nnichols/predicate_test.cljc
@@ -2,7 +2,7 @@
   (:require [nnichols.predicate :as np]
             [nnichols.util :as nu]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
             #? (:clj  [clj-time.core :as time])
             #? (:cljs [cljs-time.core :as time])))
 

diff --git a/test/nnichols/runner.cljs b/test/nnichols/runner.cljs
@@ -1,7 +1,6 @@
 (ns nnichols.runner
   (:require [doo.runner :refer-macros [doo-tests]]
             [nnichols.http-test]
-            [nnichols.palette-test]
             [nnichols.parse-test]
             [nnichols.predicate-test]
             [nnichols.spec-test]
@@ -10,7 +9,6 @@
             [nnichols.xml-test]))
 
 (doo-tests 'nnichols.http-test
-           'nnichols.palette-test
            'nnichols.parse-test
            'nnichols.predicate-test
            'nnichols.spec-test

diff --git a/test/nnichols/spec_test.cljc b/test/nnichols/spec_test.cljc
@@ -5,7 +5,7 @@
             [nnichols.spec :as s]
             [nnichols.util :as nu]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest boolean-spec-test
   (testing "Testing the boolean spec can conform/validate data"

diff --git a/test/nnichols/string_test.cljc b/test/nnichols/string_test.cljc
@@ -1,7 +1,7 @@
 (ns nnichols.string-test
   (:require [nnichols.string :as nstr]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest prepare-for-compare-test
   (testing "Strings are appropriately re-cased and trimmed of whitespace"

diff --git a/test/nnichols/util_test.cljc b/test/nnichols/util_test.cljc
@@ -1,7 +1,7 @@
 (ns nnichols.util-test
   (:require [nnichols.util :as nu]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest sort-keys-test
   (testing "Keywords are sorted lexicographically"
@@ -168,3 +168,9 @@
     (is (= "snakes" (nu/pluralize "snake" 2)))
     (is (= "peach" (nu/pluralize "peach" 1 "peaches")))
     (is (= "peaches" (nu/pluralize "peach" 10 "peaches")))))
+
+(deftest only-test
+  (testing "Functional correctness"
+    (is (= 1 (nu/only [1])))
+    #?(:clj (is (thrown? Exception (nu/only []))))
+    #?(:clj (is (thrown? Exception (nu/only [1 2]))))))
diff --git a/test/nnichols/xml_test.cljc b/test/nnichols/xml_test.cljc
@@ -1,7 +1,7 @@
 (ns nnichols.xml-test
   (:require [nnichols.xml :as nx]
             #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing run-tests]])))
+            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
 
 (deftest tag-keyword-conversion-test
   (testing "Tag formatted and EDN formatted keywords can be transformed"