code-ruby 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7027d0ca2225f4adf54f980dd7d08b7fa07c10c40c7e04b8e67e651a300f77b7
-  data.tar.gz: f652f053f3bb7710629deea3ad6cb0684c6117f1475cace386c4ea5005649eca
+  metadata.gz: 7a52b2959095228434649a676508dbbf549a6a466363ca25b3ce95c1d5a13de9
+  data.tar.gz: ad2e7947f6d959923e36cecc48816586575f1caee9bfdbbc2da44ca1de9c284a
 SHA512:
-  metadata.gz: 5ecea3358e470e50cb5571c0c5094837a1eb7fd68043e803d18dc3b691686e246cc0cb93a1a89fd4fbe1448b0dc45841883e4938b8510f9df6d45d7091d57447
-  data.tar.gz: 3c0d475b0420dd3a937dd0f2dcff648bc2d1924b0639415c3096e79429dda1e787579a684aa3ce8b236739b590f72ebfb2049c901224288fadfca4ce25c5c183
+  metadata.gz: 6516b0072e0958d93bec52c9c43e138298d03a594f606598ca5572ecf2c02f8343f90b8834287c9a1d6651c8cea350791acbb29df9e57c0c0cdad0bb1e71e06d
+  data.tar.gz: d9ae4f2cca4194d68215c547d632bc21ac64a99d968d511e502a8efce7a6b435dfb2e7d877e3e431ed0320ccca256729121aee6805352588414d29544cc9f094

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

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
           bundler-cache: true
       - run: bin/bundler-audit check --update
   rspec:
-    name: RSpec
+    name: Test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
         with:
           ruby-version: 3.3.0
           bundler-cache: true
-      - run: bin/rspec
+      - run: bin/test
   rubocop:
     name: Rubocop
     runs-on: ubuntu-latest
@@ -29,3 +29,10 @@ jobs:
         with:
           bundler-cache: true
       - run: bin/rubocop
+  yarn-audit:
+    name: Yarn Audit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - run: yarn audit

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.14.1)
+    code-ruby (0.14.4)
       activesupport (~> 7)
       bigdecimal (~> 3)
+      did-you-mean (~> 0)
       json (~> 2)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -29,6 +30,8 @@ GEM
       thor (~> 1.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
+    did-you-mean (0.1.1)
+      levenshtein (>= 0.2.0)
     diff-lcs (1.5.1)
     drb (2.2.1)
     i18n (1.14.4)
@@ -37,6 +40,7 @@ GEM
     language-ruby (0.8.1)
       zeitwerk (~> 2)
     language_server-protocol (3.17.0.3)
+    levenshtein (0.2.2)
     minitest (5.22.3)
     mutex_m (0.2.0)
     parallel (1.24.0)
@@ -44,7 +48,7 @@ GEM
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rainbow (3.1.1)
     rake (13.1.0)
     regexp_parser (2.9.0)
@@ -78,10 +82,10 @@ GEM
     rubocop-minitest (0.35.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.20.2)
+    rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.24.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -115,4 +119,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.6
+   2.5.7

data/README.md

@@ -1,3 +1,3 @@
 # code-ruby
 
-A programming language, like `Code.evaluate("1 + 1") # => 2`
+A programming language

data/bin/test

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+bin/rspec

data/code-ruby.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", "~> 7"
   s.add_dependency "bigdecimal", "~> 3"
+  s.add_dependency "did-you-mean", "~> 0"
   s.add_dependency "json", "~> 2"
   s.add_dependency "language-ruby", "~> 0"
   s.add_dependency "zeitwerk", "~> 2"

data/lib/code/node/left_operation.rb

@@ -6,6 +6,11 @@ class Code
       class Operator < Node
         DOT = "."
         COLON_COLON = "::"
+        AMPERSAND_DOT = "&."
+        OR_KEYWORD = "or"
+        PIPE_PIPE = "||"
+        AND_KEYWORD = "and"
+        AMPERSAND_AMPERSAND = "&&"
 
         attr_reader :operator, :statement
 
@@ -19,6 +24,18 @@ class Code
         def call?
           operator == DOT || operator == COLON_COLON
         end
+
+        def safe_call?
+          operator == AMPERSAND_DOT
+        end
+
+        def or?
+          operator == OR_KEYWORD || operator == PIPE_PIPE
+        end
+
+        def and?
+          operator == AND_KEYWORD || operator == AMPERSAND_AMPERSAND
+        end
       end
 
       def initialize(parsed)
@@ -35,6 +52,16 @@ class Code
         @others.reduce(first) do |left, right|
           if right.call?
             right.statement.evaluate(**args, object: left)
+          elsif right.safe_call?
+            if left.is_an?(Object::Nothing)
+              Object::Nothing.new
+            else
+              right.statement.evaluate(**args, object: left)
+            end
+          elsif right.or? && left.truthy?
+            left
+          elsif right.and? && left.falsy?
+            left
           else
             left.call(
               **args,

data/lib/code/object/json.rb

@@ -8,11 +8,9 @@ class Code
           json
         elsif json.is_a?(::Hash)
           Dictionary.new(
-            json.transform_keys do |key|
-              Json.to_code(key)
-            end.transform_values do |value|
-              Json.to_code(value)
-            end
+            json
+              .transform_keys { |key| Json.to_code(key) }
+              .transform_values { |value| Json.to_code(value) }
           )
         elsif json.is_a?(::Array)
           List.new(json.map { |element| Json.to_code(element) })

data/lib/code/parser/chained_call.rb

@@ -20,7 +20,7 @@ class Code
       end
 
       def right_statement
-        Rescue
+        ChainedCall
       end
 
       def operator

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.14.2")
+Code::Version = Gem::Version.new("0.14.4")

data/lib/code-ruby.rb

@@ -3,6 +3,7 @@
 require "active_support/all"
 require "bigdecimal"
 require "bigdecimal/util"
+require "did_you_mean"
 require "json"
 require "language-ruby"
 require "stringio"

data/spec/code_spec.rb

@@ -273,14 +273,27 @@ RSpec.describe Code do
     %w[1.1.to_json '"1.1"'],
     ["a = {} a.merge!(a: 1) a", "{a: 1}"],
     ["a = {} a.merge(a: 1) a", "{}"],
+    %w[1&.even? false],
+    ["nothing&.even? || 1", "1"],
+    ["nothing&.even? && 1", "nothing"],
+    %w[2&.even? true],
+    ["a = 1 a&.even?", "false"],
+    ["a = 2 a&.even?", "true"],
+    ["a = nothing a&.even?", "nothing"],
+    ["false && puts(:Hello)", "false"],
+    ["true || puts(:Hello)", "true"],
+    ["false and puts(:Hello)", "false"],
+    ["true or puts(:Hello)", "true"],
     ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
-      expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
-      next if Code.evaluate(input).is_a?(Code::Object::Decimal)
-      expect(Code.evaluate(input).to_json).to eq(
-        Code.evaluate(expected).to_json
-      )
+      output = StringIO.new
+      input = Code.evaluate(input, output:)
+      expected = Code.evaluate(expected)
+      expect(input).to eq(expected)
+      expect(output.string).to eq("")
+      next if input.is_a?(Code::Object::Decimal)
+      expect(input.to_json).to eq(expected.to_json)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: did-you-mean
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ files:
 - bin/console
 - bin/rspec
 - bin/rubocop
+- bin/test
 - code-ruby.gemspec
 - lib/code-ruby.rb
 - lib/code.rb