gloo 6.3.1 → 6.5.0

data/test.gloo/verbs/load.test.gloo

@@ -5,28 +5,34 @@
 # its effect is observable through 'exists?'.
 #
 
-tests [can] :
-  verbs [can] :
-    load [can] :
+tests.verbs.load [can] :
 
-      err_fired [bool] : false
-      on_error [script] :
-        put true into ^.err_fired
+  err_fired [bool] : false
+  on_error [script] :
+    put true into ^.err_fired
 
-      load_lib_registers_type [test] :
-        description [string] : load lib registers that library's object types.
-        on_test [script] :
-          exists? object markdown
-          refute "markdown type should not be registered before load"
+  load_lib_registers_type [test] :
+    description [string] : load lib registers that library's object types.
+    on_test [script] :
+      exists? object markdown
+      refute "markdown type should not be registered before load"
 
-          load lib md
-          exists? object markdown
-          assert "expected the markdown type to be registered after 'load lib md'"
+      load lib md
+      exists? object markdown
+      assert "expected the markdown type to be registered after 'load lib md'"
 
-      load_no_args_errors [test] :
-        description [string] : load with no arguments fires on_error.
-        on_test [script] :
-          put false into ^^.err_fired
-          load
-          eval ^^.err_fired = true
-          assert "expected 'load' with no arguments to fire on_error"
+  load_no_args_errors [test] :
+    description [string] : load with no arguments fires on_error.
+    on_test [script] :
+      put false into ^^.err_fired
+      load
+      eval ^^.err_fired = true
+      assert "expected 'load' with no arguments to fire on_error"
+
+  load_missing_file_errors [test] :
+    description [string] : load of a file that can't be found fires on_error.
+    on_test [script] :
+      put false into ^^.err_fired
+      load no_such_file_xyz
+      eval ^^.err_fired = true
+      assert "expected 'load' of a missing file to fire on_error"

data/test.gloo/verbs/log.test.gloo

@@ -2,13 +2,11 @@
 # Log verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    log [can] :
+tests.verbs.log [can] :
 
-      write_log [test] :
-        description [string] : Write to the log.
-        on_test [script] :
-          log 'debug' (debug)
-          eval it = 'debug'
-          assert "expected it to be 'debug'"
+  write_log [test] :
+    description [string] : Write to the log.
+    on_test [script] :
+      log 'debug' (debug)
+      eval it = 'debug'
+      assert "expected it to be 'debug'"

data/test.gloo/verbs/move.test.gloo

@@ -2,19 +2,17 @@
 # Move verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    move [can] :
+tests.verbs.move [can] :
 
-      c [container] :
-        a [string] : "a"
-      t [container] :
+  c [container] :
+    a [string] : "a"
+  t [container] :
 
-      move_a [test] :
-        description [string] : Move an object and verify.
-        on_test [script] :
-          move tests.verbs.move.c.a to tests.verbs.move.t
-          exists? instance tests.verbs.move.t.a
-          assert "expected a to be in t"
-          exists? instance tests.verbs.move.c.a
-          refute "expected a not to be in c"
+  move_a [test] :
+    description [string] : Move an object and verify.
+    on_test [script] :
+      move tests.verbs.move.c.a to tests.verbs.move.t
+      exists? instance tests.verbs.move.t.a
+      assert "expected a to be in t"
+      exists? instance tests.verbs.move.c.a
+      refute "expected a not to be in c"

data/test.gloo/verbs/put.test.gloo

@@ -2,18 +2,16 @@
 # Put verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    put [can] :
+tests.verbs.put [can] :
 
-      s [string] : abc
+  s [string] : abc
 
-      put_into [test] :
-        description [string] : Assign a value.
-        on_test [script] :
-          eval ^^.s = 'abc'
-          assert 'initial value is abc'
+  put_into [test] :
+    description [string] : Assign a value.
+    on_test [script] :
+      eval ^^.s = 'abc'
+      assert 'initial value is abc'
 
-          put 'xyz' into ^^.s
-          eval it = ^^.s
-          assert "expected it to be 'xyz'"
+      put 'xyz' into ^^.s
+      eval it = ^^.s
+      assert "expected it to be 'xyz'"

data/test.gloo/verbs/reload.test.gloo

@@ -0,0 +1,55 @@
+#
+# Reload message tests -- 'tell {obj} to reload' re-reads the file.
+#
+# The bare 'reload' verb restarts the engine (covered by the unit
+# tests). These exercise per-object reload against a /tmp scratch file
+# that gets rewritten between load and reload.
+#
+
+tests.verbs.reload [can] :
+
+  f [file] : /tmp/gloo_reload_test.gloo
+  v1 [text] : BEGIN
+demo [container] :
+  msg [string] : original
+END
+
+  v2 [text] : BEGIN
+demo [container] :
+  msg [string] : edited outside gloo
+  added [string] : brand new
+END
+
+  reload_picks_up_an_external_change [test] :
+    description [string] : editing the file on disk then reloading takes effect.
+    on_test [script] :
+      tell ^^.f to write ( ^^.v1 )
+      load /tmp/gloo_reload_test.gloo
+      eval demo.msg = 'original'
+      assert "sanity: loaded the first version"
+
+      tell ^^.f to write ( ^^.v2 )
+      tell demo to reload
+
+      eval demo.msg = 'edited outside gloo'
+      assert "reload should pick up the changed value"
+      eval demo.added = 'brand new'
+      assert "reload should pick up a newly added child"
+
+      tell demo to unload
+      tell ^^.f to delete
+
+  reload_discards_an_in_memory_edit [test] :
+    description [string] : an unsaved change is thrown away by reload.
+    on_test [script] :
+      tell ^^.f to write ( ^^.v1 )
+      load /tmp/gloo_reload_test.gloo
+
+      put 'not saved' into demo.msg
+      tell demo to reload
+
+      eval demo.msg = 'original'
+      assert "reload should restore the on-disk value"
+
+      tell demo to unload
+      tell ^^.f to delete

data/test.gloo/verbs/run.test.gloo

@@ -2,15 +2,13 @@
 # Run verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    run [can] :
+tests.verbs.run [can] :
 
-      s [script] :
-        eval true
+  s [script] :
+    eval true
 
-      run [test] :
-        description [string] : Run a script.
-        on_test [script] :
-          run ^^.s
-          assert "expected it to be true"
+  run [test] :
+    description [string] : Run a script.
+    on_test [script] :
+      run ^^.s
+      assert "expected it to be true"

data/test.gloo/verbs/save.test.gloo

@@ -0,0 +1,111 @@
+#
+# Save verb tests -- real load -> edit -> save round trips.
+#
+# Each test writes a .gloo fixture to /tmp, loads it, does something,
+# saves, reads the file back, and asserts on the raw text. Every test
+# unloads its object and deletes its scratch file at the end so the
+# next one starts clean.
+#
+
+tests.verbs.save [can] :
+
+  f [file] : /tmp/gloo_save_test.gloo
+  g [file] : /tmp/gloo_save_test_2.gloo
+  to_target [file] : /tmp/gloo_save_test_to.gloo
+  out [string] :
+  err [bool] : false
+
+  on_error [script] :
+    put true into ^.err
+
+  #
+  # The fixture used by most tests: two comments, a changed-in-place
+  # value, and an untouched sibling.
+  #
+  fixture [text] : BEGIN
+#
+# a comment above demo
+#
+demo [container] :
+  msg [string] : hello
+  # a comment above other
+  other [string] : world
+END
+
+  round_trip_preserves_comments_and_untouched_lines [test] :
+    description [string] : load, change one value, save -- comments and the untouched sibling survive.
+    on_test [script] :
+      put false into ^^.err
+      tell ^^.f to write ( ^^.fixture )
+      load /tmp/gloo_save_test.gloo
+      put 'changed' into demo.msg
+      save demo
+      eval ^^.err = false
+      assert "save should not error"
+      tell ^^.f to read ( ^^.out )
+      check ^^.out for substring? ( "# a comment above demo" )
+      assert "the leading comment block should survive"
+      check ^^.out for substring? ( "# a comment above other" )
+      assert "the inner comment should survive"
+      check ^^.out for substring? ( "msg [string] : changed" )
+      assert "the changed value should be written"
+      check ^^.out for substring? ( "other [string] : world" )
+      assert "the untouched sibling should be unchanged"
+      tell demo to unload
+      tell ^^.f to delete
+
+  unchanged_file_round_trips_byte_for_byte [test] :
+    description [string] : load then save with no change reproduces the file exactly.
+    on_test [script] :
+      tell ^^.f to write ( ^^.fixture )
+      load /tmp/gloo_save_test.gloo
+      save demo
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.fixture
+      assert "an unchanged save should reproduce the original text"
+      tell demo to unload
+      tell ^^.f to delete
+
+  deleting_an_object_drops_its_line [test] :
+    description [string] : removing a child and saving drops just that declaration.
+    on_test [script] :
+      tell ^^.f to write ( ^^.fixture )
+      load /tmp/gloo_save_test.gloo
+      tell demo.other to unload
+      save demo
+      tell ^^.f to read ( ^^.out )
+      check ^^.out for substring? ( "msg [string] : hello" )
+      assert "the kept sibling should still be there"
+      check ^^.out for substring? ( "other [string]" )
+      refute "the removed child's line should be gone"
+      tell demo to unload
+      tell ^^.f to delete
+
+  save_to_a_new_path_creates_the_file [test] :
+    description [string] : save {obj} to {path} writes a new file and registers it.
+    on_test [script] :
+      tell ^^.f to write ( ^^.fixture )
+      load /tmp/gloo_save_test.gloo
+      save demo to /tmp/gloo_save_test_to
+      check ^^.to_target for exists?
+      assert "save ... to should create the target file"
+      tell ^^.to_target to read ( ^^.out )
+      check ^^.out for substring? ( "msg [string] : hello" )
+      assert "the new file should hold the object"
+      tell demo to unload
+      tell ^^.f to delete
+      tell ^^.to_target to delete
+
+  reload_discards_unsaved_changes [test] :
+    description [string] : reload throws away edits that were not saved.
+    on_test [script] :
+      tell ^^.f to write ( ^^.fixture )
+      load /tmp/gloo_save_test.gloo
+      put 'not saved' into demo.msg
+      eval demo.msg = 'not saved'
+      assert "sanity: the edit landed"
+      tell demo to reload
+      eval demo.msg = 'hello'
+      assert "reload should restore the on-disk value"
+      tell demo to unload
+      tell ^^.f to delete

data/test.gloo/verbs/show.test.gloo

@@ -2,36 +2,34 @@
 # Show verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    show [can] :
+tests.verbs.show [can] :
 
-      msg [string] : hello
+  msg [string] : hello
 
-      show_literal [test] :
-        description [string] : Show a literal sets it to that literal.
-        on_test [script] :
-          show 'hello'
-          eval it = 'hello'
-          assert "expected it to be 'hello'"
+  show_literal [test] :
+    description [string] : Show a literal sets it to that literal.
+    on_test [script] :
+      show 'hello'
+      eval it = 'hello'
+      assert "expected it to be 'hello'"
 
-      show_object [test] :
-        description [string] : Show an object sets it to the object's value.
-        on_test [script] :
-          show ^^.msg
-          eval it = 'hello'
-          assert "expected it to be the value of msg"
+  show_object [test] :
+    description [string] : Show an object sets it to the object's value.
+    on_test [script] :
+      show ^^.msg
+      eval it = 'hello'
+      assert "expected it to be the value of msg"
 
-      show_expression [test] :
-        description [string] : Show evaluates an expression before showing it.
-        on_test [script] :
-          show 3 + 4
-          eval it = 7
-          assert "expected it to be 7"
+  show_expression [test] :
+    description [string] : Show evaluates an expression before showing it.
+    on_test [script] :
+      show 3 + 4
+      eval it = 7
+      assert "expected it to be 7"
 
-      show_concat [test] :
-        description [string] : Show evaluates a string concatenation.
-        on_test [script] :
-          show 'a' + 'b'
-          eval it = 'ab'
-          assert "expected it to be 'ab'"
+  show_concat [test] :
+    description [string] : Show evaluates a string concatenation.
+    on_test [script] :
+      show 'a' + 'b'
+      eval it = 'ab'
+      assert "expected it to be 'ab'"

data/test.gloo/verbs/tell.test.gloo

@@ -2,15 +2,13 @@
 # Tell verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    tell [can] :
+tests.verbs.tell [can] :
 
-      s [string] : abc123d
+  s [string] : abc123d
 
-      tell [test] :
-        description [string] : Tell verb sets value to it
-        on_test [script] :
-          tell ^^.s to count_chars
-          eval it = 7
-          assert "expected it to be 7"
+  tell [test] :
+    description [string] : Tell verb sets value to it
+    on_test [script] :
+      tell ^^.s to count_chars
+      eval it = 7
+      assert "expected it to be 7"

data/test.gloo/verbs/throw.test.gloo

@@ -9,36 +9,34 @@
 # the console by design.
 #
 
-tests [can] :
-  verbs [can] :
-    throw [can] :
-
-      on_exception [script] :
-        put ^.exception_data.message into ^.caught
-
-      exception_data [can] :
-        message [string] :
-        backtrace [string] :
-
-      caught [string] :
-
-      default_message [test] :
-        description [string] : bare throw uses the default message and execution continues.
-        on_test [script] :
-          put '' into tests.verbs.throw.caught
-          eval false
-
-          throw
-          eval true
-          assert "expected execution to continue after a bare throw"
-
-          eval tests.verbs.throw.caught = 'Thrown by throw verb'
-          assert "expected the default thrown message"
-
-      custom_message [test] :
-        description [string] : throw evaluates its argument as the message.
-        on_test [script] :
-          put '' into tests.verbs.throw.caught
-          throw 'boom ' + '42'
-          eval tests.verbs.throw.caught = 'boom 42'
-          assert "expected the evaluated custom message"
+tests.verbs.throw [can] :
+
+  on_exception [script] :
+    put ^.exception_data.message into ^.caught
+
+  exception_data [can] :
+    message [string] :
+    backtrace [string] :
+
+  caught [string] :
+
+  default_message [test] :
+    description [string] : bare throw uses the default message and execution continues.
+    on_test [script] :
+      put '' into tests.verbs.throw.caught
+      eval false
+
+      throw
+      eval true
+      assert "expected execution to continue after a bare throw"
+
+      eval tests.verbs.throw.caught = 'Thrown by throw verb'
+      assert "expected the default thrown message"
+
+  custom_message [test] :
+    description [string] : throw evaluates its argument as the message.
+    on_test [script] :
+      put '' into tests.verbs.throw.caught
+      throw 'boom ' + '42'
+      eval tests.verbs.throw.caught = 'boom 42'
+      assert "expected the evaluated custom message"

data/test.gloo/verbs/unless.test.gloo

@@ -2,21 +2,19 @@
 # Unless verb tests
 #
 
-tests [can] :
-  verbs [can] :
-    unless [can] :
+tests.verbs.unless [can] :
 
-      b [bool] : false
+  b [bool] : false
 
-      unless_false [test] :
-        description [string] : Unless false, do block runs.
-        on_test [script] :
-          unless ^^.b do eval true
-          assert "expected do block to run when condition is false"
+  unless_false [test] :
+    description [string] : Unless false, do block runs.
+    on_test [script] :
+      unless ^^.b do eval true
+      assert "expected do block to run when condition is false"
 
-      unless_true [test] :
-        description [string] : Unless true, do block is skipped.
-        on_test [script] :
-          eval false
-          unless true do eval true
-          refute "expected do block to be skipped when condition is true"
+  unless_true [test] :
+    description [string] : Unless true, do block is skipped.
+    on_test [script] :
+      eval false
+      unless true do eval true
+      refute "expected do block to be skipped when condition is true"

data/test.gloo/verbs/unload.test.gloo

@@ -5,17 +5,15 @@
 # unit tests). Per-object unload is the 'unload' message, tested here.
 #
 
-tests [can] :
-  verbs [can] :
-    unload [can] :
+tests.verbs.unload [can] :
 
-      unload_removes_object [test] :
-        description [string] : sending 'unload' to an object removes it from the tree.
-        on_test [script] :
-          create tests.verbs.unload.temp as string : 'x'
-          exists? instance tests.verbs.unload.temp
-          assert "temp should exist after create"
+  unload_removes_object [test] :
+    description [string] : sending 'unload' to an object removes it from the tree.
+    on_test [script] :
+      create tests.verbs.unload.temp as string : 'x'
+      exists? instance tests.verbs.unload.temp
+      assert "temp should exist after create"
 
-          tell tests.verbs.unload.temp to unload
-          exists? instance tests.verbs.unload.temp
-          refute "temp should be gone after unload"
+      tell tests.verbs.unload.temp to unload
+      exists? instance tests.verbs.unload.temp
+      refute "temp should be gone after unload"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Eric Crane
@@ -384,12 +384,22 @@ files:
 - lib/gloo/objs/web/http_post.rb
 - lib/gloo/objs/web/json.rb
 - lib/gloo/objs/web/uri.rb
+- lib/gloo/persist/comment_buffer.rb
+- lib/gloo/persist/declaration_ledger.rb
 - lib/gloo/persist/disc_mech.rb
 - lib/gloo/persist/file_loader.rb
 - lib/gloo/persist/file_saver.rb
 - lib/gloo/persist/file_storage.rb
+- lib/gloo/persist/indent_stack.rb
 - lib/gloo/persist/line_splitter.rb
 - lib/gloo/persist/persist_man.rb
+- lib/gloo/persist/script_body_collector.rb
+- lib/gloo/persist/shorthand_expander.rb
+- lib/gloo/persist/source/blank_node.rb
+- lib/gloo/persist/source/comment_node.rb
+- lib/gloo/persist/source/directive_node.rb
+- lib/gloo/persist/source/obj_node.rb
+- lib/gloo/persist/source/source_doc.rb
 - lib/gloo/plugin/base.rb
 - lib/gloo/plugin/callback.rb
 - lib/gloo/plugin/ext_manager.rb
@@ -443,6 +453,7 @@ files:
 - test.gloo/lang/load_lib_directive.test.gloo
 - test.gloo/lang/naming.test.gloo
 - test.gloo/lang/ops.test.gloo
+- test.gloo/lang/shorthand.test.gloo
 - test.gloo/math/add.test.gloo
 - test.gloo/math/div.test.gloo
 - test.gloo/math/mult.test.gloo
@@ -481,7 +492,9 @@ files:
 - test.gloo/verbs/log.test.gloo
 - test.gloo/verbs/move.test.gloo
 - test.gloo/verbs/put.test.gloo
+- test.gloo/verbs/reload.test.gloo
 - test.gloo/verbs/run.test.gloo
+- test.gloo/verbs/save.test.gloo
 - test.gloo/verbs/show.test.gloo
 - test.gloo/verbs/tell.test.gloo
 - test.gloo/verbs/throw.test.gloo