Merge pull request #379 from fluree/feature/commit-metadata

Support for returning commits from /history

Author: dpetran

deps.edn

@@ -11,7 +11,7 @@
          instaparse/instaparse           {:mvn/version "1.4.12"}
          metosin/malli                   {:mvn/version "0.9.2"}
          com.fluree/json-ld              {:git/url "https://github.com/fluree/json-ld.git"
-                                          :sha     "0613d03a5657294a5575556f8eac68ab9f12705a"}
+                                          :sha     "a909330e33196504ef8a5411aaa0409ab72aaa35"}
 
          ;; logging
          org.clojure/tools.logging       {:mvn/version "1.2.4"}
@@ -54,7 +54,8 @@
    :extra-deps  {org.clojure/tools.namespace       {:mvn/version "1.3.0"}
                  criterium/criterium               {:mvn/version "0.4.6"}
                  figwheel-sidecar/figwheel-sidecar {:mvn/version "0.5.20"}
-                 thheller/shadow-cljs              {:mvn/version "2.20.12"}}}
+                 thheller/shadow-cljs              {:mvn/version "2.20.12"}
+                 com.magnars/test-with-files {:mvn/version "2021-02-17"}}}
 
   :cljtest
   {:extra-paths ["test" "dev-resources"]

dev/user.clj

@@ -2,7 +2,9 @@
   (:require [fluree.db.json-ld.api :as fluree]
             [clojure.tools.namespace.repl :as tn :refer [refresh refresh-all]]
             [clojure.core.async :as async]
-            [fluree.db.util.async :refer [<? <?? go-try merge-into?]]
+            [fluree.db.did :as did]
+            [fluree.db.json-ld.api :as fluree]
+            [fluree.db.util.async :refer [<? go-try merge-into?]]
             [fluree.db.flake :as flake]
             [fluree.db.dbfunctions.fns :as dbfunctions]
             [fluree.db.constants :as constants]
@@ -34,6 +36,73 @@
 (set! *warn-on-reflection* true)
 
 
+
+(comment
+
+
+
+  (do
+    (def default-private-key
+      "8ce4eca704d653dec594703c81a84c403c39f262e54ed014ed857438933a2e1c")
+
+
+    (def did (did/private->did-map default-private-key ))
+
+    (def default-context
+      {:id     "@id"
+       :type   "@type"
+       :xsd    "http://www.w3.org/2001/XMLSchema#"
+       :rdf    "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       :rdfs   "http://www.w3.org/2000/01/rdf-schema#"
+       :sh     "http://www.w3.org/ns/shacl#"
+       :schema "http://schema.org/"
+       :skos   "http://www.w3.org/2008/05/skos#"
+       :wiki   "https://www.wikidata.org/wiki/"
+       :f      "https://ns.flur.ee/ledger#"}))
+
+  (def file-conn @(fluree/connect {:method :file
+                                   :storage-path "dev/data"
+                                   :defaults
+                                   {:context (merge default-context {:ex "http://example.org/ns/"})
+                                    :did did}}))
+
+
+
+  (def ledger @(fluree/create file-conn "user/test"))
+
+  (def db1 @(fluree/stage
+            (fluree/db ledger)
+            [{:context      {:ex "http://example.org/ns/"}
+              :id           :ex/brian,
+              :type         :ex/User,
+              :schema/name  "Brian"
+              :schema/email "[email protected]"
+              :schema/age   50
+              :ex/favNums   7
+              }
+             {:context      {:ex "http://example.org/ns/"}
+              :id           :ex/alice,
+              :type         :ex/User,
+              :schema/name  "Alice"
+              :schema/email "[email protected]"
+              :schema/age   50
+              :ex/favNums   [42, 76, 9]
+              }
+             {:context      {:ex "http://example.org/ns/"}
+              :id           :ex/cam,
+              :type         :ex/User,
+              :schema/name  "Cam"
+              :schema/email "[email protected]"
+              :schema/age   34
+              :ex/favNums   [5, 10]
+              :ex/friend    [:ex/brian :ex/alice]}]))
+
+  (def db2 @(fluree/commit! ledger db1 {:message "hi"}))
+
+  @(fluree/load file-conn (-> ledger :alias))
+
+  )
+
 ;; TODO - general
 ;; if an subject is a component, do we allow it to be explicitly assigned as a ref to another component?
 ;; If so, do we not retract it? If we do retract it, we need to also retract all other refs
@@ -47,7 +116,7 @@
 ;; Some sort of defined-size tag lookup cache could make sense. Would need to clear it if a transaction altered any tag
 
 
-;cljs-stuff
+                                        ;cljs-stuff
 (defn start [] (ra/start-figwheel!))
 (defn start-cljs [] (ra/cljs-repl "dev"))
-;(defn stop [] (ra/stop-figwheel!))  ;; errs
+                                        ;(defn stop [] (ra/stop-figwheel!))  ;; errs