Skip to content

Commit 53e415a

Browse files
committed
Fix #105: fix equality, reuse converted val for next comparison, add j/=
1 parent 546963b commit 53e415a

File tree

13 files changed

+451
-356
lines changed

13 files changed

+451
-356
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
## NEXT
44

5+
- [#105](https://github.com/dm3/clojure.java-time/issues/105): fix `not-{before,after}?` on unconverted values
6+
- a consequence of fixing [#104](https://github.com/dm3/clojure.java-time/issues/104)
7+
- add `java-time.api/=` for equality of times (with conversions)
8+
- add support to intermix unconverted values in comparison operations after first argument
9+
- supported by `{before,after}?`, `not-{before,after}?`, `j/=`, and aliases of those ops
10+
- examples:
11+
- `(j/< (j/day-of-week :thursday) :saturday :sunday)`
12+
- `(j/<= (j/day-of-week :thursday) :thursday (j/day-of-week :saturday) :sunday)`
13+
- `(j/= (j/day-of-week :thursday) :thursday (j/day-of-week :thursday) :thursday)`
14+
515
## 1.4.1
616

717
- [#104](https://github.com/dm3/clojure.java-time/issues/104): fix transivitity of `not-{before,after}?` when called with intervals

docs/CHANGELOG.html

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
<!DOCTYPE html PUBLIC ""
22
"">
3-
<html><head><meta charset="UTF-8" /><title>Changelog</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Clojure.java-time</span> <span class="project-version">1.4.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="README.html"><div class="inner"><span>Clojure.Java-Time</span></div></a></li><li class="depth-1 current"><a href="CHANGELOG.html"><div class="inner"><span>Changelog</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><a href="java-time.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>java-time</span></div></a></li><li class="depth-2 branch"><a href="java-time.api.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>api</span></div></a></li><li class="depth-2"><a href="java-time.repl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>repl</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#changelog" id="changelog"></a>Changelog</h1>
3+
<html><head><meta charset="UTF-8" /><title>Changelog</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Clojure.java-time</span> <span class="project-version">1.4.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 "><a href="README.html"><div class="inner"><span>Clojure.Java-Time</span></div></a></li><li class="depth-1 current"><a href="CHANGELOG.html"><div class="inner"><span>Changelog</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><a href="java-time.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>java-time</span></div></a></li><li class="depth-2 branch"><a href="java-time.api.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>api</span></div></a></li><li class="depth-2"><a href="java-time.repl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>repl</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#changelog" id="changelog"></a>Changelog</h1>
44
<h2><a href="#next" id="next"></a>NEXT</h2>
55
<ul>
6+
<li><a href="https://github.com/dm3/clojure.java-time/issues/105">#105</a>: fix <code>not-{before,after}?</code> on unconverted values</li>
7+
<li>a consequence of fixing <a href="https://github.com/dm3/clojure.java-time/issues/104">#104</a></li>
8+
<li>add <code>java-time.api/=</code> for equality of times (with conversions)</li>
9+
<li>add support to intermix unconverted values in comparison operations after first argument</li>
10+
<li>supported by <code>{before,after}?</code>, <code>not-{before,after}?</code>, <code>j/=</code>, and aliases of those ops</li>
11+
<li>examples:
12+
<ul>
13+
<li><code>(j/&lt; (j/day-of-week :thursday) :saturday :sunday)</code></li>
14+
<li><code>(j/&lt;= (j/day-of-week :thursday) :thursday (j/day-of-week :saturday) :sunday)</code></li>
15+
<li><code>(j/= (j/day-of-week :thursday) :thursday (j/day-of-week :thursday) :thursday)</code></li>
16+
</ul>
17+
</li>
18+
</ul>
19+
<h2><a href="#141" id="141"></a>1.4.1</h2>
20+
<ul>
621
<li><a href="https://github.com/dm3/clojure.java-time/issues/104">#104</a>: fix transivitity of <code>not-{before,after}?</code> when called with intervals</li>
722
</ul>
823
<h2><a href="#140" id="140"></a>1.4.0</h2>

docs/README.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html PUBLIC ""
22
"">
3-
<html><head><meta charset="UTF-8" /><title>Clojure.Java-Time</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Clojure.java-time</span> <span class="project-version">1.4.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 current"><a href="README.html"><div class="inner"><span>Clojure.Java-Time</span></div></a></li><li class="depth-1 "><a href="CHANGELOG.html"><div class="inner"><span>Changelog</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><a href="java-time.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>java-time</span></div></a></li><li class="depth-2 branch"><a href="java-time.api.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>api</span></div></a></li><li class="depth-2"><a href="java-time.repl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>repl</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#clojurejava-time" id="clojurejava-time"></a>Clojure.Java-Time</h1>
3+
<html><head><meta charset="UTF-8" /><title>Clojure.Java-Time</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Clojure.java-time</span> <span class="project-version">1.4.2-SNAPSHOT</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Topics</span></h3><ul><li class="depth-1 current"><a href="README.html"><div class="inner"><span>Clojure.Java-Time</span></div></a></li><li class="depth-1 "><a href="CHANGELOG.html"><div class="inner"><span>Changelog</span></div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1"><a href="java-time.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>java-time</span></div></a></li><li class="depth-2 branch"><a href="java-time.api.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>api</span></div></a></li><li class="depth-2"><a href="java-time.repl.html"><div class="inner"><span class="tree"><span class="top"></span><span class="bottom"></span></span><span>repl</span></div></a></li></ul></div><div class="document" id="content"><div class="doc"><div class="markdown"><h1><a href="#clojurejava-time" id="clojurejava-time"></a>Clojure.Java-Time</h1>
44
<p><a href="https://clojars.org/clojure.java-time"><img src="https://img.shields.io/clojars/v/clojure.java-time.svg" alt="Clojars Project" /></a></p>
55
<p>A Clojure wrapper for Java 8 Date-Time API.</p>
66
<blockquote>
@@ -42,10 +42,10 @@ <h2><a href="#whats-different-in-java-time-api" id="whats-different-in-java-time
4242
<p>You can also take a look at a <a href="http://time4j.net/tutorial/appendix.html">comprehensive comparison</a> by the <a href="http://time4j.net/">Time4J</a> authors.</p>
4343
<h2><a href="#usage" id="usage"></a>Usage</h2>
4444
<p>Add the following dependency to your <code>deps.edn</code>:</p>
45-
<pre><code class="language-clj">clojure.java-time/clojure.java-time {:mvn/version "1.4.0"}
45+
<pre><code class="language-clj">clojure.java-time/clojure.java-time {:mvn/version "1.4.1"}
4646
</code></pre>
4747
<p>or to your <code>project.clj</code> or <code>build.boot</code>:</p>
48-
<pre><code class="language-clj">[clojure.java-time "1.4.0"]
48+
<pre><code class="language-clj">[clojure.java-time "1.4.1"]
4949
</code></pre>
5050
<p>The <a href="https://dm3.github.io/clojure.java-time">API</a> of the Clojure.Java-Time consists of one namespace, namely <code>java-time.api</code>. For the purposes of this guide, we will <code>require</code> the main namespace:</p>
5151
<pre><code class="language-clj">(require '[java-time.api :as jt]

docs/index.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

docs/java-time.api.html

Lines changed: 155 additions & 152 deletions
Large diffs are not rendered by default.

docs/java-time.html

Lines changed: 155 additions & 152 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)