tcepsni 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d6d7256e483e7259f7ca6a630969fdea2b00a94674130f33af6fc8992d50e1
-  data.tar.gz: a4c891f49b92e1fa79fc36759665357eb47e5de1fe774f6a9e4c6c1e904d2a89
+  metadata.gz: 3695b6a1a12979fa76824819d4f839ce4e3b9a2af040f97eca9e474609c5c1f2
+  data.tar.gz: 373da53b2e230d3510f2043f25b8ae7cf017fae689fdfbaa92a388be4155ebcd
 SHA512:
-  metadata.gz: 584b8d5ca524b82d8b1ff0e0ba04a8b76768c9ca64488699f2ad737bf337790c50fc9c938bdad75fe0630480b24c125bff80629e820e26a556c11d13e599463b
-  data.tar.gz: 678dd3a11bdcaacc47f7a26d545dd5b4466b2e1f471b4b8f233c23c816658c25bc01a1c0bae2b688eb411f68518718fe571863917bccc108b8fa51b230d6da3d
+  metadata.gz: f646aecf1094e4e171581b52ca0e48dccddc4464bf158f4c30b93e8df7ef7b8989b240e9c61abf25a7cb65c2c9a29ec6978529f627a1c360f0fede299624d297
+  data.tar.gz: 573e5e82c5c7a0b476ee93255fe6b6fc7992febcee911e54ee1b852c9acacca29950bc67183ec01cbed7c3cf3cfcce3edd21137f1c04400bff42959d6f1d72c8

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 ## Unreleased
 
+## 0.2.0 - 2023-10-20
+
+### Added
+
+- `Time` support
+- `Pathname` support
+- `Encoding` support
+- `IPAddr` support
+- `ActiveSupport::OrderedOptions` support
+- `Rails::Paths::Root` support
+- `Float` support
+
+### Fixed
+
+- Parsing the empty array
+- Parsing the object with some attributes
+- Parsing the `nil`, `true`, and `false` literals
+- Detecting `StringScanner`-like object
+
+## 0.1.1 - 2023-10-02
+
+### Changed
+
+- Object's memory reference attribute has changed to integer from string
+
+### Fixed
+
+- String scanner parser now supports string with quotes
+
 ## 0.1.0 - 2023-10-01
 
 - Initial release

data/lib/tcepsni/version.rb

@@ -1,3 +1,3 @@
 module Tcepsni
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/tcepsni.rb

@@ -1,4 +1,8 @@
 require 'strscan'
+require 'pathname'
+require 'ipaddr'
+require 'active_support/ordered_options'
+require 'rails/paths'
 require_relative 'tcepsni/version'
 
 module Tcepsni
@@ -12,32 +16,53 @@ module Tcepsni
   class << self
     private
 
+    # If it returned nil when failed, it collides with normal nil value.
     def parse_expression(scanner)
-      if (integer = scanner.scan(/\d+/))
-        Integer(integer)
-      elsif scanner.skip('nil')
+      if scanner.skip(/nil\b/)
         nil
-      elsif scanner.skip('true')
+      elsif scanner.skip(/true\b/)
         true
-      elsif scanner.skip('false')
+      elsif scanner.skip(/false\b/)
         false
-      elsif scanner.skip(/:(?<name>[A-Za-z_][A-Za-z0-9_]*)/)
-        scanner[:name].intern
+      elsif scanner.skip(':')
+        parse_identifier(scanner)
       elsif scanner.skip('"')
         parse_string(scanner)
       elsif scanner.skip('[')
         parse_array(scanner)
       elsif scanner.skip('{')
         parse_hash(scanner)
-      elsif (name = scanner.scan(/[A-Z][A-Za-z0-9_]*/))
-        parse_class(scanner, name: name.intern)
       elsif scanner.skip('#<')
         parse_object(scanner)
       else
-        raise Error, "invalid format: #{ scanner.inspect }"
+        if (digits = scanner.scan(/\d+/))
+          int = Integer(digits)
+          if scanner.skip('.')
+            int2 = parse_integer(scanner)
+            Float("#{int}.#{int2}")
+          elsif digits.size == 4 && scanner.skip(/-(?<month>[01]\d)-(?<day>\d\d) (?<hour>[012]\d):(?<minute>[0-5]\d):(?<second>[0-5]\d) (?<zone>[+-]\d\d\d\d)/)
+            Time.new(Integer(int), scanner[:month], scanner[:day],
+                     scanner[:hour], scanner[:minute], scanner[:second],
+                     scanner[:zone])
+          else
+            int
+          end
+        else
+          parse_class(scanner)
+        end
       end
     end
 
+    def parse_integer(scanner)
+      int = scanner.scan(/\d+/) or raise Error, 'no digits'
+      Integer(int)
+    end
+
+    def parse_identifier(scanner)
+      id = scanner.scan(/[A-Za-z_][A-Za-z0-9_]*/) or raise Error, 'no identifier'
+      id.intern
+    end
+
     def parse_string(scanner)
       result = ''
       until scanner.eos?
@@ -53,13 +78,12 @@ module Tcepsni
     end
 
     def parse_array(scanner)
-      result = [parse_expression(scanner)]
+      result = []
       until scanner.eos?
+        result << parse_expression(scanner) rescue break
         scanner.skip(', ') or break
-        scanner.eos? and raise Error, 'incomplete array'
-        result << parse_expression(scanner)
       end
-      scanner.skip(']') or raise Error, 'no array closer'
+      scanner.skip(']') or raise Error, "no array closer: #{scanner.inspect}"
       result
     end
 
@@ -76,42 +100,90 @@ module Tcepsni
       result
     end
 
-    def parse_class(scanner, name: nil)
-      unless name
-        name = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, 'no class name'
-        name = name.intern
-      end
-      namespaces = [name]
+    def parse_class(scanner)
+      namespaces = [parse_capitalized_identifier(scanner)]
       until scanner.eos?
         scanner.skip('::') or break
         scanner.eos? and raise Error, 'incomplete class'
-        namespace = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, 'no namespace'
-        namespaces << namespace.intern
+        namespaces << parse_capitalized_identifier(scanner)
       end
       *namespaces, name = namespaces
       Tcepsni::Class.new(name: name, namespaces: namespaces)
     end
 
+    def parse_capitalized_identifier(scanner)
+      id = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, "no capitalized identifier: #{scanner.inspect}"
+      id.intern
+    end
+
     def parse_object(scanner)
       klass = parse_class(scanner)
       if klass.string_scanner?
-        scanner.skip(%r{ (?<pos>\d+)/(?<total>\d+) "(?<scanned>[^"]+)" @ "(?<rest>[^"]+)">}) or raise Error, 'invalid string scanner'
-        Tcepsni::StringScanner.new(pos: Integer(scanner[:pos]), total: Integer(scanner[:total]), scanned: scanner[:scanned], rest: scanner[:rest])
+        scanner.skip(' ') or raise Error, 'no space after string scanner class name'
+        pos = parse_integer(scanner)
+        scanner.skip('/') or raise Error, 'no string scanner progress delimiter slash'
+        total = parse_integer(scanner)
+        scanner.skip(' "') or raise Error, 'no space after string scanner progress'
+        scanned = parse_string(scanner)
+        scanner.skip(' @ "') or raise Error, "no string scanner mark in string: #{scanner.inspect}"
+        rest = parse_string(scanner)
+        scanner.skip('>') or raise Error, 'no string scanner closer'
+        Tcepsni::Vendor::StringScanner.new(pos: pos, total: total, scanned: scanned, rest: rest)
+      elsif klass.pathname?
+        scanner.skip(':') or raise Error, 'no colon between Pathname class name and path string'
+        scanner.skip(/(?<path>[^>]+)>/) or raise Error, 'invalid path string and closer'
+        Pathname(scanner[:path])
+      elsif klass.encoding?
+        scanner.skip(':') or raise Error, 'no colon separator in encoding object'
+        scanner.skip(/(?<name>[^>]+)>/) or raise Error, 'invalid encoding name'
+        Encoding.find(scanner[:name])
+      elsif klass.ipaddr?
+        scanner.skip(/: IPv[46]:(?<addr>[^>]+)>/) or raise Error, 'invalid IP address format error'
+        IPAddr.new(scanner[:addr])
+      elsif klass.active_support_ordered_options?
+        scanner.skip(' {') or raise Error, 'no space between ActiveSupport::OrderedOptions class name and hash opener'
+        hash = parse_hash(scanner)
+        scanner.skip('>') or raise Error, "no ActiveSupport ordered options closer: #{scanner.inspect}"
+        options = ActiveSupport::OrderedOptions.new
+        hash.each do |key, val|
+          options[key] = val
+        end
+        options
+      elsif klass.rails_paths_root?
+        memory_reference = parse_memory_reference(scanner)
+        if scanner.skip(' ...>')
+          attributes = {}
+        else
+          attributes = parse_attributes(scanner)
+        end
+        Tcepsni::Vendor::Rails::Paths::Root.new(memory_reference, attributes)
       else
-        scanner.skip(/:(?<memory_reference>0x[0-9a-f]{16})/) or raise Error, "no memory reference: #{scanner.inspect}"
-        memory_reference = scanner[:memory_reference]
-        attributes = {}
-        unless scanner.skip('>')
-          until scanner.eos?
-            scanner.skip(/ @(?<key>[A-Za-z_][A-Za-z_0-9]*)=/) or break
-            key = scanner[:key].intern
-            value = parse_expression(scanner)
-            attributes[key] = value
-            scanner.skip(',') or break
+        memory_reference = parse_memory_reference(scanner)
+        attributes = parse_attributes(scanner)
+        Tcepsni::Object.new(klass: klass, memory_reference: memory_reference, attributes: attributes)
+      end
+    end
+
+    def parse_attributes(scanner)
+      attributes = {}
+      unless scanner.skip('>')
+        until scanner.eos?
+          scanner.skip(' @') or break
+          key = parse_identifier(scanner)
+          scanner.skip('=') or raise Error, 'no attribute keyval equal char'
+          attributes[key.intern] = parse_expression(scanner)
+          unless scanner.skip(',')
+            scanner.skip('>') or raise Error, "no object closer: #{scanner.inspect}"
+            break
           end
         end
-        Tcepsni::Object.new(klass: klass, memory_reference: memory_reference, attributes: attributes)
       end
+      attributes
+    end
+
+    def parse_memory_reference(scanner)
+      scanner.skip(/:(?<memory_reference>0x[0-9a-f]{16})/) or raise Error, "no memory reference: #{scanner.inspect}"
+      Integer(scanner[:memory_reference])
     end
   end
 
@@ -124,7 +196,27 @@ module Tcepsni
     end
 
     def string_scanner?
-      [name, *namespaces].include?(:StringScanner)
+      @name == :StringScanner && @namespaces.empty?
+    end
+
+    def pathname?
+      @name == :Pathname
+    end
+
+    def encoding?
+      @name == :Encoding && @namespaces.empty?
+    end
+
+    def ipaddr?
+      @name == :IPAddr && @namespaces.empty?
+    end
+
+    def active_support_ordered_options?
+      @name == :OrderedOptions && @namespaces == [:ActiveSupport]
+    end
+
+    def rails_paths_root?
+      @name == :Root && @namespaces == [:Rails, :Paths]
     end
   end
 
@@ -138,14 +230,29 @@ module Tcepsni
     end
   end
 
-  class StringScanner
-    attr_reader :pos, :total, :scanned, :rest
+  module Vendor
+    class StringScanner
+      attr_reader :pos, :total, :scanned, :rest
+
+      def initialize(pos:, total:, scanned:, rest:)
+        @pos = pos
+        @total = total
+        @scanned = scanned
+        @rest = rest
+      end
+    end
 
-    def initialize(pos:, total:, scanned:, rest:)
-      @pos = pos
-      @total = total
-      @scanned = scanned
-      @rest = rest
+    module Rails
+      module Paths
+        class Root
+          attr_reader :memory_reference, :attributes
+
+          def initialize(memory_reference, attributes)
+            @memory_reference = memory_reference
+            @attributes = attributes
+          end
+        end
+      end
     end
   end
 end

data/sig/tcepsni.gen.rbs

@@ -5,17 +5,27 @@ module Tcepsni
   VERSION: String
 
 # def self.parse: (String str) -> parsed
-  def self.parse_expression: (untyped scanner) -> ((Array[(Array[(Class | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Class | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[(Class | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Class | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?)
+  def self.parse_expression: (untyped scanner) -> ((Array[(Array[(Class | Float | Integer | Object | String | Time | bool)?] | Hash[Object?, Object?] | Object)?] | Hash[Object?, (Array[Object?] | Hash[Object?, Object?] | Object)?] | Object)?)
+  def self.parse_integer: (untyped scanner) -> Integer
+  def self.parse_identifier: (untyped scanner) -> untyped
   def self.parse_string: (untyped scanner) -> String
-  def self.parse_array: (untyped scanner) -> (Array[(Array[(Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?])
-  def self.parse_hash: (untyped scanner) -> (Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[(Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?])
-  def self.parse_class: (untyped scanner, ?name: nil) -> Class
-  def self.parse_object: (untyped scanner) -> (Object | StringScanner)
+  def self.parse_array: (untyped scanner) -> (Array[(Array[(Array[untyped] | Class | Float | Hash[(Class | Float | Integer | Object | String | Time | bool)?, untyped] | Integer | Object | String | Time | bool)?] | Hash[Object?, (Array[untyped] | Hash[Object?, untyped] | Object)?] | Object)?])
+  def self.parse_hash: (untyped scanner) -> (Hash[Object?, (Array[(Array[untyped] | Hash[Object?, untyped] | Object)?] | Hash[Object?, (Array[untyped] | Hash[Object?, untyped] | Object)?] | Object)?])
+  def self.parse_class: (untyped scanner) -> Class
+  def self.parse_capitalized_identifier: (untyped scanner) -> untyped
+  def self.parse_object: (untyped scanner) -> (Encoding | IPAddr | Object | Pathname | Vendor::Rails::Paths::Root | Vendor::StringScanner)
+  def self.parse_attributes: (untyped scanner) -> (Hash[untyped, (Array[(Array[untyped] | Hash[Object?, untyped] | Object)?] | Hash[Object?, (Array[untyped] | Hash[Object?, untyped] | Object)?] | Object)?])
+  def self.parse_memory_reference: (untyped scanner) -> Integer
 
   class Class
   # def initialize: (name: Symbol?, namespaces: Array[Symbol]) -> void
   # def ==: (Class other) -> bool
   # def string_scanner?: -> bool
+  # def pathname?: -> bool
+  # def encoding?: -> bool
+  # def ipaddr?: -> bool
+  # def active_support_ordered_options?: -> bool
+  # def rails_paths_root?: -> bool
   # attr_reader name: Symbol?
   # attr_reader namespaces: Array[Symbol]
   end
@@ -27,11 +37,23 @@ module Tcepsni
   # attr_reader memory_reference: Integer
   end
 
-  class StringScanner
-  # def initialize: (pos: Integer, total: Integer, scanned: String, rest: String) -> void
-  # attr_reader pos: Integer
-  # attr_reader total: Integer
-  # attr_reader scanned: String
-  # attr_reader rest: String
+  module Vendor
+    class StringScanner
+    # def initialize: (pos: Integer, total: Integer, scanned: String, rest: String) -> void
+    # attr_reader pos: Integer
+    # attr_reader total: Integer
+    # attr_reader scanned: String
+    # attr_reader rest: String
+    end
+
+    module Rails
+      module Paths
+        class Root
+        # def initialize: (Integer memory_reference, Hash[Symbol, parsed?] attributes) -> void
+        # attr_reader memory_reference: Integer
+        # attr_reader attributes: Hash[Symbol, (Array[untyped] | Array[untyped] | Class | Hash[untyped, untyped] | Hash[untyped, untyped] | Integer | Object | String | StringScanner | Symbol | bool)?]
+        end
+      end
+    end
   end
 end

data/sig/tcepsni.rbs

@@ -16,6 +16,11 @@ module Tcepsni
     def initialize: (name: Symbol?, namespaces: Array[Symbol]) -> void
     def ==: (Class other) -> bool
     def string_scanner?: -> bool
+    def pathname?: -> bool
+    def encoding?: -> bool
+    def ipaddr?: -> bool
+    def active_support_ordered_options?: -> bool
+    def rails_paths_root?: -> bool
   end
 
   class Object
@@ -25,11 +30,23 @@ module Tcepsni
     def initialize: (klass: Class, attributes: Hash[Symbol, parsed], memory_reference: Integer) -> void
   end
 
-  class StringScanner
-    attr_reader pos: Integer
-    attr_reader total: Integer
-    attr_reader scanned: String
-    attr_reader rest: String
-    def initialize: (pos: Integer, total: Integer, scanned: String, rest: String) -> void
+  module Vendor
+    class StringScanner
+      attr_reader pos: Integer
+      attr_reader total: Integer
+      attr_reader scanned: String
+      attr_reader rest: String
+      def initialize: (pos: Integer, total: Integer, scanned: String, rest: String) -> void
+    end
+
+    module Rails
+      module Paths
+        class Root
+          attr_reader memory_reference: Integer
+          attr_reader attributes: Hash[Symbol, parsed?]
+          def initialize: (Integer memory_reference, Hash[Symbol, parsed?] attributes) -> void
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcepsni
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Tcepsni gem is a parser library for inspected strings of Ruby objects.
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: inspected Ruby objects parser