Rename library ns's to grafter-2 & update RDF dependencies to RDF4j

grafter.tabular always had an implicit sesame dependency, so update
the library to work with RDF4j version of grafter.  And change
namespace to grafter-2 to allow projects to use both old and new
versions simultaneously should they require during a transition.

NOTE: this library is still deprecated and is soley in maintenance
mode.

Author: RickMoynihan

project.clj

@@ -1,4 +1,4 @@
-(defproject grafter/grafter.tabular "0.11.3-SNAPSHOT"
+(defproject grafter/grafter.tabular-2 "2.1.0-SNAPSHOT"
   :description "Tools for the hard graft of data processing"
   :url "http://grafter.org/"
   :license {:name "Eclipse Public License - v1.0"
@@ -8,7 +8,7 @@
 
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.clojure/tools.logging "0.3.1"]
-                 [grafter "0.11.2"] ;; depends on grafter.rdf.protocols
+                 [grafter "2.1.0"] ;; depends on grafter.rdf.protocols
                  [commons-io/commons-io "2.4"]
                  [me.raynes/fs "1.4.6"]
                  [potemkin "0.4.3"]

src/grafter/rdf/preview.clj renamed to src/grafter_2/rdf/preview.clj

@@ -1,9 +1,9 @@
-(ns grafter.rdf.preview
+(ns grafter-2.rdf.preview
   "Tool support for rendering previews of grafter.tabular graph-fn templates
   with values from datasets."
   (:require [clojure.walk]
             [clojure.edn :as edn]
-            [grafter.tabular :refer [make-dataset]])
+            [grafter-2.tabular :refer [make-dataset]])
   (:import [incanter.core Dataset]))
 
 (defn- symbolize-keys [m]
@@ -107,7 +107,7 @@
    (preview-graph dataset graphf row false))
 
   ([dataset graphf row render-constants?]
-   (let [form (:grafter.tabular/template (meta graphf))
+   (let [form (:grafter-2.tabular/template (meta graphf))
          bindings (first (second form))
          body-forms (drop 2 form)
          printable-row-data (->printable-form (nth (:rows dataset) row nil))
@@ -118,7 +118,7 @@
            (map (fn [body-form]
                   (let [replaced-vals (clojure.walk/postwalk-replace subs body-form)]
                     (if (= :render-constants render-constants?)
-                      (bind-constants (:grafter.tabular/defined-in-ns (meta graphf)) replaced-vals)
+                      (bind-constants (:grafter-2.tabular/defined-in-ns (meta graphf)) replaced-vals)
                       replaced-vals)))))})))
 
 (comment

src/grafter/sequences.clj renamed to src/grafter_2/sequences.clj

@@ -1,4 +1,4 @@
-(ns grafter.sequences
+(ns grafter-2.sequences
   "A library of useful lazy sequences."
   (:require [clojure.string :refer [blank?]]))
 

src/grafter/tabular.clj renamed to src/grafter_2/tabular.clj

@@ -1,26 +1,26 @@
-(ns grafter.tabular
+(ns grafter-2.tabular
   "Functions for processing tabular data."
   (:require [clojure
              [set :as set]
              [string :as str]]
-            [grafter.tabular.common :as tabc :refer [lift->vector map-keys]]
+            [grafter-2.tabular.common :as tabc :refer [lift->vector map-keys]]
             [incanter.core :as inc]
             [potemkin.namespaces :refer [import-vars]])
   (:import incanter.core.Dataset))
 
 ;; Load protocol definitions.  This could occur in the ns definition but putting
 ;; them in their means that namespace refactoring tools can clear them out
 ;; accidentally.  Better to explicitly require them to ensure they're loaded.
-(require '[grafter.tabular
+(require '[grafter-2.tabular
            [csv]
            [excel]])
 
 ;; This one is necessary for import-vars - again separating these from the ns
 ;; definition protects them against overzealous refactoring tools.
-(require '[grafter.tabular.melt])
+(require '[grafter-2.tabular.melt])
 
 (import-vars
- [grafter.tabular.common
+ [grafter-2.tabular.common
   dataset?
   column-names
   make-dataset
@@ -31,7 +31,7 @@
   with-metadata-columns
   without-metadata-columns
   resolve-column-id]
- [grafter.tabular.melt
+ [grafter-2.tabular.melt
   melt])
 
 
@@ -598,7 +598,7 @@ the specified column being cloned."
   should not be considered part of this namespaces public interface.
   It is only public because it is used by a macro."
   [ds row index]
-  (let [col-name (grafter.tabular/resolve-column-id ds index ::not-found)]
+  (let [col-name (grafter-2.tabular/resolve-column-id ds index ::not-found)]
     (if-not (= col-name ::not-found)
       (get row col-name ::not-found))))
 

src/grafter/tabular/common.clj renamed to src/grafter_2/tabular/common.clj

@@ -1,7 +1,7 @@
-(ns grafter.tabular.common
+(ns grafter-2.tabular.common
   {:no-doc true}
   (:require [clj-excel.core :as xls]
-            [grafter.sequences :as seqs]
+            [grafter-2.sequences :as seqs]
             [clojure.java.io :as io]
             [incanter.core :as inc]
             [me.raynes.fs :as fs])
@@ -138,9 +138,9 @@
 (defn assoc-data-source-meta [output-ds data-source]
   "Adds metadata about where the dataset was loaded from to the object."
   (let [source-meta (cond
-                      (#{String File URI URL} (class data-source))  {:grafter.tabular/data-source data-source}
+                      (#{String File URI URL} (class data-source))  {:grafter-2.tabular/data-source data-source}
                       (instance? incanter.core.Dataset data-source) (meta data-source)
-                      :else {:grafter.tabular/data-source :datasource-unknown}) ]
+                      :else {:grafter-2.tabular/data-source :datasource-unknown}) ]
     (with-meta output-ds (merge (meta output-ds) source-meta))))
 
 (defmulti ^:no-doc read-dataset*

src/grafter/tabular/csv.clj renamed to src/grafter_2/tabular/csv.clj

@@ -1,9 +1,9 @@
-(ns grafter.tabular.csv
+(ns grafter-2.tabular.csv
   {:no-doc true}
   (:require [clojure.data.csv :as csv]
             [clojure.java.io :as io]
-            [grafter.tabular.common :as tab]
-            [grafter.rdf.protocols :refer [raw-value]])
+            [grafter-2.tabular.common :as tab]
+            [grafter-2.rdf.protocols :refer [raw-value]])
   (:import [java.io IOException]
            [org.apache.commons.io.input BOMInputStream]))
 

src/grafter/tabular/edn.clj renamed to src/grafter_2/tabular/edn.clj

@@ -1,6 +1,6 @@
-(ns grafter.tabular.edn
+(ns grafter-2.tabular.edn
   {:no-doc true}
-  (:require [grafter.tabular.common :as tab]
+  (:require [grafter-2.tabular.common :as tab]
             [clojure.edn :as edn]
             [incanter.core :refer [->Dataset]]
             [clojure.java.io :refer [reader writer]])

src/grafter/tabular/excel.clj renamed to src/grafter_2/tabular/excel.clj

@@ -1,15 +1,15 @@
-(ns grafter.tabular.excel
+(ns grafter-2.tabular.excel
   {:no-doc true}
   (:require [clj-excel.core :as xls]
-            [grafter.tabular.common :as tab]
+            [grafter-2.tabular.common :as tab]
             [clojure.java.io :as io])
   (:import
    [java.net URI URL]
    [org.apache.poi.ss.usermodel Cell]))
 
 ;; Extend the clj-excel multi-method to handle expected grafter types
 ;; when outputting as an Excel file.
-(defmethod xls/cell-mutator org.openrdf.model.URI [^Cell cell ^org.openrdf.model.URI val] (.setCellValue cell (str val)))
+(defmethod xls/cell-mutator org.eclipse.rdf4j.model.URI [^Cell cell ^org.eclipse.rdf4j.model.URI val] (.setCellValue cell (str val)))
 (defmethod xls/cell-mutator URI [^Cell cell ^URI val] (.setCellValue cell (str val)))
 (defmethod xls/cell-mutator URL [^Cell cell ^URI val] (.setCellValue cell (str val)))
 (defmethod xls/cell-mutator :default [^Cell cell val] (.setCellValue cell (str val)))

src/grafter/tabular/melt.clj renamed to src/grafter_2/tabular/melt.clj

@@ -1,8 +1,8 @@
-(ns ^:no-doc grafter.tabular.melt
+(ns ^:no-doc grafter-2.tabular.melt
   "Functions for melting data and building variations on melt."
   (:require
    [clojure.set :as set]
-   [grafter.tabular.common :refer :all]))
+   [grafter-2.tabular.common :refer :all]))
 
 (defn mapcat-rows
   "Transforms a dataset by performing a mapcat operation on the

test/grafter/sequences_test.clj renamed to test/grafter_2/sequences_test.clj

@@ -1,6 +1,6 @@
-(ns grafter.sequences-test
+(ns grafter-2.sequences-test
   (:require [clojure.test :refer :all]
-            [grafter.sequences :refer :all]))
+            [grafter-2.sequences :refer :all]))
 
 (deftest column-names-seq-test
   (testing "iterates alphabet repeatedly like it's numeric"
@@ -19,4 +19,3 @@
   (testing "fills initial nil values with given value"
     (is (= [:a :a :b]
            (fill-when (complement nil?) '(nil nil :b) :a)))))
-

test/grafter/tabular/melt_test.clj renamed to test/grafter_2/tabular/melt_test.clj

@@ -1,6 +1,6 @@
-(ns grafter.tabular.melt-test
-  (:require [grafter.tabular :refer [column-names make-dataset]]
-            [grafter.tabular.melt :refer :all]
+(ns grafter-2.tabular.melt-test
+  (:require [grafter-2.tabular :refer [column-names make-dataset]]
+            [grafter-2.tabular.melt :refer :all]
             [clojure.test :refer :all]))
 
 (defn datasets-equal?

test/grafter/tabular_test.clj renamed to test/grafter_2/tabular_test.clj

@@ -1,13 +1,13 @@
-(ns grafter.tabular-test
+(ns grafter-2.tabular-test
   (:require [clojure.test :refer :all]
-            [grafter.sequences :as seqs]
-            [grafter.tabular.common :as tabc]
-            [grafter.tabular :refer :all]
-            [grafter.rdf.protocols :refer [->Quad]]
-            [grafter.rdf.templater :refer [graph triplify]]
-            [grafter.tabular.csv]
-            [grafter.tabular.excel]
-            [grafter.tabular.edn]
+            [grafter-2.sequences :as seqs]
+            [grafter-2.tabular.common :as tabc]
+            [grafter-2.tabular :refer :all]
+            [grafter-2.rdf.protocols :refer [->Quad]]
+            [grafter-2.rdf4j.templater :refer [graph triplify]]
+            [grafter-2.tabular.csv]
+            [grafter-2.tabular.excel]
+            [grafter-2.tabular.edn]
             [incanter.core :as inc]
             [clojure.java.io :as io])
   (:import [java.io File]))
@@ -130,7 +130,7 @@
 (defn has-metadata? [ds]
   (let [md (meta ds)]
     (is md "There is no metadata set")
-    (is (:grafter.tabular/data-source md) "There is no :data-source set.")))
+    (is (:grafter-2.tabular/data-source md) "There is no :data-source set.")))
 
 (defmethod tabc/read-dataset* ::test
   [source opts]
@@ -256,7 +256,7 @@
         (is (= '("Sheet1" "Sheet2") (mapcat keys datasets))))))
 
   (testing "Opening a sequential thing"
-    (let [ds (grafter.tabular/make-dataset [[1 2 3]])
+    (let [ds (grafter-2.tabular/make-dataset [[1 2 3]])
           datasets (read-datasets [{"foo" ds}])]
       (is (every? is-a-dataset? (mapcat vals datasets)))
       (is ((first datasets) "foo") ds)))
@@ -308,7 +308,7 @@
                (columns test-data [:a :b])) "should select columns 0 and 1 (a and b)"))
 
       (testing "works with infinite sequences"
-        (is (columns test-data (grafter.sequences/integers-from 5))
+        (is (columns test-data (seqs/integers-from 5))
             "Takes as much as it can from the supplied sequence and returns those columns.")
 
         (is (thrown? IndexOutOfBoundsException
@@ -803,12 +803,12 @@
                                           [a
                                            [b c]]))
               ds (make-dataset [["http://one/" "http://two/" "http://three/"]])
-              quad-meta (meta (first (my-graphfn ds)))] (is (= {:grafter.tabular/row {"a" "http://one/" "b" "http://two/" "c" "http://three/"}}
+              quad-meta (meta (first (my-graphfn ds)))] (is (= {:grafter-2.tabular/row {"a" "http://one/" "b" "http://two/" "c" "http://three/"}}
                                                                quad-meta)
                                                             "Adds the row that yielded each Quad as metadata")
 
              (is (= {"a" "http://one/" "b" "http://two/" "c" "http://three/"}
-                    (:grafter.tabular/row quad-meta))
+                    (:grafter-2.tabular/row quad-meta))
                  "Adds the row that yielded each Quad as metadata"))))))
 
 (deftest rename-test