Merge branch 'master' of git://github.com/clojurewerkz/titanium

README.md

@@ -3,6 +3,7 @@
 Titanium is a Clojure graph library built on top of [Titan](http://thinkaurelius.github.com/titan/)
 and the [Tinkerpop stack](http://tinkerpop.com).
 
+# Disclaimer: Titanium development is currently on hiatus. There are major breaking changes that need to be made to this library and the documentation and the primary developer ([zmaril](http://github.com/zmaril)) is too busy finishing college to make them. If you are interested in making the changes, please get in touch, otherwise beware!
 
 ## Project Goals
 
@@ -104,9 +105,14 @@ on Github.
 
 ## License
 
-Copyright (C) 2013 Michael S. Klishin, Alex Petrov.
+Copyright (C) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and
+the ClojureWerkz team.
 
 Double licensed under the [Eclipse Public License](http://www.eclipse.org/legal/epl-v10.html) (the same as Clojure) or the [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 
 [Titan](http://thinkaurelius.github.com/titan/) is licensed under the [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/clojurewerkz/titanium/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

project.clj

@@ -12,8 +12,8 @@
   :java-source-paths ["src/java"]
   :javac-options     ["-target" "1.6" "-source" "1.6"]
   :profiles {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
-             :1.6 {:dependencies [[org.clojure/clojure "1.6.0-master-SNAPSHOT"]]}
-             :master {:dependencies [[org.clojure/clojure "1.6.0-master-SNAPSHOT"]]}
+             :1.6 {:dependencies [[org.clojure/clojure "1.7.0-master-SNAPSHOT"]]}
+             :master {:dependencies [[org.clojure/clojure "1.7.0-master-SNAPSHOT"]]}
              :dev {
                    :plugins [[codox "0.6.1"]]
                    :codox {:sources ["src/clojure"]

src/clojure/clojurewerkz/titanium/edges.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.edges
   (:refer-clojure :exclude [keys vals assoc! dissoc! get find])
   (:require [potemkin :as po]
@@ -47,4 +57,4 @@
 ;;Creation
 (po/import-fn edge/connect!)
 (po/import-fn edge/upconnect!)
-(po/import-fn edge/unique-upconnect!)
+(po/import-fn edge/unique-upconnect!)

src/clojure/clojurewerkz/titanium/elements.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.elements
   (:refer-clojure :exclude [assoc! dissoc!])
   (:require [clojure.walk :as w])

src/clojure/clojurewerkz/titanium/graph.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.graph
   (:require [potemkin :as po]
             [archimedes.core :as g])
@@ -36,7 +46,7 @@
     conf))
 
 (defprotocol TitaniumGraph
-  (^KeyIndexableGraph open [input] "Opens a new graph"))
+  (^com.tinkerpop.blueprints.KeyIndexableGraph open [input] "Opens a new graph"))
 
 (extend-protocol TitaniumGraph
   String

src/clojure/clojurewerkz/titanium/indexing.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.indexing
   (:refer-clojure :exclude [get remove count])
   (:import [com.tinkerpop.blueprints Graph Index Element]))

src/clojure/clojurewerkz/titanium/query.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.query
   (:refer-clojure :exclude [count])
   (:import  [com.tinkerpop.blueprints Vertex Edge Direction Query])
@@ -12,4 +22,4 @@
 (po/import-fn q/limit)
 (po/import-macro q/find-vertices)
 (po/import-macro q/find-edges)
-(po/import-macro q/count)
+(po/import-macro q/count)

src/clojure/clojurewerkz/titanium/types.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.types
   (:import (com.thinkaurelius.titan.core TitanType TypeMaker$UniquenessConsistency)
            (com.tinkerpop.blueprints Vertex Edge Direction Graph))

src/clojure/clojurewerkz/titanium/vertices.clj

@@ -1,3 +1,13 @@
+;; Copyright (c) 2013-2014 Michael S. Klishin, Alex Petrov, Zack Maril, and The ClojureWerkz
+;; Team
+;;
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
 (ns clojurewerkz.titanium.vertices
   (:refer-clojure :exclude [keys vals assoc! dissoc! get find])
   (:require [potemkin :as po]

test/clojurewerkz/titanium/edges_test.clj

@@ -237,8 +237,8 @@
          (is (= 1 (ted/get edge :a)))
          (is (= 0 (ted/get edge :b)))
          (ted/connect! v1 :connexion v2)
-         (is (thrown? Throwable #"There were 2 vertices returned."
-                      (ted/unique-upconnect! v1 :connexion v2))))))
+         (is (thrown-with-msg? Throwable #"There were 2 vertices returned."
+                               (ted/unique-upconnect! v1 :connexion v2))))))
     (tg/shutdown)
     (clear-db)))
 

test/clojurewerkz/titanium/graph_test.clj

@@ -49,7 +49,7 @@
       (is (= StandardVertex (type vertex)))))
 
   (testing "Stored graph"
-    (is (thrown? Throwable #"transact!" (tv/create!))))
+    (is (thrown-with-msg? Throwable #"transact!" (tv/create!))))
 
   (testing "Dueling transactions"
     (tg/transact!
@@ -96,4 +96,4 @@
                 (tg/transact! (tv/find-by-kv :vertex-id random-long))))
           "*graph* has only one vertex with the specified vertex-id")))
   (tg/shutdown)
-  (clear-db))
+  (clear-db))

test/clojurewerkz/titanium/vertices_test.clj

@@ -204,8 +204,8 @@
        (is (= 22
               (tv/get (tv/refresh v1-a) :age)
               (tv/get (tv/refresh v1-b) :age)))       
-       (is (thrown? Throwable #"There were 2 vertices returned."
-                    (tv/unique-upsert! :last-name {:last-name "Maril"}))))))
+       (is (thrown-with-msg? Throwable #"There were 2 vertices returned."
+                             (tv/unique-upsert! :last-name {:last-name "Maril"}))))))
 
   (tg/shutdown)
   (clear-db))