parsanol 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f607d039167282c6b08c5b6a41eb8439f4c003d74d0ca50c38851306acbfc2
-  data.tar.gz: 06ee7d75ed17680449dcb2feaeecea6ca381e43764cd9fb202e20b0d5615ee4a
+  metadata.gz: 7dcef7aebbd4f89f81ed82f1f162e4f168e8cc824150b610e434e3cd709219a1
+  data.tar.gz: 71f39107f54e66fa5c6fa58dc23a7bfa2287212454caa446c2a7444d506d6a7e
 SHA512:
-  metadata.gz: 6c889c8431756d6d50cc6b59d99f62650d1d94376f2f59c561c431255e92e081303b9d1e312ad0f74e231c3065b520ee36a5f06cedabe91576db59ba031f6dfa
-  data.tar.gz: 19ac606754d24dfaac7711f4ba2552ec67bfd2a37a2da2dfc7f09e54638b90f5aa02798996ab30303227bd10b36746adb48abf459e26a2967b102b734d33365f
+  metadata.gz: 398f9bdc287b03f8114568fd061299434bd479556f7163145f7269a18507be521f30f582ad02881d88c5479d794e4dea68c2a5e02b36093e33d9f1efa6130c3c
+  data.tar.gz: 1460303b64cb6ae52a04db7b26a9e156895d2acaed5f7634eefe2c530a8662815b03ff4b8fe77c6cb8481c0c4fa8452565228c4428346c6f3ffd4804239a5eb1

data/Cargo.lock

@@ -306,7 +306,6 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 [[package]]
 name = "parsanol"
 version = "0.4.1"
-source = "git+https://github.com/parsanol/parsanol-rs?rev=4667017#46670172240420221089cb4da6eaecadb23a0015"
 dependencies = [
  "ahash",
  "getrandom 0.3.4",
@@ -323,7 +322,6 @@ dependencies = [
 [[package]]
 name = "parsanol-derive"
 version = "0.4.1"
-source = "git+https://github.com/parsanol/parsanol-rs?rev=4667017#46670172240420221089cb4da6eaecadb23a0015"
 dependencies = [
  "proc-macro2",
  "quote",

data/ext/parsanol_native/Cargo.toml

@@ -28,11 +28,10 @@ rb-sys = { version = "0.9.124", features = ["global-allocator"] }
 magnus = { version = "0.9" }
 
 # parsanol parser library (from git for latest features)
-parsanol = { git = "https://github.com/parsanol/parsanol-rs", rev = "4667017", features = ["ruby"] }
+parsanol = { git = "https://github.com/parsanol/parsanol-rs", rev = "3eda2c0", features = ["ruby"] }
 
 # Logging
 log = "0.4"
 
 [profile.release]
 lto = "off"
-

data/lib/parsanol/native/parser.rb

@@ -16,7 +16,13 @@ module Parsanol
           return @cached_available unless @cached_available.nil?
 
           @cached_available = begin
-            require 'parsanol/parsanol_native'
+            # Try versioned path first (released gem), then non-versioned (local dev)
+            ruby_version = RUBY_VERSION.split('.').take(2).join('.')
+            begin
+              require "parsanol/#{ruby_version}/parsanol_native"
+            rescue LoadError
+              require 'parsanol/parsanol_native'
+            end
             Parsanol::Native.is_available
           rescue LoadError
             false

data/lib/parsanol/native.rb

@@ -128,11 +128,44 @@ module Parsanol
       # Clear grammar caches (call if grammar changes)
       def clear_cache
         Parser.clear_cache
+        clear_grammar_cache if available?
+      end
+
+      # Clear the Rust grammar cache to free memory.
+      #
+      # This is useful for batch processing scenarios where you want to
+      # limit memory usage by clearing unused grammars.
+      #
+      # @return [nil]
+      def clear_grammar_cache
+        raise LoadError, "Native parser not available" unless available?
+        _clear_grammar_cache
+      end
+
+      # Get the current number of cached grammars in Rust.
+      #
+      # @return [Integer] Number of cached grammars
+      def grammar_cache_size
+        raise LoadError, "Native parser not available" unless available?
+        _grammar_cache_size
+      end
+
+      # Get the grammar cache capacity.
+      #
+      # @return [Integer] Maximum cache capacity
+      def grammar_cache_capacity
+        raise LoadError, "Native parser not available" unless available?
+        _grammar_cache_capacity
       end
 
       # Get cache statistics
       def cache_stats
-        Parser.cache_stats
+        stats = Parser.cache_stats
+        if available?
+          stats[:rust_grammar_cache_size] = grammar_cache_size
+          stats[:rust_grammar_cache_capacity] = grammar_cache_capacity
+        end
+        stats
       end
     end
   end

data/lib/parsanol/parallel.rb

@@ -83,17 +83,11 @@ module Parsanol
                 "Run `rake compile` to build the extension."
         end
 
-        # Try to use native parallel parsing
-        if respond_to?(:_parse_batch_parallel, true)
-          Parsanol::Native.parse_batch_parallel(
-            grammar_json,
-            inputs,
-            num_threads: config.num_threads
-          )
-        else
-          # Fallback to sequential if parallel not available
-          inputs.map { |input| Parsanol::Native.parse(grammar_json, input) }
-        end
+        Parsanol::Native.parse_batch_parallel(
+          grammar_json,
+          inputs,
+          num_threads: config.num_threads
+        )
       end
 
       # Parse multiple inputs in parallel with transformation.

data/lib/parsanol/parser.rb

@@ -109,13 +109,14 @@ module Parsanol
     #   result[:name].to_s           # => "hello"
     #
     def parse(input, mode_or_opts = {}, **kwargs)
-      if mode_or_opts.is_a?(Hash)
-        # Legacy API: parse(input, options={})
+      if mode_or_opts.is_a?(Hash) && !kwargs.key?(:mode)
+        # Legacy API: parse(input, options={}) or parse(input, mode: :ruby)
         merged = mode_or_opts.merge(kwargs)
         super(input, merged)
       else
         # New API: parse(input, mode:, **options)
-        dispatch_parse(mode_or_opts, input, kwargs)
+        mode = kwargs.delete(:mode) || :ruby
+        dispatch_parse(mode, input, kwargs)
       end
     end
 
@@ -130,6 +131,38 @@ module Parsanol
       inputs.map { |str| parse(str, mode: mode, **opts) }
     end
 
+    # Clear the Rust grammar cache to free memory.
+    #
+    # @return [nil]
+    # @raise [LoadError] if native parser is not available
+    def clear_grammar_cache
+      Parsanol::Native.clear_grammar_cache
+    end
+
+    # Get the current number of cached grammars in Rust.
+    #
+    # @return [Integer] number of cached grammars
+    # @raise [LoadError] if native parser is not available
+    def grammar_cache_size
+      Parsanol::Native.grammar_cache_size
+    end
+
+    # Get the grammar cache capacity.
+    #
+    # @return [Integer] maximum cache capacity
+    # @raise [LoadError] if native parser is not available
+    def grammar_cache_capacity
+      Parsanol::Native.grammar_cache_capacity
+    end
+
+    # Get cache statistics for both Ruby and Rust caches.
+    #
+    # @return [Hash] cache statistics including Ruby GRAMMAR_CACHE and Rust grammar cache
+    # @raise [LoadError] if native parser is not available for Rust stats
+    def cache_stats
+      Parsanol::Native.cache_stats
+    end
+
     private
 
     # Dispatches to the appropriate parsing backend based on mode.
@@ -158,6 +191,9 @@ module Parsanol
     # @param opts [Hash] parsing options
     # @return [Object] parse result
     #
+    def parse_ruby(input, opts)
+      super
+    end
 
     # Native extension parsing with Ruby fallback.
     # Returns results with Slice objects containing position info.

data/lib/parsanol/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parsanol
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ribose Inc.