ruby-json-toon 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239c3f74f2d761583b30c69d05882a1072d02c423b84446bbae9e7d241b09a2b
-  data.tar.gz: 4a9b92b5663e92fa1f99d3f61f9b80be0ad2b0fef1a5ebf16564573b3338e7b7
+  metadata.gz: e84a5a72ebd25a0ce5a32c395a1bdc881768e0f7ca153fc7aa8d082b05964731
+  data.tar.gz: 95ced809c09555d02369300a0fcfdbf7998c22ca39dbaec4f8bb0e787c2969c6
 SHA512:
-  metadata.gz: c54ca35838a6697763813f709ee382162d5efdefae022ed00cba6849a63f3135e06af366b217552ea2c6a941941db82cf0069fe03a960f178ff7130fff8f470e
-  data.tar.gz: ed409049fb431d60f786edc49ace9dd827429f59b67f01e0b08c238e8cc2619cb1b704dbea26888e392a48e8894d2bb8e1e41ed7ef2c938460908cfd34e79591
+  metadata.gz: 06e08a7eccb8b565901c3c0c9e07718d742d4709a37cffc2513f7d0f7b0094065c10b0788275d7e82aa6ef5ea477ae756a93cf1b2b07483202612c31d4a066f3
+  data.tar.gz: 57170a59a1b8dd083b88df2fd5e29921c6ab179ba49264c64685d100232d82a33851ba0665d9a09c3f14e11f96a65cf749952537adea5c03b413e54fba8dcc03

data/CHANGELOG.md

@@ -30,5 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added decoder implementation
 - Added ability to seperately require decoder using: require "toon_to_json"
 
+## [1.0.0] - Complete JSON to TOON roundtrip conversion
 ### Added
-- Initial release
+- RubyJsonToon wrapper to encapsulate all logic
+- Simple 2 method implementation
+- Fixed known issues

data/lib/json_to_toon/encoder.rb

@@ -253,24 +253,42 @@ module JsonToToon
     end
 
     # COMPLEX: Handle list item where first field is an array
+    # Implementation: Handle list item where first field is an array
     def encode_list_item_with_array_first(item, depth)
-      # This is a complex edge case from the spec
-      # TODO: Implement proper handling per spec
       keys = item.keys
       first_key = keys.first
+      first_val = item[first_key]
 
       base_indent = indent(depth)
       hyphen_line = "#{base_indent}- "
       field_indent = "#{base_indent}  "
 
-      formatted_key = format_key(first_key)
-      emit_line("#{hyphen_line}#{formatted_key}:")
-      encode_value(item[first_key], depth + 1, nil)
+      # Create the compact header: tags[2]:
+      length_str = "#{length_prefix}#{first_val.length}"
+      marker = delimiter_marker
+      array_header = "#{format_key(first_key)}[#{length_str}#{marker}]:"
+
+      # JOIN the values on the same line as the hyphen
+      if all_primitives?(first_val)
+        values_str = first_val.map { |v| format_value(v) }.join(@delimiter)
+        emit_line("#{hyphen_line}#{array_header} #{values_str}")
+      else
+        # Fallback for complex arrays (keep as is)
+        emit_line("#{hyphen_line}#{array_header}")
+        first_val.each { |sub| encode_list_item(sub, depth + 1) }
+      end
 
+      # Encode remaining fields (id, etc.)
       keys[1..].each do |k|
+        v = item[k]
         fk = format_key(k)
-        fv = format_value(item[k])
-        emit_line("#{field_indent}#{fk}: #{fv}")
+        # NOTE: Use field_indent to align with the start of the keys
+        if primitive?(v)
+          emit_line("#{field_indent}#{fk}: #{format_value(v)}")
+        else
+          emit_line("#{field_indent}#{fk}:")
+          encode_value(v, depth + 1)
+        end
       end
     end
 

data/lib/json_to_toon.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'json_to_toon/version'
 require_relative 'json_to_toon/encoder'
 
 module JsonToToon

data/lib/ruby_json_toon/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RubyJsonToon
+  VERSION = '1.0.0'
+end

data/lib/ruby_json_toon.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'ruby_json_toon/version'
+require_relative 'json_to_toon'
+require_relative 'toon_to_json'
+
+module RubyJsonToon
+  def self.encode(value, options = {})
+    JsonToToon.encode(value, options)
+  end
+
+  def self.decode(toon_string)
+    ToonToJson.decode(toon_string)
+  end
+end

data/lib/toon_to_json/decoder.rb

@@ -12,15 +12,9 @@ module ToonToJson
       if lines.length == 1
         line = lines.first.strip
 
-        # Check if it's a primitive (not a TOON structure)
-        # TOON structures have:
-        # - Colons (key:value or key:)
-        # - List items (starts with "- " - note the space!)
-        # - Array headers (starts with [)
-
         is_structure = line.include?(':') ||
-                       line.match?(/\A-\s/) ||  # "- " with space (list item)
-                       line.match?(/\A\[/)      # Array header
+                       line.match?(/\A-\s/) ||
+                       line.match?(/\A\[/)
 
         return primitive_to_json(line) unless is_structure
       end
@@ -54,19 +48,16 @@ module ToonToJson
     def parse_block(min_indent)
       return parse_object_block(min_indent) if @i >= @lines.length
 
-      # Check if first line is array header
       first_line = @lines[@i][:text]
       if first_line.match?(/\A\[/)
         array_header = parse_array_header(first_line)
         if array_header && array_header[:key].nil?
-          # Root-level array
           @i += 1
           parse_array_body(array_header, @lines[@i - 1][:indent] + @indent_unit)
           return
         end
       end
 
-      # Check if list format (starts with "- " with space)
       start_i = @i
       while start_i < @lines.length
         ln = @lines[start_i]
@@ -92,7 +83,6 @@ module ToonToJson
         break if ln[:raw].strip.empty?
         break if ln[:indent] < min_indent
 
-        # Array header
         if (array_header = parse_array_header(ln[:text]))
           @output << ',' unless first
           first = false
@@ -109,7 +99,6 @@ module ToonToJson
           next
         end
 
-        # Key-value pair
         if (kv = parse_key_value_line(ln[:text]))
           @output << ',' unless first
           first = false
@@ -121,7 +110,6 @@ module ToonToJson
           next
         end
 
-        # Key-only (nested object)
         if (key = parse_key_only(ln[:text]))
           @output << ',' unless first
           first = false
@@ -158,7 +146,6 @@ module ToonToJson
     def parse_array_body(header, child_indent)
       @output << '['
 
-      # Inline values
       if header[:inline] && !header[:inline].strip.empty?
         delim = detect_delimiter(header[:marker], header[:fields])
         values = split_with_quotes(header[:inline], delim)
@@ -172,7 +159,6 @@ module ToonToJson
         return
       end
 
-      # Tabular format
       if header[:fields]
         delim = detect_delimiter(header[:marker], header[:fields])
         fields = split_with_quotes(header[:fields], delim)
@@ -213,7 +199,6 @@ module ToonToJson
         end
       end
 
-      # List format - parse items directly
       if @i < @lines.length && @lines[@i][:indent] >= child_indent &&
          @lines[@i][:text].match?(/\A-\s/)
         first = true
@@ -238,6 +223,73 @@ module ToonToJson
             next
           end
 
+          # FIXED: Check if it's an array header first (like "access[2]: read,write")
+          if (inline_array = parse_array_header(after))
+            @output << '{'
+            @output << json_string(inline_array[:key])
+            @output << ':'
+
+            # Parse the inline array directly
+            @output << '['
+            if inline_array[:inline] && !inline_array[:inline].strip.empty?
+              delim = detect_delimiter(inline_array[:marker], inline_array[:fields])
+              values = split_with_quotes(inline_array[:inline], delim)
+              values.each_with_index do |v, idx|
+                @output << ',' if idx > 0
+                @output << value_to_json(v.strip)
+              end
+            end
+            @output << ']'
+
+            @i += 1
+
+            # Handle remaining fields
+            if @i < @lines.length && @lines[@i][:indent] > ln[:indent]
+              child_ind = @lines[@i][:indent]
+
+              while @i < @lines.length && @lines[@i][:indent] >= child_ind
+                field_ln = @lines[@i]
+                break if field_ln[:text].match?(/\A-\s/)
+
+                # Check if field is an array header
+                if (field_array = parse_array_header(field_ln[:text]))
+                  @output << ','
+                  @output << json_string(field_array[:key])
+                  @output << ':'
+
+                  @output << '['
+                  if field_array[:inline] && !field_array[:inline].strip.empty?
+                    delim = detect_delimiter(field_array[:marker], field_array[:fields])
+                    vals = split_with_quotes(field_array[:inline], delim)
+                    vals.each_with_index do |v, idx|
+                      @output << ',' if idx > 0
+                      @output << value_to_json(v.strip)
+                    end
+                  end
+                  @output << ']'
+                  @i += 1
+                elsif field_kv = parse_key_value_line(field_ln[:text])
+                  @output << ','
+                  @output << json_string(field_kv[:key])
+                  @output << ':'
+                  @output << field_kv[:value]
+                  @i += 1
+                elsif field_key = parse_key_only(field_ln[:text])
+                  @output << ','
+                  @output << json_string(field_key)
+                  @output << ':'
+                  @i += 1
+                  parse_block(field_ln[:indent] + @indent_unit)
+                else
+                  break
+                end
+              end
+            end
+
+            @output << '}'
+            next
+          end
+
           if (kv = parse_key_value_line(after))
             @output << '{'
             @output << json_string(kv[:key])
@@ -253,7 +305,24 @@ module ToonToJson
                 field_ln = @lines[@i]
                 break if field_ln[:text].match?(/\A-\s/)
 
-                if field_kv = parse_key_value_line(field_ln[:text])
+                # FIXED: Check if field is an array header
+                if (field_array = parse_array_header(field_ln[:text]))
+                  @output << ','
+                  @output << json_string(field_array[:key])
+                  @output << ':'
+
+                  @output << '['
+                  if field_array[:inline] && !field_array[:inline].strip.empty?
+                    delim = detect_delimiter(field_array[:marker], field_array[:fields])
+                    vals = split_with_quotes(field_array[:inline], delim)
+                    vals.each_with_index do |v, idx|
+                      @output << ',' if idx > 0
+                      @output << value_to_json(v.strip)
+                    end
+                  end
+                  @output << ']'
+                  @i += 1
+                elsif field_kv = parse_key_value_line(field_ln[:text])
                   @output << ','
                   @output << json_string(field_kv[:key])
                   @output << ':'
@@ -301,7 +370,6 @@ module ToonToJson
         return
       end
 
-      # Empty array
       @output << ']'
     end
 
@@ -313,7 +381,7 @@ module ToonToJson
         break if child_text.strip.empty?
 
         child_header = parse_array_header(child_text)
-        break unless child_header && child_header[:key].nil? # Must be headerless array
+        break unless child_header && child_header[:key].nil?
 
         @output << ',' unless first_item
         first_item = false
@@ -442,7 +510,6 @@ module ToonToJson
       return 'false' if t.casecmp('false').zero?
       return 'null' if t.casecmp('null').zero?
 
-      # Numbers
       return t if t.match?(/\A-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?\z/)
 
       json_string(t)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-json-toon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jitendra Neema
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-09 00:00:00.000000000 Z
+date: 2026-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -121,10 +121,10 @@ files:
 - README.md
 - lib/json_to_toon.rb
 - lib/json_to_toon/encoder.rb
-- lib/json_to_toon/version.rb
+- lib/ruby_json_toon.rb
+- lib/ruby_json_toon/version.rb
 - lib/toon_to_json.rb
 - lib/toon_to_json/decoder.rb
-- lib/toon_to_json/version.rb
 homepage: https://github.com/jitendra-neema/ruby-json-toon
 licenses:
 - MIT

data/lib/json_to_toon/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module JsonToToon
-  VERSION = '0.3.0'
-end

data/lib/toon_to_json/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module ToonToJson
-  VERSION = '0.3.0'
-end