language-ruby 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29e7af1daadab0c370fe551f61803a231fd8dc46481ca6c87b11867f21040ae
-  data.tar.gz: 412873f0510761217a84caf98d5cde6126e81e2f734c188ad02afdf00c341f61
+  metadata.gz: 7a115d1bc42494deae4dfa239e73ef2a87ea724356530aebf399b972011dd361
+  data.tar.gz: b49baefcdb25d34096dac0eeeb3d68f0868ceb80173cc287cab50c6661863d01
 SHA512:
-  metadata.gz: 654ab22a998ca7eae204f9a8f546cd5d348e377d8080135dcabde49ebc3374a863d09be0d6f62b9e4f3ff759f3fd9af27f190b487adad780d1d51a35c9afad82
-  data.tar.gz: c42f9574203f55af50f4dc2fa08b62287e9f7aa7341cec1f60878c8c384c629522eb7bff684e1b32deb217c13a0d5d39ce60e533ce2042fb24c9cfb050e41d8b
+  metadata.gz: fea53944f04ee2a2a70fd19d1aa78ea074f91deda0473daf11ba452e50c28b50587178e808981362eb742b43249a4a435bc891c095c07455b13fd19c83125cdf
+  data.tar.gz: 9b20a292749126ba40fcfe1ae8dd9a7524636dbf81da1fa09d19a8ed0761d53a89bd657d3a64fce0618c4b29dcef15936e015dbc4406ee01d9564d4102ed303e

data/.github/dependabot.yml

@@ -1,15 +1,15 @@
 ---
-version: 2
 updates:
-  - directory: "/"
-    package-ecosystem: github-actions
-    schedule:
-      interval: daily
-  - directory: "/"
-    package-ecosystem: npm
-    schedule:
-      interval: daily
-  - directory: "/"
-    package-ecosystem: bundler
-    schedule:
-      interval: daily
+- directory: "/"
+  package-ecosystem: github-actions
+  schedule:
+    interval: daily
+- directory: "/"
+  package-ecosystem: npm
+  schedule:
+    interval: daily
+- directory: "/"
+  package-ecosystem: bundler
+  schedule:
+    interval: daily
+version: 2

data/.github/workflows/ci.yml

@@ -1,37 +1,38 @@
-name: CI
-on: push
+---
 jobs:
   bundler-audit:
     name: Bundler Audit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - run: bin/bundler-audit check --update
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - run: bin/bundler-audit check --update
+  npm-audit:
+    name: npm Audit
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+    - run: npm audit
   rspec:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - run: bin/test
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - run: bin/test
   rubocop:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - run: bin/rubocop
-  npm-audit:
-    name: npm Audit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - run: npm audit
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - run: bin/rubocop
+name: CI
+'on': push

data/.node-version

@@ -1 +1 @@
-22.5.1
+23.11.0

data/.npm-version

@@ -0,0 +1 @@
+11.2.0

data/.rubocop.yml

@@ -1,11 +1,11 @@
 ---
 AllCops:
   Exclude:
-    - "*/node_modules/**/*"
-    - "*/vendor/**/*"
-    - node_modules/**/*
-    - vendor/**/*
+  - "**/node_modules/**/*"
+  - "**/vendor/**/*"
+  - "**/db/schema.rb"
   NewCops: enable
+  TargetRubyVersion: 3.0
 Layout/ClosingHeredocIndentation:
   Enabled: false
 Layout/FirstArgumentIndentation:
@@ -22,6 +22,8 @@ Layout/MultilineMethodCallIndentation:
   Enabled: false
 Layout/MultilineOperationIndentation:
   Enabled: false
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
 Lint/EmptyClass:
   Enabled: false
 Lint/MissingSuper:
@@ -58,6 +60,8 @@ Naming/MethodParameterName:
   Enabled: false
 Naming/VariableNumber:
   Enabled: false
+Performance/Sum:
+  Enabled: false
 Performance/UnfreezeString:
   Enabled: false
 RSpec/AnyInstance:
@@ -116,11 +120,11 @@ Style/StringLiterals:
   Enabled: false
 Style/StringLiteralsInInterpolation:
   Enabled: false
-require:
-  - rubocop-factory_bot
-  - rubocop-performance
-  - rubocop-rails
-  - rubocop-rake
-  - rubocop-rspec
-  - rubocop-rspec_rails
-  - rubocop-capybara
+plugins:
+- rubocop-factory_bot
+- rubocop-performance
+- rubocop-rails
+- rubocop-rake
+- rubocop-rspec
+- rubocop-capybara
+- rubocop-rspec_rails

data/.ruby-version

@@ -1 +1 @@
-3.3.5
+3.4.2

data/.tool-versions

@@ -1,3 +1,3 @@
-ruby 3.3.5
+ruby 3.4.2
 yarn 1.22.22
-nodejs 22.5.1
+nodejs 23.11.0

data/Gemfile

@@ -4,17 +4,15 @@ source "https://rubygems.org"
 
 gemspec
 
-ruby "3.3.5"
-
-gem "rspec"
+ruby "3.4.2"
 
 gem "bundler-audit"
-
+gem "dorian"
+gem "rspec"
+gem "rubocop-capybara"
 gem "rubocop-factory_bot"
 gem "rubocop-performance"
 gem "rubocop-rails"
 gem "rubocop-rake"
 gem "rubocop-rspec"
 gem "rubocop-rspec_rails"
-
-gem "rubocop-capybara"

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    language-ruby (1.1.2)
+    language-ruby (1.2.0)
       dorian-arguments
       zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -19,91 +20,179 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    ast (2.4.2)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
-    diff-lcs (1.5.1)
-    dorian-arguments (1.2.1)
+    cmdparse (3.0.7)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    csv (3.3.3)
+    diff-lcs (1.6.1)
+    dorian (2.6.3)
+      csv
+      dorian-arguments
+      dorian-eval
+      dorian-progress
+      dorian-to_struct
+      git
+      hexapdf
+      json
+      mini_racer
+      ostruct
+      parallel
+      syntax_tree
+      syntax_tree-haml
+      syntax_tree-xml
+      terminal-table
+      w_syntax_tree-erb
+      yaml
+    dorian-arguments (1.2.2)
       bigdecimal
+    dorian-eval (1.5.0)
+      yaml
+    dorian-progress (1.1.2)
+      ruby-progressbar
+    dorian-to_struct (2.0.2)
     drb (2.2.1)
-    i18n (1.14.5)
+    geom2d (0.4.1)
+    git (3.0.0)
+      activesupport (>= 5.0)
+      addressable (~> 2.8)
+      process_executer (~> 1.3)
+      rchardet (~> 1.9)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
+      tilt
+    hexapdf (1.2.0)
+      cmdparse (~> 3.0, >= 3.0.3)
+      geom2d (~> 0.4, >= 0.4.1)
+      openssl (>= 2.2.1)
+      strscan (>= 3.1.2)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.1)
-    minitest (5.25.1)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    libv8-node (23.6.1.0-arm64-darwin)
+    libv8-node (23.6.1.0-x86_64-linux)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mini_racer (0.18.1)
+      libv8-node (~> 23.6.1.0)
+    minitest (5.25.5)
+    openssl (3.3.0)
+    ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
+    prettier_print (1.2.1)
+    prism (1.4.0)
+    process_executer (1.3.0)
+    public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.12)
     rainbow (3.1.1)
-    regexp_parser (2.9.2)
+    rchardet (1.9.0)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rspec-support (3.13.2)
+    rubocop (1.75.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-performance (1.21.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.31.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.0.4)
-      rubocop (~> 1.61)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
+    strscan (3.1.2)
+    syntax_tree (6.2.0)
+      prettier_print (>= 1.2.0)
+    syntax_tree-haml (4.0.3)
+      haml (>= 5.2)
+      prettier_print (>= 1.2.1)
+      syntax_tree (>= 6.0.0)
+    syntax_tree-xml (0.1.0)
+      prettier_print
+      syntax_tree (>= 2.0.1)
+    temple (0.10.3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.2)
+    tilt (2.6.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.18)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    w_syntax_tree-erb (0.12.0)
+      prettier_print (~> 1.2, >= 1.2.0)
+      syntax_tree (~> 6.1, >= 6.1.1)
+    yaml (0.4.0)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
   bundler-audit
+  dorian
   language-ruby!
   rspec
   rubocop-capybara
@@ -115,7 +204,7 @@ DEPENDENCIES
   rubocop-rspec_rails
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.4.2p28
 
 BUNDLED WITH
-   2.5.18
+   2.6.7

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/bin/dorian

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'dorian' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?(
+       "This file was generated by Bundler"
+     )
+    load(bundle_binstub)
+  else
+    abort(
+      "Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again."
+    )
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("dorian", "dorian")

data/language-ruby.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency "dorian-arguments"
   s.add_dependency "zeitwerk"
   s.metadata["rubygems_mfa_required"] = "true"
-  s.required_ruby_version = ">= 3.3.0"
+  s.required_ruby_version = ">= 3.0"
 end

data/lib/language/atom/and.rb

@@ -25,7 +25,7 @@ class Language
       end
 
       def to_s
-        "#{@left} >> #{@right}".to_s
+        "#{@left} >> #{@right}"
       end
     end
   end

data/lib/language/atom/present.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Language
+  class Atom
+    class Present < Atom
+      def initialize(parent: nil)
+        @parent = parent
+      end
+
+      def parse(parser)
+        clone =
+          Parser.new(
+            root: self,
+            input: parser.input,
+            cursor: parser.cursor,
+            buffer: parser.buffer
+          )
+
+        @parent&.parse(clone)
+      end
+
+      def to_s
+        @parent ? "(#{@parent}).present" : "present"
+      end
+    end
+  end
+end

data/lib/language/atom.rb

@@ -14,6 +14,10 @@ class Language
       Absent.new(parent: self)
     end
 
+    def present
+      Present.new(parent: self)
+    end
+
     def ignore
       Ignore.new(parent: self)
     end

data/lib/language.rb

@@ -9,6 +9,10 @@ class Language
     Atom::Absent.new(parent: new)
   end
 
+  def self.present
+    Atom::Present.new(parent: new)
+  end
+
   def self.ignore
     Atom::Ignore.new(parent: new)
   end

data/package-lock.json

@@ -6,9 +6,9 @@
     "": {
       "license": "MIT",
       "engines": {
-        "node": "22.5.1",
-        "npm": "10.8.2"
+        "node": "23.11.0",
+        "npm": "11.2.0"
       }
     }
   }
-}
+}

data/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "engines": {
-    "node": "22.5.1",
-    "npm": "10.8.2"
+    "node": "23.11.0",
+    "npm": "11.2.0"
   }
-}
+}

data/spec/language_spec.rb

@@ -32,6 +32,13 @@ class Code
           .then { |output| output[:something].upcase }
       end
     end
+
+    class BooleanPresent < Language
+      def root
+        str("t").aka(:boolean) << str(" ").present << str(" ") << str("rest").aka(:string) |
+          str("trest").aka(:string)
+      end
+    end
   end
 end
 
@@ -55,4 +62,16 @@ RSpec.describe Language do
   it "works with then with output" do
     expect(Code::Parser::ThenWithOutput.parse("value")).to eq("VALUE")
   end
+
+  it "works with present (string)" do
+    expect(Code::Parser::BooleanPresent.parse("trest")).to eq(
+      { string: "trest" }
+    )
+  end
+
+  it "works with present (boolean and string)" do
+    expect(Code::Parser::BooleanPresent.parse("t rest")).to eq(
+      { boolean: "t", string: "rest" }
+    )
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: language-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Dorian Marié
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dorian-arguments
@@ -49,6 +48,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".node-version"
+- ".npm-version"
 - ".prettierignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -62,6 +62,7 @@ files:
 - bin/bundle
 - bin/bundle-audit
 - bin/bundler-audit
+- bin/dorian
 - bin/language
 - bin/rspec
 - bin/rubocop
@@ -77,6 +78,7 @@ files:
 - lib/language/atom/ignore.rb
 - lib/language/atom/maybe.rb
 - lib/language/atom/or.rb
+- lib/language/atom/present.rb
 - lib/language/atom/repeat.rb
 - lib/language/atom/str.rb
 - lib/language/atom/then.rb
@@ -99,7 +101,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,15 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: parser dsl
 test_files: []