nestedtext 4.0.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 195cf273687c9cf4af35eaea661eef6086bdb8b1f47578092e7473a4cb56a418
-  data.tar.gz: 32ca43c2433eea7065cd56e2809c85accd1165a3bf734e5ba0525fe3a256f56a
+  metadata.gz: 56edadbc6c19a780acc64f2dc5e7b433a7a5086b9c2ff5d19837d18fa84ef1cb
+  data.tar.gz: 0b65feaf1d2cd866c1700c19bf2329c4c0a01db97b48c7c3b18dd91ae1620969
 SHA512:
-  metadata.gz: 8869b326141ccf9e56653bade9795f5a110f45d628df8eb1c372763a7cf5bfe7cb8a1077ff0fb36e5b0ec466f5f9f286fe877e1aaf1a4af3271c4ce5f8f718ed
-  data.tar.gz: ac63098b99b0d5d4f2060ecae53d8f325ca64af240e7250e07f3757088d7aee9ef81f495f8b4969b7a139f373b2c77d8c0711d947421ef41075f6671b2d9c453
+  metadata.gz: fa67ebde8e33b4e254f1ca484046113971141bb2fcd10e7b64aeb03cd4dab0912acfc465c521bf9a5647483536c478cc754c0602f79bf9a156c870c9e7d2974e
+  data.tar.gz: 9527268ebfae6a0646ce7f22f9af6f30bca4a70e8e65a233e94fd870054ebae374cc2a1aa58df4572d3128298ae8433fc8218633dcc2410665e8fd9ab895ff25

data/CHANGELOG.md

@@ -6,6 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.2.2] - 2022-02-12
+### Fixed
+- Better module documentation fix.
+
+## [4.2.1] - 2022-02-12
+### Fixed
+- Better module documentation.
+
+## [4.2.0] - 2022-02-08
+### Fixed
+- Proper Unicode character name lookup.
+
+## [4.1.1] - 2022-01-28
+### Fixed
+- Don't trigger CI when CD will run all tests anyways.
+
+## [4.1.0] - 2022-01-28
+### Changed
+- cd.yml now runs full tests before releasing new version, by using reusable workflows.
+
 ## [4.0.0] - 2022-01-28
 ### Changed
 - **Breaking change**: Renamed `NTEncodeMixin` to `ToNTMixin`.

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/nestedtext?color=brightgreen&type=total&label=gem%20downloads)](https://rubygems.org/gems/nestedtext)
 [![Documentation](https://img.shields.io/badge/docs-API-informational?logo=readthedocs&logoColor=violet)](https://www.rubydoc.info/gems/nestedtext/NestedText)
 [![Data Format Version Supported](https://img.shields.io/badge/%F0%9F%84%BD%F0%9F%85%83%20Version%20Supported-3.2.1-blueviolet)](https://nestedtext.org/en/v3.2/)
-[![Official Tests](https://img.shields.io/badge/Official%20Tests-Passing-success?logo=cachet)](https://github.com/KenKundert/nestedtext_tests/tree/585e95a73d94ac1f48e71a154e2db0ab67cf30fa)
+[![Official Tests](https://img.shields.io/badge/Official%20Tests-Passing-success?logo=cachet)](https://github.com/KenKundert/nestedtext_tests/)
 [![GitHub Actions: Continuous Integration](https://github.com/erikw/nestedtext-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/erikw/nestedtext-ruby/actions/workflows/ci.yml)
 [![GitHub Actions: Continuous Deployment](https://github.com/erikw/nestedtext-ruby/actions/workflows/cd.yml/badge.svg)](https://github.com/erikw/nestedtext-ruby/actions/workflows/cd.yml)
 [![GitHub Actions: CodeQL Analysis](https://github.com/erikw/nestedtext-ruby/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/erikw/nestedtext-ruby/actions/workflows/codeql-analysis.yml)
@@ -23,6 +23,8 @@ Provided is support for decoding a NestedText file or string to Ruby data struct
 
 This library is inspired Ruby stdlib modules `JSON` and `YAML` as well as the Python [reference implementation](https://github.com/KenKundert/nestedtext) of NestedText. Parsing is done with a LL(1) recursive descent parser and dumping with a recursive DFS traversal of the object references.
 
+To make this library practically useful, you should pair it with a [schema validator](#schema).
+
 # What is NestedText?
 Citing from the official [introduction](https://nestedtext.org/en/latest/index.html) page:
 > NestedText is a file format for holding structured data to be entered, edited, or viewed by people. It organizes the data into a nested collection of dictionaries, lists, and strings without the need for quoting or escaping. A unique feature of this file format is that it only supports one scalar type: strings.  While the decision to eschew integer, real, date, etc. types may seem counter intuitive, it leads to simpler data files and applications that are more robust.
@@ -72,14 +74,14 @@ obj1 = NestedText::load(ntstr)
 obj2 = NestedText::load_file("path/to/data.nt")
 ```
 
-The type of the returned object depends on the top level type in the NestedText data and will be of corresponding native Ruby type. In the example above, `obj1` will be an `Array` and obj2 will be `Hash` if `data.nt` looks like e.g.
+The type of the returned object depends on the top level type in the NestedText data and will be of corresponding native Ruby type. In the example above, `obj1` will be an `Array` and `obj2` will be `Hash` if `data.nt` looks like e.g.
 
 ```
 key1: value1
 key2: value2
 ```
 
-Thus you must know what you're parsing, or test what you decoded.
+Thus you must know what you're parsing, or test what you decoded after.
 
 ### Explicit Top Level Type
 If you already know what you expect to have, you can guarantee that this is what you will get by telling either function what the expected top type is. If not, an error will be raised.
@@ -144,7 +146,7 @@ Ruby | [NestedText](https://nestedtext.org/en/latest/basic_syntax.html)
 
 
 ### Strict Mode
-The strict mode determines how classes other than the basic types `String`, `Array` and `Hash` are handled during encoding and decoding. By **default** strict mode is turned **off**.
+The strict mode determines how classes other than the basic types `String`, `Array` and `Hash` are handled during encoding and decoding. By **default** strict mode is **false**.
 
 With `strict: true`
 Ruby | NestedText | Comment
@@ -159,7 +161,7 @@ Ruby | NestedText | Comment
 ---|---|---
 `nil`        | *Custom Class Encoding* | (1.)
 `Symbol`     | `String` |
-Custom Class | *Custom Class Encoding* | If the [Custom Class](#custom-classes-serialization) implements `#encode_nt_with` (2.)
+Custom Class | *Custom Class Encoding* | If the [Custom Class](#custom-classes-serialization) implements `#encode_nt_with`
 Other Class | String | `#to_s` will be called if there is no `#encode_nt_with`
 
 
@@ -172,7 +174,7 @@ Other Class | String | `#to_s` will be called if there is no `#encode_nt_with`
 ## Custom Classes Serialization
 This library has support for serialization/deserialization of custom classes as well. This is done by letting the objects tell NestedText what data should be used to represent the object instance with the `#encode_nt_with` method (inspired by `YAML`'s `#encode_with` method). All objects being recursively referenced from a root object being serialized must either implement this method or be one of the core supported NestedText data types from the table above.
 
-A class implementing `#encode_nt_with` is referred to as `Custom Class` in this document.
+A class implementing `#encode_nt_with` is referred to as a `Custom Class` in this document.
 
 ```ruby
 class Apple
@@ -245,6 +247,66 @@ Apple.new("granny smith", 12).to_nt
 
 See [encode_custom_classes_test.rb](test/nestedtext/encode_custom_classes_test.rb) for more real working examples.
 
+# Schema
+The point of NestedText is to not get in to business of supporting ambiguous types. That's why all values are simple strings. Having only simple strings is not useful in practice though. This is why NestedText is intended to be paired with a [Schema Validator](https://nestedtext.org/en/latest/schemas.html)!
+
+A schema validator can:
+* assert that the parsed values are of the expected types
+* automatically convert them to Ruby class instances like Integer, Float, etc.
+
+The reference implementation in Python [lists](https://nestedtext.org/en/latest/examples.html) a few examples of Python validators. Here below is an example of how this Ruby implementation of NestedText can be paired it with [RSchema](https://github.com/tomdalling/rschema).
+
+## Example with RSchema
+The full and working example can be found at [erikw/nestedtext-ruby-test](https://github.com/erikw/nestedtext-ruby-test/blob/main/parse_validate.rb).
+
+Let's say that you have a program that should connect to a few servers. The list of servers should be stored in a configuration file. With NestedText, a `conf.nt` file could look like:
+```yaml
+-
+  name: global-service
+  ip: 192.167.1.1
+  port: 8080
+-
+  name: aux-service
+  ip: 17.245.14.2
+  port: 67
+  # Unstable server, don't use this
+  stable: false
+```
+
+After parsing this file with this NestedText library, the values for all keys will be string. But to make practical use of this, we would of course like the values for the `port` keys to be `Integer`, and `stable` should have a value of either `true` or `false`. RSchema can do this conversion for us!
+
+
+```ruby
+# Define schema for our list of servers
+schema = RSchema.define do
+  array(
+    hash(
+      'name' => _String,
+      'ip' => _String,
+      'port' => _Integer,
+      optional('stable') => boolean
+    )
+  )
+end
+
+# The coercer will automatially convert types
+coercer = RSchema::CoercionWrapper::RACK_PARAMS.wrap(schema)
+
+# Parse config file with NestedText
+data = NestedText.load_file('conf.nt')
+
+# Validate
+result = coercer.validate(data)
+raise result.error.to_s unless result.valid?
+
+# Now we have validated data of the right type specified in the schema!
+servers = result.value
+
+# Let's use the values for something in our app
+stable_servers = servers.select { |server| server['stable'] }
+# Not a meaningful sum - just demonstrating that 'port' values are integers and not strings anymore!
+port_sum = servers.map { |server| server['port'] }.sum
+```
 
 # Installation
 1. Add this gem to your ruby project's Gemfile

data/lib/nestedtext/errors_internal.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'word_wrap'
-require 'word_wrap/core_ext'
+# require 'word_wrap'
+# require 'word_wrap/core_ext'
+require 'unicode_utils'
 
 require 'nestedtext/constants'
 require 'nestedtext/error'
@@ -140,9 +141,10 @@ module NestedText
                   else
                     'invalid indentation.'
                   end
-        # Need to wrap like official tests. #wrap always add an extra \n we need to chop off.
-        message_wrapped = message.wrap(70).chop
-        super(line, ind_exp, message_wrapped)
+        # Official-tests kludge; Need to wrap like official tests. #wrap always add an extra \n we need to chop off.
+        # Seems not be needed anymore
+        # message_wrapped = message.wrap(70).chop
+        super(line, ind_exp, message)
       end
     end
 
@@ -162,14 +164,14 @@ module NestedText
 
     class ParseInvalidIndentationCharError < ParseError
       def initialize(line)
-        printable_char = line.content[0].dump.gsub(/"/, '')
+        char = line.content[0]
+        # Official-tests kludge; Translate rubys \u00 to python's unicodedata.name \x format.
+        printable_char = char.dump.gsub(/"/, '').gsub(/\\u0*/, '\x').downcase
 
-        # Looking for non-breaking space is just to be compatible with official tests.
         explanation = ''
-        if printable_char == '\\u00A0'
-          printable_char = '\\xa0'
-          explanation = ' (NO-BREAK SPACE)'
-        end
+        # Official-tests kludge; ASCII chars have printable names too,
+        # but they are not used in reference implementation.
+        explanation = " (#{UnicodeUtils.char_name(char)})" unless char.ord < 128
 
         message = "invalid character in indentation: '#{printable_char}'#{explanation}."
         super(line, line.indentation, message)
@@ -225,7 +227,7 @@ module NestedText
 
     class DumpUnsupportedTypeError < DumpError
       def initialize(obj, culprit)
-        # Needed to pass official test.
+        # Official-tests kludge; translate to Python names
         class_name = obj.is_a?(Integer) ? 'int' : obj.class.name
         super(culprit, "unsupported type (#{class_name}).")
       end

data/lib/nestedtext/version.rb

@@ -2,5 +2,5 @@
 
 module NestedText
   # The version of this library.
-  VERSION = '4.0.0'
+  VERSION = '4.2.2'
 end

data/lib/nestedtext.rb

@@ -7,9 +7,12 @@ require_relative 'nestedtext/encode_helpers'
 require_relative 'nestedtext/error'
 require_relative 'nestedtext/version'
 
-##
 # # NestedText
-# The main module in this library to use.
+# A ruby library for the human friendly data format NestedText (https://nestedtext.org/).
+#
+# Provided is support for decoding a NestedText file or string to Ruby data structures,
+# as well as encoding Ruby objects to a NestedText file or string. Furthermore there is
+# support for serialization and deserialization of custom classes.
 #
 # See {file:README.md} for documentation on Types, Strict Mode and Custom Classes.
 module NestedText

data/nestedtext.gemspec

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
-require_relative "lib/nestedtext/version"
+require_relative 'lib/nestedtext/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "nestedtext"
+  spec.name          = 'nestedtext'
   spec.version       = NestedText::VERSION
-  spec.authors       = ["Erik Westrup"]
-  spec.email         = ["erik.westrup@gmail.com"]
+  spec.authors       = ['Erik Westrup']
+  spec.email         = ['erik.westrup@gmail.com']
 
-  spec.summary       = "A ruby library for the human friendly data format NestedText (https://nestedtext.org/)"
-  spec.description   = "A ruby library for the human friendly data format NestedText (https://nestedtext.org/). There is support for decoding a NestedText file or string to Ruby data structures, as well as encoding Ruby objects to a NestedText file or string. Furthermore there is support for serialization and deserialization of custom classes. Support for v3.2.1 of the data format will all official tests passing."
-  spec.homepage      = "https://github.com/erikw/nestedtext-ruby/"
-  spec.license       = "MIT"
-  spec.required_ruby_version = [">= 3.0", "< 4"]
+  spec.summary       = 'A ruby library for the human friendly data format NestedText (https://nestedtext.org/)'
+  spec.description   = 'A ruby library for the human friendly data format NestedText (https://nestedtext.org/). There is support for decoding a NestedText file or string to Ruby data structures, as well as encoding Ruby objects to a NestedText file or string. Furthermore there is support for serialization and deserialization of custom classes. Support for v3.2.1 of the data format will all official tests passing.'
+  spec.homepage      = 'https://github.com/erikw/nestedtext-ruby/'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = ['>= 3.0', '< 4']
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/erikw/nestedtext-ruby/"
-  spec.metadata["changelog_uri"] = "https://github.com/erikw/nestedtext-ruby/blob/main/CHANGELOG.md"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/erikw/nestedtext-ruby/'
+  spec.metadata['changelog_uri'] = 'https://github.com/erikw/nestedtext-ruby/blob/main/CHANGELOG.md'
 
   # For push to GitHub packages to work.
   # Reference: https://github.community/t/unable-to-push-rubygem-to-package-registry-the-expected-resource-was-not-found/14596/7
   spec.metadata = {
-    "github_repo" => "git@github.com:erikw/nestedtext-ruby.git"
+    'github_repo' => 'git@github.com:erikw/nestedtext-ruby.git',
+    'rubygems_mfa_required' => 'true'
   }
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -29,8 +30,9 @@ Gem::Specification.new do |spec|
       f.match(%r{\A(?:lib/|CHANGELOG.md|CONTRIBUTING.md|LICENSE.txt|README.md|SECURITY.md|nestedtext.gemspec)})
     end
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "warning", "~> 1.2"
-  spec.add_runtime_dependency "word_wrap", "~> 1.0"
+  spec.add_runtime_dependency 'unicode_utils', '~> 1.4'
+  spec.add_runtime_dependency 'warning', '~> 1.2'
+  spec.add_runtime_dependency 'word_wrap', '~> 1.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nestedtext
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Erik Westrup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: warning
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +88,7 @@ licenses:
 - MIT
 metadata:
   github_repo: git@github.com:erikw/nestedtext-ruby.git
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: