gloo 7.1.3 → 7.2

data/test.gloo/lang/declaration.test.gloo

@@ -41,3 +41,39 @@ END
     on_test [script] :
       eval ^^.closed_then_colon = 8
       assert "expected the value 8"
+
+  # A fixture beside this file whose lines mix tabs and spaces, on one
+  # line and from line to line: a tab counts as two spaces.
+  mixed_indent_path [string] : /fixtures/mixed_indent.gloo
+  where [string] :
+
+  a_tab_and_spaces_on_one_line_add_up [test] :
+    description [string] : a tab plus two spaces is two levels deep, in either order.
+    on_test [script] :
+      check ^^ for source_dir
+      put it into ^^.where
+      load ( ^^.where ^^.mixed_indent_path )
+      tell mixed_indent_fixture.a to count
+      eval it = 2
+      assert "expected x and y under a"
+      eval mixed_indent_fixture.b = 3
+      assert "expected b beside a"
+      tell mixed_indent_fixture to unload
+
+  # Spaces just inside the brackets are allowed.
+  spaced_int [ int ] : 5
+  spaced_after [int ]: 6
+  spaced_text [text ] : BEGIN
+one
+END
+
+  spaces_inside_the_brackets_are_allowed [test] :
+    description [string] : a space just inside a type's brackets doesn't change the type.
+    on_test [script] :
+      eval ^^.spaced_int = 5
+      assert "expected [ int ] to be an integer 5"
+      eval ^^.spaced_after + 1 = 7
+      assert "expected [int ]: to be an integer 6"
+      check ^^.spaced_text for starts_with? ( 'one' )
+      assert "expected [text ] to read its block"
+

data/test.gloo/lang/fixtures/mixed_indent.gloo

@@ -0,0 +1,5 @@
+mixed_indent_fixture [can] :
+	a [can] :
+	  x [int] : 1
+  	y [int] : 2
+	b [int] : 3

data/test.gloo/lang/naming.test.gloo

@@ -4,9 +4,6 @@
 
 tests.lang.naming [can] :
 
-  dup [string] : first
-  dup [string] : second
-
   Alpha [string] : mixed case
 
   1 [string] : numeric name
@@ -18,9 +15,24 @@ tests.lang.naming [can] :
   # test so the syntax error it reports belongs to that test.
   nameless_file [file] :
 
+  # A fixture that declares one name twice, loaded inside its tests so
+  # the warning about the ignored value belongs to them.
+  dup_file [file] :
+
   # Scratch files live in the gloo tmp folder ($.gloo_tmp).
   on_load [script] :
     put $.gloo_tmp '/gloo_naming_test.gloo' into ^.nameless_file
+    put $.gloo_tmp '/gloo_naming_dup_test.gloo' into ^.dup_file
+
+  dup_src [text] : BEGIN
+dup_fixture [container] :
+  dup [string] : first
+  dup [string] : second
+  box [container] :
+    x [string] : ex
+  box [container] :
+    y [string] : why
+END
 
   nameless_src [text] : BEGIN
 naming_fixture [container] :
@@ -28,10 +40,36 @@ naming_fixture [container] :
 END
 
   first_of_a_duplicate_name_wins [test] :
-    description [string] : when two siblings share a name, the path always reaches the first.
+    description [string] : a second declaration of a name is the same object; the first value wins.
+    expect_errors [bool] : true
+    on_test [script] :
+      tell ^^.dup_file to write ( ^^.dup_src )
+      load ( ^^.dup_file )
+      eval dup_fixture.dup = 'first'
+      assert "expected the first value to win"
+
+      tell dup_fixture to count
+      eval it = 2
+      assert "expected one 'dup' and one 'box', not four objects"
+
+      tell dup_fixture to unload
+      tell ^^.dup_file to delete
+
+  a_container_declared_twice_merges [test] :
+    description [string] : a container declared twice is one container with the children of both.
+    expect_errors [bool] : true
     on_test [script] :
-      eval ^^.dup = 'first'
-      assert "expected the first 'dup' to be the one reached"
+      tell ^^.dup_file to write ( ^^.dup_src )
+      load ( ^^.dup_file )
+      tell dup_fixture.box to count
+      eval it = 2
+      assert "expected x and y in the one box"
+
+      eval dup_fixture.box.y = 'why'
+      assert "expected the second declaration's child to be there"
+
+      tell dup_fixture to unload
+      tell ^^.dup_file to delete
 
   path_lookup_is_case_insensitive [test] :
     description [string] : a pathname segment matches a name regardless of case.

data/test.gloo/verbs/fixtures/load_beside.gloo

@@ -0,0 +1,6 @@
+#
+# Loaded by load.test.gloo with a plain relative name, from the
+# folder beside that test file. Not a test file itself.
+#
+load_beside_demo [can] :
+  s [string] : beside

data/test.gloo/verbs/fixtures/lossless_text.gloo

@@ -0,0 +1,7 @@
+lossless_text [can] :
+  log [text] : BEGIN
+Started.
+END
+  entry [text] : BEGIN
+Saved.
+END

data/test.gloo/verbs/fixtures/lossless_text_saved.gloo

@@ -0,0 +1,9 @@
+lossless_text [can] :
+  log [text] : BEGIN
+Started.
+Saved.
+Saved.
+  END
+  entry [text] : BEGIN
+Saved.
+END

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

@@ -172,3 +172,21 @@ END
       assert "expected the full path without .gloo to load"
       tell computed_demo to unload
       tell ^^.computed_f to delete
+
+  # A relative name looks next to the loading file first; these scripts
+  # are declared in this file, so fixtures/ is the folder beside it.
+  load_a_file_beside_this_one [test] :
+    description [string] : A relative load finds a file next to the file the script came from.
+    on_test [script] :
+      load fixtures/load_beside
+      eval load_beside_demo.s = 'beside'
+      assert "expected fixtures/load_beside.gloo to load from beside this file"
+      tell load_beside_demo to unload
+
+  load_a_prefix_beside_this_one [test] :
+    description [string] : A relative wildcard with a file name prefix finds the files next to the loading file.
+    on_test [script] :
+      load fixtures/load_beside*
+      eval load_beside_demo.s = 'beside'
+      assert "expected fixtures/load_beside*.gloo to load from beside this file"
+      tell load_beside_demo to unload

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

@@ -16,3 +16,42 @@ tests.verbs.move [can] :
       assert "expected a to be in t"
       exists? instance tests.verbs.move.c.a
       refute "expected a not to be in c"
+
+  # A name is unique in its container: a move onto a taken name, or
+  # inside itself, is refused.
+  taken [container] :
+    a [string] : moving
+  dst [container] :
+    a [string] : already here
+  outer [container] :
+    inner [container] :
+  msg [string] :
+
+  on_error [script] :
+  error_data [can] :
+    message [string] :
+
+  moving_onto_a_taken_name_is_refused [test] :
+    description [string] : A move into a container with a child of the same name is an error; nothing moves.
+    expect_errors [bool] : true
+    on_test [script] :
+      move ^^.taken.a to ^^.dst
+      eval it = false
+      assert "expected it to be false"
+      eval ^^.dst.a = 'already here'
+      assert "expected the child already there to be untouched"
+      exists? instance ^^.taken.a
+      assert "expected the object not to have moved"
+      put ^^.error_data.message into ^^.msg
+      check ^^.msg for starts_with? ( 'Could not move' )
+      assert "expected a could-not-move error"
+
+  moving_inside_itself_is_refused [test] :
+    description [string] : A move into the object's own child is an error; nothing moves.
+    expect_errors [bool] : true
+    on_test [script] :
+      move ^^.outer to ^^.outer.inner
+      eval it = false
+      assert "expected it to be false"
+      exists? instance ^^.outer.inner
+      assert "expected outer to still be in place"

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

@@ -222,3 +222,242 @@ END
       assert "reload should restore the on-disk value"
       tell demo to unload
       tell ^^.f to delete
+
+  # -------------------------------------------------------------------
+  #   Lossless save (7.2): an untouched declaration is written back
+  #   exactly; a changed one changes only its own line.
+  # -------------------------------------------------------------------
+
+  body_fixture [text] : BEGIN
+lossless_body [can] :
+  n [int] : 0
+  s [script] :
+    put 1 into ^.n
+
+    # a comment inside the body
+    put ^.n + 1 into ^.n  # an inline comment
+    put ^.n + \
+      2 into ^.n
+  after [string] : after
+END
+
+  directive_fixture [text] : BEGIN
+#
+# A comment block above the directive.
+#
+load lib yaml
+
+lossless_lib [can] :
+  cfg [yaml] :
+END
+
+  untyped_fixture [text] : BEGIN
+lossless_untyped [can] :
+  plain : no type given
+END
+
+  untyped_changed [text] : BEGIN
+lossless_untyped [can] :
+  plain : changed
+END
+
+  same_name_fixture [text] : BEGIN
+lossless_same [can] :
+  a [string] : First A
+  a [string] : Second A
+END
+
+  same_name_changed [text] : BEGIN
+lossless_same [can] :
+  a [string] : Changed
+  a [string] : Second A
+END
+
+  shorthand_fixture [text] : BEGIN
+lossless_short [can] :
+  x [int] : 1
+
+lossless_short.b [can] :
+  y [int] : 2
+END
+
+  style_fixture [text] : BEGIN
+lossless_style [can] :
+  n [int] : 1
+END
+
+  style_changed [text] : BEGIN
+lossless_style [can] :
+  n [int] : 1
+  k [int] : 5
+END
+
+  # A text value's fixture has its own BEGIN/END blocks, so it can't be
+  # a text block here: it's a file beside this one.
+  text_fixture [file] :
+  text_saved [file] :
+  text_src [string] :
+  text_want [string] :
+  where [string] :
+
+  utf8_fixture [text] : BEGIN
+# Café — ünïcödé 🎉
+lossless_utf8 [can] :
+  greeting [string] : héllo wörld 👋
+END
+
+  untouched_script_body_round_trips [test] :
+    description [string] : blank lines, comments and a continuation in a script body survive a save.
+    on_test [script] :
+      tell ^^.f to write ( ^^.body_fixture )
+      load ( ^^.f )
+      tell lossless_body.s to run
+      eval lossless_body.n = 4
+      assert "sanity: the body ran, continuation and all"
+      put 0 into lossless_body.n
+      save lossless_body
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.body_fixture
+      assert "expected the body exactly as written"
+      tell lossless_body to unload
+      tell ^^.f to delete
+
+  directive_stays_below_its_comments [test] :
+    description [string] : a load lib directive stays where it was written.
+    on_test [script] :
+      tell ^^.f to write ( ^^.directive_fixture )
+      load ( ^^.f )
+      save lossless_lib
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.directive_fixture
+      assert "expected the directive below the comment block"
+      tell lossless_lib to unload
+      tell ^^.f to delete
+
+  untyped_stays_untyped [test] :
+    description [string] : an untyped declaration is saved without a type, changed or not.
+    on_test [script] :
+      tell ^^.f to write ( ^^.untyped_fixture )
+      load ( ^^.f )
+      save lossless_untyped
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.untyped_fixture
+      assert "expected the untouched declaration exactly as written"
+      put 'changed' into lossless_untyped.plain
+      save lossless_untyped
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.untyped_changed
+      assert "expected only the value to change"
+      tell lossless_untyped to unload
+      tell ^^.f to delete
+
+  an_edit_changes_only_the_first_same_name_line [test] :
+    description [string] : the first declaration holds the value; a later same-name line is kept as written.
+    expect_errors [bool] : true
+    on_test [script] :
+      tell ^^.f to write ( ^^.same_name_fixture )
+      load ( ^^.f )
+      put 'Changed' into lossless_same.a
+      save lossless_same
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.same_name_changed
+      assert "expected Second A to stay"
+      tell lossless_same to unload
+      tell ^^.f to delete
+
+  a_shorthand_child_is_written_once [test] :
+    description [string] : a container plus shorthand into it saves exactly as written.
+    on_test [script] :
+      tell ^^.f to write ( ^^.shorthand_fixture )
+      load ( ^^.f )
+      save lossless_short
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.shorthand_fixture
+      assert "expected the shorthand child not to be written again"
+      tell lossless_short to unload
+      tell ^^.f to delete
+
+  a_new_child_follows_the_files_style [test] :
+    description [string] : a new object is written with the file's indentation and type spelling.
+    on_test [script] :
+      tell ^^.f to write ( ^^.style_fixture )
+      load ( ^^.f )
+      create lossless_style.k as integer : 5
+      save lossless_style
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.style_changed
+      assert "expected two spaces and [int]"
+      tell lossless_style to unload
+      tell ^^.f to delete
+
+  appending_to_text_does_not_indent_it [test] :
+    description [string] : a changed text value is written exactly, so saving it twice adds nothing.
+    on_test [script] :
+      check ^^ for source_dir
+      put it into ^^.where
+      put ^^.where '/fixtures/lossless_text.gloo' into ^^.text_fixture
+      put ^^.where '/fixtures/lossless_text_saved.gloo' into ^^.text_saved
+      tell ^^.text_fixture to read ( ^^.text_src )
+      tell ^^.text_saved to read ( ^^.text_want )
+      tell ^^.f to write ( ^^.text_src )
+      load ( ^^.f )
+      put lossless_text.log + lossless_text.entry into lossless_text.log
+      save lossless_text
+      put lossless_text.log + lossless_text.entry into lossless_text.log
+      save lossless_text
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.text_want
+      assert "expected the lines with no added indentation"
+      tell lossless_text to unload
+      tell ^^.f to delete
+
+  utf8_round_trips [test] :
+    description [string] : non-ASCII text loads and saves exactly.
+    on_test [script] :
+      tell ^^.f to write ( ^^.utf8_fixture )
+      load ( ^^.f )
+      eval lossless_utf8.greeting = 'héllo wörld 👋'
+      assert "expected the value as written"
+      save lossless_utf8
+      tell ^^.f to read ( ^^.out )
+      eval ^^.out = ^^.utf8_fixture
+      assert "expected the file exactly as written"
+      tell lossless_utf8 to unload
+      tell ^^.f to delete
+
+
+  # -------------------------------------------------------------------
+  #   Where a new file saved with a relative name goes (7.2): next to
+  #   the saving script's file. These scripts are declared in this
+  #   file, so that's the folder this file is in.
+  # -------------------------------------------------------------------
+
+  beside_target [file] :
+
+  save_to_a_relative_name_beside_this_file [test] :
+    description [string] : save {obj} to {relative name} writes the file next to the file the script came from.
+    on_test [script] :
+      check ^^ for source_dir
+      put it '/fixtures/save_beside.gloo' into ^^.beside_target
+      create save_beside_demo as can
+      create save_beside_demo.s as string : beside
+      save save_beside_demo to fixtures/save_beside
+      check ^^.beside_target for exists?
+      assert "expected fixtures/save_beside.gloo beside this file"
+      tell ^^.beside_target to read ( ^^.out )
+      check ^^.out for substring? ( "s [string] : beside" )
+      assert "expected the saved object in the file"
+      tell save_beside_demo to unload
+      tell ^^.beside_target to delete
+
+  save_a_new_root_beside_this_file [test] :
+    description [string] : save of a top-level object with no file yet writes it next to the file the script came from.
+    on_test [script] :
+      check ^^ for source_dir
+      put it '/save_beside_root.gloo' into ^^.beside_target
+      create save_beside_root as can
+      save save_beside_root
+      check ^^.beside_target for exists?
+      assert "expected save_beside_root.gloo beside this file"
+      tell save_beside_root to unload
+      tell ^^.beside_target to delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: '7.2'
 platform: ruby
 authors:
 - Eric Crane
@@ -389,13 +389,16 @@ files:
 - lib/gloo/objs/web/json.rb
 - lib/gloo/objs/web/uri.rb
 - lib/gloo/persist/declaration_ledger.rb
+- lib/gloo/persist/declaration_writer.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/file_style.rb
 - lib/gloo/persist/indent_stack.rb
 - lib/gloo/persist/line_splitter.rb
 - lib/gloo/persist/persist_man.rb
+- lib/gloo/persist/save_index.rb
 - lib/gloo/persist/script_body_collector.rb
 - lib/gloo/persist/shorthand_expander.rb
 - lib/gloo/persist/source/blank_node.rb
@@ -443,7 +446,9 @@ files:
 - lib/gloo/verbs/wait.rb
 - lib/run.rb
 - test.gloo/app/embed.test.gloo
+- test.gloo/app/exit_status.test.gloo
 - test.gloo/app/fixtures/embed_harness.rb
+- test.gloo/app/fixtures/exit_after_error.gloo
 - test.gloo/basic.test.gloo
 - test.gloo/ctrl/each.test.gloo
 - test.gloo/dt/date.test.gloo
@@ -455,6 +460,7 @@ files:
 - test.gloo/lang/dt_comparisons.test.gloo
 - test.gloo/lang/exceptions.test.gloo
 - test.gloo/lang/failures.test.gloo
+- test.gloo/lang/fixtures/mixed_indent.gloo
 - test.gloo/lang/gloo_sys.test.gloo
 - test.gloo/lang/here.test.gloo
 - test.gloo/lang/it.test.gloo
@@ -495,6 +501,9 @@ files:
 - test.gloo/verbs/create.test.gloo
 - test.gloo/verbs/eval.test.gloo
 - test.gloo/verbs/exists.test.gloo
+- test.gloo/verbs/fixtures/load_beside.gloo
+- test.gloo/verbs/fixtures/lossless_text.gloo
+- test.gloo/verbs/fixtures/lossless_text_saved.gloo
 - test.gloo/verbs/if.test.gloo
 - test.gloo/verbs/invoke.test.gloo
 - test.gloo/verbs/list.test.gloo