language-ruby 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a1ccee7183f3754d3c9e7af0f9b16e744057e11b240d467454e70bcb5540f0
-  data.tar.gz: eab8c679b5de54c5c09a5fbdc0c0a1405e20a306295d2efe36d9dd45e19fc411
+  metadata.gz: 43e7dbe99b9eae36dbcc0d289c7cd4c18da4acaafb1c1bfa96c2fd752d47d94c
+  data.tar.gz: dc14e49d2559be9d59b9538e2800552d1dfffc5dd67c2452e60efeb7470e17e9
 SHA512:
-  metadata.gz: 690505c08881132c7ac82415afbb45e86ae6c41ff232ec5b0697f3e90a2e785bfff477ef2d057afa5e8f6419ff59cd8cc13047191e0b8890a8770a900ceef310
-  data.tar.gz: 0cf5e8c8fbe20db6b5ea537893d3a092a6fa901474f3908cf39b624978f98c95ae451ab0eb2244b0f6052c76ad5e4af1ca9dcd7b8a74f15a4c817e0ebd85ac96
+  metadata.gz: a16d61fbd9e957d1472d2821f1e2c203d82e2d201f18739bb47c10454a37d33c4346a82a147cdd84195031682f6e41495df99f91f82f90450485c4ada5f1eefb
+  data.tar.gz: d1c61b3b13c4ac9d3e4dae2cbb8d44dccda376f0971665966a44fd3cf260a3b7f4a35afe04c174bd8ff8e690d61deb452137dcaf6b66068308727c87834dd900

data/.github/workflows/ci.yml

@@ -28,10 +28,10 @@ jobs:
         with:
           bundler-cache: true
       - run: bin/rubocop
-  yarn-audit:
-    name: Yarn Audit
+  npm-audit:
+    name: npm Audit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: yarn audit
+      - run: npm audit

data/.prettierignore

@@ -0,0 +1,2 @@
+node_modules
+vendor

data/.rubocop.yml

@@ -1,8 +1,124 @@
-inherit_gem:
-  rubocop-rails-omakase: rubocop.yml
-
-Layout/SpaceInsideArrayLiteralBrackets:
+---
+AllCops:
+  Exclude:
+    - "*/node_modules/**/*"
+    - "*/vendor/**/*"
+    - node_modules/**/*
+    - vendor/**/*
+  NewCops: enable
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+Layout/MultilineOperationIndentation:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/MissingSuper:
+  Enabled: false
+Lint/PercentStringArray:
+  Enabled: false
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+Lint/SuppressedException:
+  Enabled: false
+Lint/UnusedBlockArgument:
+  Enabled: false
+Lint/UselessAssignment:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Naming/FileName:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Naming/VariableNumber:
   Enabled: false
-
 Performance/UnfreezeString:
   Enabled: false
+RSpec/AnyInstance:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/ExampleWording:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
+RSpec/PendingWithoutReason:
+  Enabled: false
+Rails/Delegate:
+  Enabled: false
+Rails/DynamicFindBy:
+  Enabled: false
+Rails/HelperInstanceVariable:
+  Enabled: false
+Rails/NegateInclude:
+  Enabled: false
+Rails/Output:
+  Enabled: false
+Rails/Presence:
+  Enabled: false
+Rails/Present:
+  Enabled: false
+Rails/ThreeStateBooleanColumn:
+  Enabled: false
+Rails/TimeZone:
+  Enabled: false
+Security/Eval:
+  Enabled: false
+Style/CaseEquality:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/DoubleNegation:
+  Enabled: false
+Style/EmptyMethod:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
+Style/QuotedSymbols:
+  Enabled: false
+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

data/Gemfile

@@ -7,4 +7,14 @@ gemspec
 ruby "3.3.4"
 
 gem "rspec"
-gem "rubocop-rails-omakase"
+
+gem "bundler-audit"
+
+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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    language-ruby (1.0.1)
+    language-ruby (1.1.0)
       dorian-arguments
       zeitwerk
 
@@ -22,14 +22,14 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
+    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 (0.4.1)
-      activesupport
+    dorian-arguments (1.1.1)
       bigdecimal
-      dorian-to_struct
-    dorian-to_struct (0.6.0)
     drb (2.2.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -73,9 +73,10 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.1)
-      rubocop (>= 1.61, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.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)
@@ -84,14 +85,17 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails-omakase (1.0.0)
-      rubocop
-      rubocop-minitest
-      rubocop-performance
-      rubocop-rails
+    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)
     ruby-progressbar (1.13.0)
     securerandom (0.3.1)
     strscan (3.1.0)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -100,14 +104,22 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
+  bundler-audit
   language-ruby!
   rspec
-  rubocop-rails-omakase
+  rubocop-capybara
+  rubocop-factory_bot
+  rubocop-performance
+  rubocop-rails
+  rubocop-rake
+  rubocop-rspec
+  rubocop-rspec_rails
 
 RUBY VERSION
    ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.17
+   2.5.18

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/bin/bundle

@@ -0,0 +1,123 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m =
+  Module.new do
+    module_function
+
+    def invoked_as_script?
+      File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
+    end
+
+    def env_var_version
+      ENV.fetch("BUNDLER_VERSION", nil)
+    end
+
+    def cli_arg_version
+      return unless invoked_as_script? # don't want to hijack other binstubs
+      return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
+      bundler_version = nil
+      update_index = nil
+      ARGV.each_with_index do |a, i|
+        if update_index && update_index.succ == i &&
+             a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+          bundler_version = a
+        end
+        unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/o
+          next
+        end
+
+        bundler_version = Regexp.last_match(1)
+        update_index = i
+      end
+      bundler_version
+    end
+
+    def gemfile
+      gemfile = ENV.fetch("BUNDLE_GEMFILE", nil)
+      return gemfile if gemfile && !gemfile.empty?
+
+      File.expand_path("../Gemfile", __dir__)
+    end
+
+    def lockfile
+      lockfile =
+        case File.basename(gemfile)
+        when "gems.rb"
+          gemfile.sub(/\.rb$/, ".locked")
+        else
+          "#{gemfile}.lock"
+        end
+      File.expand_path(lockfile)
+    end
+
+    def lockfile_version
+      return unless File.file?(lockfile)
+
+      lockfile_contents = File.read(lockfile)
+      unless lockfile_contents =~
+               /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/o
+        return
+      end
+
+      Regexp.last_match(1)
+    end
+
+    def bundler_requirement
+      @bundler_requirement ||=
+        env_var_version || cli_arg_version ||
+          bundler_requirement_for(lockfile_version)
+    end
+
+    def bundler_requirement_for(version)
+      return "#{Gem::Requirement.default}.a" unless version
+
+      bundler_gem_version = Gem::Version.new(version)
+
+      bundler_gem_version.approximate_recommendation
+    end
+
+    def load_bundler!
+      ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+      activate_bundler
+    end
+
+    def activate_bundler
+      gem_error =
+        activation_error_handling { gem "bundler", bundler_requirement }
+      return if gem_error.nil?
+
+      require_error = activation_error_handling { require "bundler/version" }
+      if require_error.nil? &&
+           Gem::Requirement.new(bundler_requirement).satisfied_by?(
+             Gem::Version.new(Bundler::VERSION)
+           )
+        return
+      end
+
+      warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+      exit 42
+    end
+
+    def activation_error_handling
+      yield
+      nil
+    rescue StandardError, LoadError => e
+      e
+    end
+  end
+
+m.load_bundler!
+
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?

data/bin/bundle-audit

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle-audit' 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("bundler-audit", "bundle-audit")

data/bin/bundler-audit

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler-audit' 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("bundler-audit", "bundler-audit")

data/bin/rubocop

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' 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("rubocop", "rubocop")

data/language-ruby.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
   s.executables << "language"
   s.homepage = "https://github.com/dorianmariecom/language-ruby"
   s.license = "MIT"
-  s.add_dependency "zeitwerk"
   s.add_dependency "dorian-arguments"
+  s.add_dependency "zeitwerk"
+  s.metadata["rubygems_mfa_required"] = "true"
+  s.required_ruby_version = "3.3.4"
 end

data/lib/language/atom/repeat.rb

@@ -30,7 +30,7 @@ class Language
         minimum = @minimum.zero? ? "" : @minimum.to_s
         maximum = @maximum.nil? ? "" : ", #{@maximum}"
         parenthesis =
-          (minimum.empty? && maximum.empty?) ? "" : "(#{minimum}#{maximum})"
+          minimum.empty? && maximum.empty? ? "" : "(#{minimum}#{maximum})"
 
         @parent ? "(#{@parent}).repeat#{parenthesis}" : "repeat#{parenthesis}"
       end

data/lib/language/output.rb

@@ -26,11 +26,7 @@ class Language
       case @raw
       when NilClass
         true
-      when String
-        raw.empty?
-      when Array
-        raw.empty?
-      when Hash
+      when String, Array, Hash
         raw.empty?
       end
     end
@@ -67,9 +63,7 @@ class Language
 
     def []=(key, value)
       case @raw
-      when NilClass
-        @raw = { key => value }
-      when String
+      when NilClass, String
         @raw = { key => value }
       when Array
         @raw << Output.new({ key => value })
@@ -86,9 +80,7 @@ class Language
         case other.raw
         when String
           @raw += other.raw
-        when Array
-          @raw = other.raw
-        when Hash
+        when Array, Hash
           @raw = other.raw
         end
       when Array
@@ -102,9 +94,7 @@ class Language
         end
       when Hash
         case other.raw
-        when String
-          nil
-        when Array
+        when String, Array
           nil
         when Hash
           @raw.merge!(other.raw)
@@ -116,29 +106,21 @@ class Language
       case @raw
       when NilClass
         case other.raw
-        when String
-          @raw = [other]
-        when Array
-          @raw = [other]
-        when Hash
+        when String, Array, Hash
           @raw = [other]
         end
       when String
         case other.raw
         when String
           @raw += other.raw
-        when Array
-          @raw = [other]
-        when Hash
+        when Array, Hash
           @raw = [other]
         end
       when Array
         @raw << other
       when Hash
         case other.raw
-        when String
-          nil
-        when Array
+        when String, Array
           nil
         when Hash
           @raw.merge!(other.raw)

data/lib/language/parser/interuption.rb

@@ -23,7 +23,7 @@ class Language
       end
 
       def column_index
-        cursor - input.lines[...line_index].map(&:size).sum
+        cursor - input.lines[...line_index].sum(&:size)
       end
 
       private

data/lib/language/parser.rb

@@ -19,7 +19,11 @@ class Language
         raise NotEndOfInput, self
       end
 
-      @output.present? ? @output : Output.new(@buffer.empty? ? nil : @buffer)
+      if @output.present?
+        @output
+      else
+        Output.new(@buffer.empty? ? nil : @buffer)
+      end
     end
 
     def consume(n)

data/lib/language/version.rb

@@ -3,4 +3,4 @@
 require_relative "../language"
 
 Language::Version =
-  Gem::Version.new(File.read(File.expand_path("../../../VERSION", __FILE__)))
+  Gem::Version.new(File.read(File.expand_path("../../VERSION", __dir__)))

data/package-lock.json

@@ -0,0 +1,14 @@
+{
+  "name": "language-ruby",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "license": "MIT",
+      "engines": {
+        "node": "22.5.1",
+        "npm": "10.8.2"
+      }
+    }
+  }
+}

data/package.json

@@ -2,7 +2,6 @@
   "license": "MIT",
   "engines": {
     "node": "22.5.1",
-    "yarn": "1.22.22",
     "npm": "10.8.2"
   }
 }

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: language-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: dorian-arguments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dorian-arguments
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -49,6 +49,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".node-version"
+- ".prettierignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -58,8 +59,12 @@ files:
 - LICENSE
 - README.md
 - VERSION
+- bin/bundle
+- bin/bundle-audit
+- bin/bundler-audit
 - bin/language
 - bin/rspec
+- bin/rubocop
 - bin/test
 - language-ruby.gemspec
 - lib/language-ruby.rb
@@ -85,23 +90,24 @@ files:
 - lib/language/parser/str.rb
 - lib/language/parser/str/not_found.rb
 - lib/language/version.rb
+- package-lock.json
 - package.json
 - spec/language_spec.rb
 - spec/spec_helper.rb
-- yarn.lock
 homepage: https://github.com/dorianmariecom/language-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-