Merge branch 'dev'
This commit is contained in:
commit
8ba45d8709
5 changed files with 29 additions and 31 deletions
25
.gitignore
vendored
25
.gitignore
vendored
|
|
@ -1,12 +1,13 @@
|
||||||
/target
|
/target/
|
||||||
/lib
|
/lib/
|
||||||
/classes
|
/classes/
|
||||||
/checkouts
|
/checkouts/
|
||||||
/logs
|
/logs/
|
||||||
/docs
|
/docs/
|
||||||
/doc
|
/doc/
|
||||||
*.jar
|
/*.jar
|
||||||
*.class
|
/*.class
|
||||||
.lein*
|
/.lein*
|
||||||
pom.xml*
|
/pom.xml*
|
||||||
.env
|
/.env
|
||||||
|
.DS_Store
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
## v2.6.0-beta2 / 2014 Feb 26
|
## v2.6.0-RC1 / 2014 Mar 12
|
||||||
|
|
||||||
> Welcoming feedback on any issues, etc.!
|
> Welcoming feedback on any issues, etc.!
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
**[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contributing](#contact--contributing) | current ([semantic][]) version:
|
**[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contributing](#contact--contributing) | current ([semantic][]) version:
|
||||||
|
|
||||||
```clojure
|
```clojure
|
||||||
[com.taoensso/nippy "2.5.2"] ; Stable
|
[com.taoensso/nippy "2.5.2"] ; Stable
|
||||||
[com.taoensso/nippy "2.6.0-beta2"] ; For early adopters
|
[com.taoensso/nippy "2.6.0-RC1"] ; Appropriate for staging, early production adopters
|
||||||
```
|
```
|
||||||
|
|
||||||
v2.6 will be a backwards-compatible release with: improved performance (incl. frozen data size), a new low-level DataInput/DataOuput API, improved support for headerless freezing, and 1-to-1 binary-value representation guarantees. See the [Changelog](https://github.com/ptaoussanis/nippy/blob/master/CHANGELOG.md) for details.
|
v2.6 will be a backwards-compatible release with: improved performance (incl. frozen data size), a new low-level DataInput/DataOuput API, improved support for headerless freezing, and 1-to-1 binary-value representation guarantees. See the [Changelog](https://github.com/ptaoussanis/nippy/blob/master/CHANGELOG.md) for details.
|
||||||
|
|
|
||||||
13
project.clj
13
project.clj
|
|
@ -1,4 +1,4 @@
|
||||||
(defproject com.taoensso/nippy "2.6.0-beta2"
|
(defproject com.taoensso/nippy "2.6.0-RC1"
|
||||||
:author "Peter Taoussanis <https://www.taoensso.com>"
|
:author "Peter Taoussanis <https://www.taoensso.com>"
|
||||||
:description "Clojure serialization library"
|
:description "Clojure serialization library"
|
||||||
:url "https://github.com/ptaoussanis/nippy"
|
:url "https://github.com/ptaoussanis/nippy"
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
:dependencies
|
:dependencies
|
||||||
[[org.clojure/clojure "1.4.0"]
|
[[org.clojure/clojure "1.4.0"]
|
||||||
[org.clojure/tools.reader "0.8.3"]
|
[org.clojure/tools.reader "0.8.3"]
|
||||||
[com.taoensso/encore "0.9.2"]
|
[com.taoensso/encore "0.9.8"]
|
||||||
[org.iq80.snappy/snappy "0.3"]
|
[org.iq80.snappy/snappy "0.3"]
|
||||||
[org.tukaani/xz "1.4"]]
|
[org.tukaani/xz "1.4"]]
|
||||||
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
:1.6 {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
|
:1.6 {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
|
||||||
:test {:jvm-opts ["-Xms1024m" "-Xmx2048m"]
|
:test {:jvm-opts ["-Xms1024m" "-Xmx2048m"]
|
||||||
:dependencies [[expectations "1.4.56"]
|
:dependencies [[expectations "1.4.56"]
|
||||||
[reiddraper/simple-check "0.5.6"]
|
[org.clojure/test.check "0.5.7"]
|
||||||
[org.clojure/data.fressian "0.2.0"]
|
[org.clojure/data.fressian "0.2.0"]
|
||||||
[org.xerial.snappy/snappy-java "1.1.1-M1"]]
|
[org.xerial.snappy/snappy-java "1.1.1-M1"]]
|
||||||
:plugins [[lein-expectations "0.0.8"]
|
:plugins [[lein-expectations "0.0.8"]
|
||||||
|
|
@ -34,12 +34,9 @@
|
||||||
:dev
|
:dev
|
||||||
[:1.6 :test
|
[:1.6 :test
|
||||||
{:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"]
|
{:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"]
|
||||||
:hooks []
|
|
||||||
:dependencies []
|
:dependencies []
|
||||||
:plugins []}]}
|
:plugins [[lein-ancient "0.5.4"]
|
||||||
|
[codox "0.6.7"]]}]}
|
||||||
:plugins [[lein-ancient "0.5.4"]
|
|
||||||
[codox "0.6.7"]]
|
|
||||||
|
|
||||||
;; :codox {:sources ["target/classes"]} ; cljx
|
;; :codox {:sources ["target/classes"]} ; cljx
|
||||||
:aliases
|
:aliases
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
(ns taoensso.nippy.tests.main
|
(ns taoensso.nippy.tests.main
|
||||||
(:require [simple-check (core :as sc)
|
(:require [clojure.test.check :as check]
|
||||||
(generators :as sc-gen)
|
[clojure.test.check.generators :as check-gen]
|
||||||
(properties :as sc-prop)]
|
[clojure.test.check.properties :as check-props]
|
||||||
[expectations :as test :refer :all]
|
[expectations :as test :refer :all]
|
||||||
[taoensso.nippy :as nippy :refer (freeze thaw)]
|
[taoensso.nippy :as nippy :refer (freeze thaw)]
|
||||||
[taoensso.nippy.compression :as compression]
|
[taoensso.nippy.compression :as compression]
|
||||||
|
|
@ -30,8 +30,8 @@
|
||||||
test-data))
|
test-data))
|
||||||
|
|
||||||
(expect ; Try roundtrip anything that simple-check can dream up
|
(expect ; Try roundtrip anything that simple-check can dream up
|
||||||
(:result (sc/quick-check 80 ; Time is n-non-linear
|
(:result (check/quick-check 80 ; Time is n-non-linear
|
||||||
(sc-prop/for-all [val sc-gen/any]
|
(check-props/for-all [val check-gen/any]
|
||||||
(= val (nippy/thaw (nippy/freeze val)))))))
|
(= val (nippy/thaw (nippy/freeze val)))))))
|
||||||
|
|
||||||
(expect AssertionError (thaw (freeze test-data {:password "malformed"})))
|
(expect AssertionError (thaw (freeze test-data {:password "malformed"})))
|
||||||
|
|
@ -88,8 +88,8 @@
|
||||||
(let [bin->val (atom {})
|
(let [bin->val (atom {})
|
||||||
val->bin (atom {})]
|
val->bin (atom {})]
|
||||||
(merge
|
(merge
|
||||||
(sc/quick-check (or n 1)
|
(check/quick-check (or n 1)
|
||||||
(sc-prop/for-all [val sc-gen/any #_sc-gen/any-printable]
|
(check-props/for-all [val check-gen/any #_check-gen/any-printable]
|
||||||
(let [;; Nb need `seq` for Clojure hash equality:
|
(let [;; Nb need `seq` for Clojure hash equality:
|
||||||
bin (hash (seq (freeze val)))]
|
bin (hash (seq (freeze val)))]
|
||||||
(and
|
(and
|
||||||
|
|
@ -107,7 +107,7 @@
|
||||||
nil)))
|
nil)))
|
||||||
|
|
||||||
(comment
|
(comment
|
||||||
(sc-gen/sample sc-gen/any 10)
|
(check-gen/sample check-gen/any 10)
|
||||||
(:result (qc-prop-bijection 80))
|
(:result (qc-prop-bijection 80))
|
||||||
(let [{:keys [result bin->val val->bin]} (qc-prop-bijection 10)]
|
(let [{:keys [result bin->val val->bin]} (qc-prop-bijection 10)]
|
||||||
[result (vals bin->val)]))
|
[result (vals bin->val)]))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue