Merge pull request #10 from racehub/feature/upgrade_cljc

upgrade to cljc

Author: Sam Ritchie

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 (7/12/2015)
+
+- Upgrade to Clojure 1.7.0 and cljc.
+
 ## 0.2.1 (7/4/2015)
 
 - Upgraded to latest API schema.

project.clj

@@ -1,27 +1,18 @@
-(defproject racehub/stripe-clj "0.2.2-SNAPSHOT"
+(defproject racehub/stripe-clj "0.3.0-SNAPSHOT"
   :description "Schemafied Stripe bindings for Clojure."
   :url "https://github.com/racehub/stripe-clj"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[cheshire "5.3.1"]
+  :dependencies [[cheshire "5.5.0"]
                  [environ "0.5.0"]
                  [http-kit "2.1.19"]
-                 [org.clojure/clojure "1.6.0"]
+                 [org.clojure/clojure "1.7.0"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
-                 [prismatic/schema "0.3.0" :exclude [org.clojure/clojurescript]]]
-  :hooks [cljx.hooks]
+                 [racehub/schema "0.4.4"]]
   :jar-exclusions [#"\.cljx|\.swp|\.swo|\.DS_Store"]
-  :source-paths ["src/clj" "target/generated/clj"]
-  :resource-paths ["target/generated/cljs" "src/cljs" "resources"]
-  :profiles {:1.7 {:dependencies [[org.clojure/clojure "1.7.0-alpha2"]]}
-             :dev {:injections [(require 'schema.core)
+  :source-paths ["src/clj"]
+  :resource-paths ["src/cljs" "resources"]
+  :profiles {:dev {:injections [(require 'schema.core)
                                 (schema.core/set-fn-validation! true)]
-                   :test-paths ["test/clj" "target/test/clj"]
-                   :plugins [[com.keminglabs/cljx "0.4.0"]
-                             [paddleguru/lein-gitflow "0.1.2"]]}}
-  :cljx {:builds [{:source-paths ["src/cljx"]
-                   :output-path "target/generated/clj"
-                   :rules :clj}
-                  {:source-paths ["src/cljx"]
-                   :output-path "target/generated/cljs"
-                   :rules :cljs}]})
+                   :test-paths ["test/clj"]
+                   :plugins [[paddleguru/lein-gitflow "0.1.2"]]}})

src/cljx/stripe/schema.cljx renamed to src/clj/stripe/schema.cljc

@@ -1,7 +1,8 @@
 (ns stripe.schema
   (:require [schema.core :as s :include-macros true]
-            [#+clj clojure.core.async #+cljs cljs.core.async])
-  #+clj (:import [clojure.core.async.impl.protocols ReadPort]))
+            #?(:clj clojure.core.async :cljs cljs.core.async))
+  #?(:clj
+     (:import [clojure.core.async.impl.protocols ReadPort])))
 
 ;; ## Shared Schema
 
@@ -25,9 +26,8 @@
   schema is ignored, and just for documentation purposes."
   ([] (Channel s/Any))
   ([inner]
-     (s/named #+cljs s/Any
-              #+clj ReadPort
-              "core.async channel.")))
+   (s/named #?(:cljs s/Any :clj ReadPort)
+            "core.async channel.")))
 
 (def StripeError
   "Stripe API error."

src/cljx/stripe/token.cljx renamed to src/clj/stripe/token.cljc

@@ -1,6 +1,6 @@
 (ns stripe.token
   (:require [schema.core :as s]
-            #+clj [stripe.http :as h]
+            #?(:clj [stripe.http :as h])
             [stripe.schema :as ss]
             [stripe.util :as u]))
 
@@ -55,31 +55,30 @@
 
 ;; ## Bank and Card Tokens
 
-#+clj
 (do
-  ;; TODO: Add return schemas to the tokens.
-
-  (s/defn create-card-token :- (ss/Async)
-    "Returns a card token if successful, errors otherwise. This endpoint
-  also supports a customer token, but this is only good for Stripe
-  Connect, so I'm leaving it out for now."
-    [card :- CardMap]
-    (h/post-req "tokens" {:stripe-params
-                          {:card card}}))
-
-  (s/defn create-bank-token :- (ss/Async)
-    "Returns a bank token if successful, errors otherwise. The returned
-  token is good for a one-time use - you have to attach it to a
-  `recipient` object, or its worthless.
+  #?@(:clj
+      [ ;; TODO: Add return schemas to the tokens.
+       (s/defn create-card-token :- (ss/Async)
+         "Returns a card token if successful, errors otherwise. This
+  endpoint also supports a customer token, but this is only good for
+  Stripe Connect, so I'm leaving it out for now."
+         [card :- CardMap]
+         (h/post-req "tokens" {:stripe-params
+                               {:card card}}))
+
+       (s/defn create-bank-token :- (ss/Async)
+         "Returns a bank token if successful, errors otherwise. The
+  returned token is good for a one-time use - you have to attach it to
+  a `recipient` object, or its worthless.
 
   We hardcode Country here because the US is all that's currently
   supported by Stripe."
-    [account :- BankMap]
-    (h/post-req "tokens" {:stripe-params
-                          {:bank_account (assoc account
-                                           :country "US")}}))
-
-  (s/defn get-token :- (ss/Async)
-    "Returns a card or bank object if successful, errors otherwise."
-    [token :- (s/either CardToken BankToken)]
-    (h/get-req (str "tokens/" token))))
+         [account :- BankMap]
+         (h/post-req "tokens" {:stripe-params
+                               {:bank_account (assoc account
+                                                     :country "US")}}))
+
+       (s/defn get-token :- (ss/Async)
+         "Returns a card or bank object if successful, errors otherwise."
+         [token :- (s/either CardToken BankToken)]
+         (h/get-req (str "tokens/" token)))]))

src/cljx/stripe/util.cljx renamed to src/clj/stripe/util.cljc

@@ -11,12 +11,12 @@
          (< x high))))
 
 (defn collectify [x]
-  #+cljs
-  (if (sequential? x) x [x])
-  #+clj
-  (cond (nil? x) []
-        (or (sequential? x) (instance? java.util.List x) (set? x)) x
-        :else [x]))
+  #?(:cljs
+     (if (sequential? x) x [x])
+     :clj
+     (cond (nil? x) []
+           (or (sequential? x) (instance? java.util.List x) (set? x)) x
+           :else [x])))
 
 (s/defn toggle-optional :- {s/Any s/Any}
   "Takes in a Schema, and a keyword to toggle."