safedb 0.3.1011 → 0.4.1002

data/lib/utils/store/merge-boys-school.json

@@ -0,0 +1,40 @@
+{
+    "year.1" :
+    {
+
+	"class.1" :
+	{
+	    "pupil.1" : "Joe Bloggs",
+	    "pupil.2" : "Stefan Peterson",
+	    "pupil.3" : "Robert Beefsted",
+	    "teachers" :
+	    {
+		"maths" : "Mrs Mathematics",
+		"music" : "Mr Trombone",
+		"p.e" : "Miss Cartwright"
+	    }
+	},
+
+	"class.special" :
+	{
+	    "pupil.1" : "Noughty Noughtiest",
+	    "teachers" :
+	    {
+		"maths" : "Mr Deescipleen",
+		"emotions" : "Madame Emotionne"
+	    }
+	},
+
+	"class.2" :
+	{
+	    "pupil.1" : "Steve Workshard",
+	    "pupil.2" : "Paul Brainiac",
+	    "teachers" :
+	    {
+		"maths" : "Mrs Mathematics",
+		"music" : "Mr Trombone",
+		"p.e" : "Miss Cartwright"
+	    }
+	}
+    }
+}

data/lib/utils/store/merge-girls-school.json

@@ -0,0 +1,48 @@
+{
+    "school.name" : "SafeDb Girls School",
+    "school.location" : "East Acacia Avenue",
+    "year.1" :
+    {
+	"class.1" :
+	{
+	    "pupil.1" : "Joe Bloggs",
+	    "pupil.x" : "Jeanette Jones",
+	    "pupil.y" : "Cynthia Roberts",
+	    "teachers" :
+	    {
+		"maths" : "Mrs Trig",
+		"geography" : "Mr Geo-Spatial",
+		"science" : "Dr Doolittle",
+		"p.e" : "Miss Cartwright"
+	    }
+	},
+
+	"class.2" :
+	{
+	    "pupil.1" : "Max Mayhem",
+	    "pupil.2" : "Paul Brainiac",
+	    "teachers" :
+	    {
+		"maths" : "Mrs Mathematics",
+		"music" : "Ms Flute",
+		"p.e" : "Miss Cartwright"
+	    }
+	},
+
+	"class.3" :
+	{
+	    "pupil.x" : "Joan Blakesfield",
+	    "pupil.y" : "Susan Seesdeeir",
+	    "teachers" :
+	    {
+		"chemistry" : "Ms Burnsen"
+	    }
+	}
+    },
+
+    "sixth form" :
+    {
+	"Art" : "Beth Rigby",
+	"Woodwork" : "Patricia Dunwoody"
+    }
+}

data/lib/utils/store/merge-merged-data.json

@@ -0,0 +1,56 @@
+#### #################################################
+#### ##### Joined Up Schools #########################
+#### #################################################
+
+Refusing to let { school.name => SafeDb Girls School } overwrite { school.name => SafeDb Boys School }
+Refusing to let { maths => Mrs Trig } overwrite { maths => Mrs Mathematics }
+Refusing to let { pupil.1 => Max Mayhem } overwrite { pupil.1 => Steve Workshard }
+Refusing to let { music => Ms Flute } overwrite { music => Mr Trombone }
+
+{
+  "school.name": "SafeDb Boys School",
+  "school.location": "East Acacia Avenue",
+  "year.1": {
+    "class.1": {
+      "pupil.1": "Joe Bloggs",
+      "pupil.2": "Stefan Peterson",
+      "pupil.3": "Robert Beefsted",
+      "teachers": {
+        "maths": "Mrs Mathematics",
+        "music": "Mr Trombone",
+        "p.e": "Miss Cartwright",
+        "geography": "Mr Geo-Spatial",
+        "science": "Dr Doolittle"
+      },
+      "pupil.x": "Jeanette Jones",
+      "pupil.y": "Cynthia Roberts"
+    },
+    "class.special": {
+      "pupil.1": "Noughty Noughtiest",
+      "teachers": {
+        "maths": "Mr Deescipleen",
+        "emotions": "Madame Emotionne"
+      }
+    },
+    "class.2": {
+      "pupil.1": "Steve Workshard",
+      "pupil.2": "Paul Brainiac",
+      "teachers": {
+        "maths": "Mrs Mathematics",
+        "music": "Mr Trombone",
+        "p.e": "Miss Cartwright"
+      }
+    },
+    "class.3": {
+      "pupil.x": "Joan Blakesfield",
+      "pupil.y": "Susan Seesdeeir",
+      "teachers": {
+        "chemistry": "Ms Burnsen"
+      }
+    }
+  },
+  "sixth form": {
+    "Art": "Beth Rigby",
+    "Woodwork": "Patricia Dunwoody"
+  }
+}

data/lib/utils/store/struct.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/ruby
+
+module SafeDb
+
+  # Data structure class provides behaviour for holding managing curating
+  # and most important of all, merging, data.
+  #
+  # <tt>How to Merge Data Structures</tt>
+  #
+  # Recursively merge (deep merge) two {Hash} data structures. The core ruby
+  # {Hash.merge()} instance method only performs first level merges which is
+  # not ideal if you need to intelligently merge a deep tree.
+  class Struct
+
+    # Recursively merge (deep merge) two {Hash} data structures. The core ruby
+    # {Hash.merge()} instance method only performs first level merges which is
+    # not ideal if you need to intelligently merge a deep tree.
+    #
+    # <tt>Merge Behaviour</tt>
+    #
+    # Currently this behaviour works only for Hash data structures that have
+    # string keys (only) and either string or Hash values. It is interesting
+    # only when duplicate keys are encountered at the same level. If the
+    # duplicate key's value is
+    # 
+    # 1. a String - the incoming value is rejected and logged
+    # 2. a Hash - the method is recalled with these nested Hashes as parameters
+    # 
+    # @param struct_1 [Hash] the current receiving hash data structure
+    # @param struct_2 [Hash] the incoming hash data structure to merge
+    def self.recursively_merge!( struct_1, struct_2 )
+
+      struct_1.merge!( struct_2 ) do | key, value_1, value_2 |
+
+        is_mergeable = value_1.kind_of?( Hash   ) && value_2.kind_of?( Hash   )
+        are_both_str = value_1.kind_of?( String ) && value_2.kind_of?( String )
+        not_the_same = are_both_str && ( value_1 != value_2 )
+
+        reject_message( key, value_1, value_2 ) if not_the_same
+        recursively_merge!( value_1, value_2 ) if is_mergeable
+        value_1
+
+      end
+
+
+    end
+
+
+    private
+
+
+    def self.reject_message( key, value_1, value_2 )
+      the_message = "Refused to allow { #{key} => #{value_2} } to overwrite { #{key} => #{value_1} }"
+      puts ""; puts the_message
+    end
+
+=begin
+    require 'json'
+    boys_school = JSON.parse( File.read( "merge-boys-school.json" ) )
+    girls_school = JSON.parse( File.read( "merge-girls-school.json" ) )
+
+    puts ""
+    puts "#### #################################################"
+    puts "#### ##### Joined Up Schools #########################"
+    puts "#### #################################################"
+    puts ""
+
+    recursively_merge!( boys_school, girls_school )
+    puts ""; puts JSON.pretty_generate( boys_school )
+=end
+
+  end
+
+
+end

data/lib/utils/store/test-commands.sh

@@ -0,0 +1,24 @@
+
+
+First On Shell A
+########################
+
+safe init school
+safe login school
+
+
+safe open grounds football.pitch
+safe put size "250sq/m"
+safe put owner school
+safe read boys.school.json projects/safedb.net/lib/utils/store/merge-boys-school.json
+safe view
+
+safe import ~/projects/safedb.net/lib/utils/store/merge-boys-school.json
+safe show
+safe checkin
+
+
+
+Then On Shell B
+########################
+

data/lib/{keytools/key.now.rb → utils/time/timestamp.rb}

@@ -8,8 +8,8 @@ module SafeDb
   # with infrastructure provisioning and configuraion management.
   #
   # The central idea behind the pattern is to link every infrastructure
-  # object created during a session with a reference accurate to the nearest
-  # centi-second denoting the moment the software runtime (session) began.
+  # object created during a branch with a reference accurate to the nearest
+  # centi-second denoting the moment the software runtime (branch) began.
   class KeyNow
     include Singleton
 
@@ -341,6 +341,17 @@ module SafeDb
     end
 
 
+    # Fetch the human readable time denoting the weekday, month day,
+    # month, year and the time (accurate to the nearest minute).
+    #
+    # @return [String]
+    #    the weekday, month day, month, year and the hour minute time.
+    def self.readable
+      time_with_consecutive_spaces = Time.now.ctime
+      return time_with_consecutive_spaces.gsub( "  ", " " )
+    end
+
+
     # Grab the double barreled time stamp that is an amalgam of
     # the human readable time now and a machine time representation
     # from the moment this class was initialized.
@@ -373,25 +384,25 @@ module SafeDb
     #    move method contents into test class
     def self.log_instance_time
 
-      log.info(x) { "[stamp] -------------- => -------------------------------- #" }
-      log.info(x) { "[stamp] eco time stamp => [#{KeyNow.instance.time_now.ctime}]" }
-      log.info(x) { "[stamp] -------------- => -------------------------------- #" }
-      log.info(x) { "[stamp] Univ Time Zone => #{zone}"  }
-      log.info(x) { "[stamp] Month Index is => #{mo}"    }
-      log.info(x) { "[stamp] Month Name is  => #{mmm}"   }
-      log.info(x) { "[stamp] Day Of Week is => #{ddd}"   }
-      log.info(x) { "[stamp] -------------- => -------------------------------- #" }
-      log.info(x) { "[stamp] Two Digit Year => #{yy}"    }
-      log.info(x) { "[stamp] Julian Cal Day => #{jjj}"   }
-      log.info(x) { "[stamp] Yr and Jul Day => #{yyjjj}" }
-      log.info(x) { "[stamp] Hour of Theday => #{hh}"    }
-      log.info(x) { "[stamp] Minute of Hour => #{mm}"    }
-      log.info(x) { "[stamp] Hour + Minute  => #{hhmm}"  }
-      log.info(x) { "[stamp] Second of Min  => #{ss}"    }
-      log.info(x) { "[stamp] 600 Min Slices => #{sst}"   }
-      log.info(x) { "[stamp] -------------- => -------------------------------- #" }
-      log.info(x) { "[stamp] The Time Stamp => #{yyjjj_hhmm_sst}" }
-      log.info(x) { "[stamp] -------------- => -------------------------------- #" }
+      log.debug(x) { "[stamp] -------------- => -------------------------------- #" }
+      log.debug(x) { "[stamp] eco time stamp => [#{KeyNow.instance.time_now.ctime}]" }
+      log.debug(x) { "[stamp] -------------- => -------------------------------- #" }
+      log.debug(x) { "[stamp] Univ Time Zone => #{zone}"  }
+      log.debug(x) { "[stamp] Month Index is => #{mo}"    }
+      log.debug(x) { "[stamp] Month Name is  => #{mmm}"   }
+      log.debug(x) { "[stamp] Day Of Week is => #{ddd}"   }
+      log.debug(x) { "[stamp] -------------- => -------------------------------- #" }
+      log.debug(x) { "[stamp] Two Digit Year => #{yy}"    }
+      log.debug(x) { "[stamp] Julian Cal Day => #{jjj}"   }
+      log.debug(x) { "[stamp] Yr and Jul Day => #{yyjjj}" }
+      log.debug(x) { "[stamp] Hour of Theday => #{hh}"    }
+      log.debug(x) { "[stamp] Minute of Hour => #{mm}"    }
+      log.debug(x) { "[stamp] Hour + Minute  => #{hhmm}"  }
+      log.debug(x) { "[stamp] Second of Min  => #{ss}"    }
+      log.debug(x) { "[stamp] 600 Min Slices => #{sst}"   }
+      log.debug(x) { "[stamp] -------------- => -------------------------------- #" }
+      log.debug(x) { "[stamp] The Time Stamp => #{yyjjj_hhmm_sst}" }
+      log.debug(x) { "[stamp] -------------- => -------------------------------- #" }
 
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SafeDb
-  VERSION = "0.3.1011"
+  VERSION = "0.4.1002"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safedb
 version: !ruby/object:Gem::Version
-  version: 0.3.1011
+  version: 0.4.1002
 platform: ruby
 authors:
 - Apollo Akora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -127,86 +127,99 @@ files:
 - README.md
 - Rakefile
 - bin/safe
-- lib/configs/README.md
-- lib/extension/array.rb
-- lib/extension/dir.rb
-- lib/extension/file.rb
-- lib/extension/hash.rb
-- lib/extension/string.rb
+- lib/cli.rb
+- lib/controller/admin/README.md
+- lib/controller/admin/access.rb
+- lib/controller/admin/checkin.rb
+- lib/controller/admin/checkout.rb
+- lib/controller/admin/diff.rb
+- lib/controller/admin/export.rb
+- lib/controller/admin/goto.rb
+- lib/controller/admin/import.rb
+- lib/controller/admin/init.rb
+- lib/controller/admin/login.rb
+- lib/controller/admin/logout.rb
+- lib/controller/admin/open.rb
+- lib/controller/admin/token.rb
+- lib/controller/admin/tree.md
+- lib/controller/admin/use.rb
+- lib/controller/admin/view.rb
+- lib/controller/api/docker/README.md
+- lib/controller/api/docker/docker.rb
+- lib/controller/api/jenkins/README.md
+- lib/controller/api/jenkins/jenkins.rb
+- lib/controller/api/terraform/README.md
+- lib/controller/api/terraform/terraform.rb
+- lib/controller/api/vpn/README.md
+- lib/controller/api/vpn/vpn.ini
+- lib/controller/api/vpn/vpn.rb
+- lib/controller/config/README.md
+- lib/controller/edit/README.md
+- lib/controller/edit/editverse.rb
+- lib/controller/edit/put.rb
+- lib/controller/edit/remove.rb
+- lib/controller/edit/rename.md
+- lib/controller/files/README.md
+- lib/controller/files/read.rb
+- lib/controller/files/write.rb
+- lib/controller/id.rb
+- lib/controller/query/print.rb
+- lib/controller/query/queryverse.rb
+- lib/controller/query/show.rb
+- lib/controller/requirer.rb
+- lib/controller/set.rb
+- lib/controller/usecase.rb
+- lib/controller/verse.rb
+- lib/controller/visit/README.md
+- lib/controller/visit/visit.rb
 - lib/factbase/facts.safedb.net.ini
-- lib/interprete.rb
-- lib/keytools/kdf.api.rb
-- lib/keytools/kdf.bcrypt.rb
-- lib/keytools/kdf.pbkdf2.rb
-- lib/keytools/kdf.scrypt.rb
-- lib/keytools/key.64.rb
-- lib/keytools/key.algo.rb
-- lib/keytools/key.api.rb
-- lib/keytools/key.db.rb
-- lib/keytools/key.docs.rb
-- lib/keytools/key.error.rb
-- lib/keytools/key.id.rb
-- lib/keytools/key.ident.rb
-- lib/keytools/key.iv.rb
-- lib/keytools/key.local.rb
-- lib/keytools/key.now.rb
-- lib/keytools/key.pair.rb
-- lib/keytools/key.pass.rb
-- lib/keytools/key.rb
-- lib/logging/gem.logging.rb
+- lib/model/README.md
+- lib/model/book.rb
+- lib/model/branch.rb
+- lib/model/checkin.feature
+- lib/model/configs.md
+- lib/model/content.rb
+- lib/model/indices.rb
+- lib/model/safe_tree.rb
+- lib/model/state.inspect.rb
+- lib/model/state.migrate.rb
+- lib/model/text_chunk.rb
 - lib/modules/README.md
 - lib/modules/cryptology/aes-256.rb
-- lib/modules/cryptology/amalgam.rb
 - lib/modules/cryptology/blowfish.rb
 - lib/modules/cryptology/cipher.rb
 - lib/modules/cryptology/collect.rb
 - lib/modules/cryptology/crypt.io.rb
-- lib/modules/cryptology/engineer.rb
-- lib/modules/mappers/dictionary.rb
 - lib/modules/storage/coldstore.rb
 - lib/modules/storage/git.store.rb
-- lib/session/fact.finder.rb
-- lib/session/require.gem.rb
-- lib/session/time.stamp.rb
-- lib/session/user.home.rb
-- lib/usecase/cmd.rb
-- lib/usecase/config/README.md
-- lib/usecase/docker/README.md
-- lib/usecase/docker/docker.rb
-- lib/usecase/edit/README.md
-- lib/usecase/edit/delete.rb
-- lib/usecase/export.rb
-- lib/usecase/files/README.md
-- lib/usecase/files/eject.rb
-- lib/usecase/files/file_me.rb
-- lib/usecase/files/read.rb
-- lib/usecase/files/write.rb
-- lib/usecase/goto.rb
-- lib/usecase/id.rb
-- lib/usecase/import.rb
-- lib/usecase/init.rb
-- lib/usecase/jenkins/README.md
-- lib/usecase/jenkins/jenkins.rb
-- lib/usecase/login.rb
-- lib/usecase/logout.rb
-- lib/usecase/open.rb
-- lib/usecase/print.rb
-- lib/usecase/put.rb
-- lib/usecase/set.rb
-- lib/usecase/show.rb
-- lib/usecase/terraform/README.md
-- lib/usecase/terraform/terraform.rb
-- lib/usecase/token.rb
-- lib/usecase/update/README.md
-- lib/usecase/update/rename.rb
-- lib/usecase/use.rb
-- lib/usecase/verse.rb
-- lib/usecase/view.rb
-- lib/usecase/visit/README.md
-- lib/usecase/visit/visit.rb
-- lib/usecase/vpn/README.md
-- lib/usecase/vpn/vpn.ini
-- lib/usecase/vpn/vpn.rb
+- lib/utils/extend/array.rb
+- lib/utils/extend/dir.rb
+- lib/utils/extend/file.rb
+- lib/utils/extend/hash.rb
+- lib/utils/extend/string.rb
+- lib/utils/facts/fact.rb
+- lib/utils/identity/identifier.rb
+- lib/utils/identity/machine.id.rb
+- lib/utils/inspect/inspector.rb
+- lib/utils/kdfs/bcrypt.rb
+- lib/utils/kdfs/kdf.api.rb
+- lib/utils/kdfs/kdfs.rb
+- lib/utils/kdfs/pbkdf2.rb
+- lib/utils/kdfs/scrypt.rb
+- lib/utils/key.error.rb
+- lib/utils/key.pass.rb
+- lib/utils/keys/key.64.rb
+- lib/utils/keys/key.rb
+- lib/utils/keys/random.iv.rb
+- lib/utils/logs/logger.rb
+- lib/utils/store/datamap.rb
+- lib/utils/store/datastore.rb
+- lib/utils/store/merge-boys-school.json
+- lib/utils/store/merge-girls-school.json
+- lib/utils/store/merge-merged-data.json
+- lib/utils/store/struct.rb
+- lib/utils/store/test-commands.sh
+- lib/utils/time/timestamp.rb
 - lib/version.rb
 - safedb.gemspec
 homepage: https://www.safedb.net