code-ruby 1.3.0 → 1.5.1

data/lib/code/parser/name.rb

@@ -83,6 +83,10 @@ class Code
         str("do")
       end
 
+      def begin_keyword
+        str("begin")
+      end
+
       def end_keyword
         str("end")
       end
@@ -113,8 +117,9 @@ class Code
 
       def root
         (do_keyword << separator).absent << (
-          else_keyword << separator
-        ).absent << (elsif_keyword << separator).absent <<
+          begin_keyword << separator
+        ).absent << (else_keyword << separator).absent <<
+          (elsif_keyword << separator).absent <<
           (end_keyword << separator).absent << character.repeat(1)
       end
     end

data/lib/code/parser/while.rb

@@ -11,6 +11,10 @@ class Code
         Whitespace
       end
 
+      def whitespace?
+        whitespace.maybe
+      end
+
       def code
         Code
       end
@@ -27,10 +31,37 @@ class Code
         str("end")
       end
 
+      def do_keyword
+        str("do")
+      end
+
+      def begin_keyword
+        str("begin")
+      end
+
       def loop_keyword
         str("loop")
       end
 
+      def opening_curly_bracket
+        str("{")
+      end
+
+      def closing_curly_bracket
+        str("}")
+      end
+
+      def body
+        (
+          (begin_keyword | do_keyword).ignore << whitespace << code <<
+            (whitespace? << end_keyword).maybe.ignore
+        ) |
+          (
+            opening_curly_bracket.ignore << whitespace? << code <<
+              (whitespace? << closing_curly_bracket).maybe.ignore
+          ) | (code << (whitespace? << end_keyword).maybe.ignore)
+      end
+
       def root
         (
           (
@@ -38,7 +69,7 @@ class Code
               (while_keyword | until_keyword).aka(:operator) << whitespace <<
                 statement.aka(:statement)
             ) | (loop_keyword.aka(:operator) << whitespace)
-          ) << code.aka(:body) << end_keyword.maybe
+          ) << body.aka(:body)
         ).aka(:while) | statement
       end
     end

data/lib/code/type/sig.rb

@@ -111,7 +111,7 @@ class Code
         actual_arguments.each do |actual|
           expected = expected_arguments[expected_index]
           if expected.is_a?(Repeat)
-            if valid_for?(expected:, actual:)
+            if valid_for?(expected: expected, actual: actual)
               repeat_index += 1
             elsif repeat_index >= expected.min_arguments
               expected_index += 1
@@ -122,7 +122,7 @@ class Code
                 "#{function}: expected #{expected.name}, got #{actual.inspect}"
               )
             end
-          elsif valid_for?(expected:, actual:)
+          elsif valid_for?(expected: expected, actual: actual)
             expected_index += 1
             repeat_index = 0
           else

data/lib/code/type.rb

@@ -7,7 +7,7 @@ class Code
     end
 
     def repeat(minimum = 0, maximum = nil)
-      Repeat.new(self, minimum:, maximum:)
+      Repeat.new(self, minimum: minimum, maximum: maximum)
     end
 
     def |(other)

data/lib/code.rb

@@ -1,43 +1,50 @@
 # frozen_string_literal: true
 
 class Code
-  GLOBALS = %i[output error context object].freeze
+  GLOBALS = %i[context error input object output source object].freeze
   DEFAULT_TIMEOUT = 0
 
   def initialize(
-    input,
-    output: StringIO.new,
+    source,
+    context: Object::Context.new,
     error: StringIO.new,
+    input: StringIO.new,
+    object: Object::Global.new,
+    output: StringIO.new,
     timeout: DEFAULT_TIMEOUT
   )
+    @context = context
+    @error = error
     @input = input
+    @object = object
     @output = output
-    @error = error
-    @timeout = timeout || DEFAULT_TIMEOUT
-    @context = Object::Context.new
+    @source = source
+    @timeout = timeout
   end
 
-  def self.parse(input, timeout: DEFAULT_TIMEOUT)
-    Timeout.timeout(timeout) { Parser.parse(input).to_raw }
+  def self.parse(source, timeout: DEFAULT_TIMEOUT)
+    Timeout.timeout(timeout) { Parser.parse(source).to_raw }
   end
 
-  def self.evaluate(
-    input,
-    output: StringIO.new,
-    error: StringIO.new,
-    timeout: DEFAULT_TIMEOUT
-  )
-    new(input, output:, error:, timeout:).evaluate
+  def self.evaluate(...)
+    new(...).evaluate
   end
 
   def evaluate
     Timeout.timeout(timeout) do
-      parsed = Code.parse(input)
-      Node::Code.new(parsed).evaluate(context:, output:, error:)
+      Node::Code.new(Code.parse(source)).evaluate(
+        context: context,
+        error: error,
+        input: input,
+        object: object,
+        output: output,
+        source: source,
+        timeout: timeout
+      )
     end
   end
 
   private
 
-  attr_reader :input, :timeout, :output, :error, :context
+  attr_reader :context, :error, :input, :object, :output, :source, :timeout
 end

data/package-lock.json

@@ -6,8 +6,8 @@
     "": {
       "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/code/object/http_spec.rb

@@ -3,73 +3,77 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::Http do
-  %w[get head post put delete options trace patch].each do |verb|
+  VERBS = %w[get head post put delete options trace patch].freeze
+
+  RESPONSE_CODES = {
+    continue: 100,
+    switching_protocols: 101,
+    processing: 102,
+    early_hints: 103,
+    ok: 200,
+    created: 201,
+    accepted: 202,
+    non_authoritative_information: 203,
+    no_content: 204,
+    reset_content: 205,
+    partial_content: 206,
+    multi_status: 207,
+    already_reported: 208,
+    im_used: 226,
+    multiple_choices: 300,
+    moved_permanently: 301,
+    found: 302,
+    see_other: 303,
+    not_modified: 304,
+    use_proxy: 305,
+    reserved: 306,
+    temporary_redirect: 307,
+    permanent_redirect: 308,
+    bad_request: 400,
+    unauthorized: 401,
+    payment_required: 402,
+    forbidden: 403,
+    not_found: 404,
+    method_not_allowed: 405,
+    not_acceptable: 406,
+    proxy_authentication_required: 407,
+    request_timeout: 408,
+    conflict: 409,
+    gone: 410,
+    length_required: 411,
+    precondition_failed: 412,
+    request_entity_too_large: 413,
+    request_uri_too_long: 414,
+    unsupported_media_type: 415,
+    requested_range_not_satisfiable: 416,
+    expectation_failed: 417,
+    misdirected_request: 421,
+    unprocessable_entity: 422,
+    locked: 423,
+    failed_dependency: 424,
+    too_early: 425,
+    upgrade_required: 426,
+    precondition_required: 428,
+    too_many_requests: 429,
+    request_header_fields_too_large: 431,
+    unavailable_for_legal_reasons: 451,
+    internal_server_error: 500,
+    not_implemented: 501,
+    bad_gateway: 502,
+    service_unavailable: 503,
+    gateway_timeout: 504,
+    http_version_not_supported: 505,
+    variant_also_negotiates: 506,
+    insufficient_storage: 507,
+    loop_detected: 508,
+    bandwidth_limit_exceeded: 509,
+    not_extended: 510,
+    network_authentication_required: 511
+  }.freeze
+
+  VERBS.each do |verb|
     describe ".#{verb}" do
-      {
-        continue: 100,
-        switching_protocols: 101,
-        processing: 102,
-        early_hints: 103,
-        ok: 200,
-        created: 201,
-        accepted: 202,
-        non_authoritative_information: 203,
-        no_content: 204,
-        reset_content: 205,
-        partial_content: 206,
-        multi_status: 207,
-        already_reported: 208,
-        im_used: 226,
-        multiple_choices: 300,
-        moved_permanently: 301,
-        found: 302,
-        see_other: 303,
-        not_modified: 304,
-        use_proxy: 305,
-        reserved: 306,
-        temporary_redirect: 307,
-        permanent_redirect: 308,
-        bad_request: 400,
-        unauthorized: 401,
-        payment_required: 402,
-        forbidden: 403,
-        not_found: 404,
-        method_not_allowed: 405,
-        not_acceptable: 406,
-        proxy_authentication_required: 407,
-        request_timeout: 408,
-        conflict: 409,
-        gone: 410,
-        length_required: 411,
-        precondition_failed: 412,
-        request_entity_too_large: 413,
-        request_uri_too_long: 414,
-        unsupported_media_type: 415,
-        requested_range_not_satisfiable: 416,
-        expectation_failed: 417,
-        misdirected_request: 421,
-        unprocessable_entity: 422,
-        locked: 423,
-        failed_dependency: 424,
-        too_early: 425,
-        upgrade_required: 426,
-        precondition_required: 428,
-        too_many_requests: 429,
-        request_header_fields_too_large: 431,
-        unavailable_for_legal_reasons: 451,
-        internal_server_error: 500,
-        not_implemented: 501,
-        bad_gateway: 502,
-        service_unavailable: 503,
-        gateway_timeout: 504,
-        http_version_not_supported: 505,
-        variant_also_negotiates: 506,
-        insufficient_storage: 507,
-        loop_detected: 508,
-        bandwidth_limit_exceeded: 509,
-        not_extended: 510,
-        network_authentication_required: 511
-      }.each do |status, code|
+      RESPONSE_CODES.each do |status, code|
         it "returns #{code} as code and #{status} as status" do
           expect(Code.evaluate(<<~INPUT)).to eq(Code.evaluate(<<~OUTPUT))
             response = Http.#{verb}("https://httpbin.org/status/#{code}")

data/spec/code_spec.rb

@@ -339,6 +339,8 @@ RSpec.describe Code do
     ["[1, 2, 3].any?(&:even?)", "true"],
     ["[1, 2, 3].none?", "false"],
     ["[1, 2, 3].none?(&:even?)", "false"],
+    ["subject = 1 { subject }", "{ subject: 1 }"],
+    ["subject = 1 { subject: }", "{ subject: 1 }"],
     ["'{1} {2}'", "'1 2'"],
     %w[Json.parse("1") 1],
     %w[{a:1}.to_query "a=1"],
@@ -346,20 +348,22 @@ RSpec.describe Code do
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       output = StringIO.new
-      code_input = described_class.evaluate(input, output:)
+      code_input = described_class.evaluate(input, output: output)
       code_expected = described_class.evaluate(expected)
       expect(code_input).to eq(code_expected)
       expect(output.string).to eq("")
       next if code_input.is_a?(Code::Object::Decimal)
 
       expect(code_input.to_json).to eq(code_expected.to_json)
+      YAML.unsafe_load(code_input.to_yaml)
+      YAML.unsafe_load(code_expected.to_yaml)
     end
   end
 
   [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
     it "#{input} prints #{expected}" do
       output = StringIO.new
-      described_class.evaluate(input, output:)
+      described_class.evaluate(input, output: output)
       expect(output.string).to eq(expected)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Dorian Marié
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,7 +164,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: a programming language for the internet
-email: dorian@dorianmarie.fr
+email: dorian@dorianmarie.com
 executables:
 - code
 extensions: []
@@ -185,13 +185,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO
 - VERSION
 - bin/bundle
 - bin/bundle-audit
 - bin/bundler-audit
 - bin/code
-- bin/console
 - bin/dorian
 - bin/rspec
 - bin/rubocop
@@ -338,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/TODO

@@ -1,219 +0,0 @@
-to_query
-to_h
-include?
-&
-shelljoin
-*
-+
-blank?
--
-present?
-from
-extract!
-at
-fetch
-union
-difference
-intersection
-intersect?
-push
-append
-pop
-shift
-unshift
-each_index
-join
-rotate
-rotate!
-sort!
-sort_by!
-collect!
-map!
-select!
-filter!
-keep_if
-values_at
-sort
-delete_if
-reject!
-delete_at
-count
-fill
-find_index
-rassoc
-select
-filter
-uniq!
-reject
-collect
-map
-compact!
-assoc
-flatten!
-permutation
-transpose
-flatten
-repeated_combination
-product
-combination
-repeated_permutation
-any?
-all?
-minmax
-bsearch_index
-none?
-one?
-bsearch
-reverse_each
-deconstruct
-|
-first
-zip
-take
-take_while
-drop
-drop_while
-cycle
-shuffle!
-shuffle
-sample
-<=>
-<<
-sum
-uniq
-compact
-==
-second
-pack
-to
-[]
-[]=
-empty?
-eql?
-insert
-compact_blank!
-index
-rindex
-replace
-clear
-max
-min
-hash
-inspect
-including
-excluding
-length
-size
-third
-without
-each
-fourth
-fifth
-forty_two
-third_to_last
-second_to_last
-extract_options!
-in_groups_of
-reverse
-to_ary
-concat
-prepend
-reverse!
-in_groups
-to_a
-to_s
-split
-inquiry
-to_sentence
-as_json
-pretty_print
-delete
-to_formatted_s
-pretty_print_cycle
-to_xml
-to_fs
-slice
-slice!
-dig
-to_json
-chunk
-slice_before
-slice_after
-slice_when
-chunk_while
-maximum
-chain
-to_set
-lazy
-many?
-sole
-exclude?
-minimum
-pick
-index_by
-index_with
-pluck
-in_order_of
-compact_blank
-find
-entries
-sort_by
-grep
-grep_v
-detect
-find_all
-filter_map
-flat_map
-collect_concat
-inject
-reduce
-partition
-group_by
-tally
-min_by
-max_by
-minmax_by
-member?
-each_with_index
-each_entry
-each_slice
-each_cons
-each_with_object
-to_yaml
-duplicable?
-in?
-with
-presence_in
-presence
-acts_like?
-html_safe?
-with_options
-try!
-try
-pretty_print_inspect
-singleton_class
-dup
-itself
-kind_of?
-is_a?
-display
-class_eval
-extend
-clone
-frozen?
-then
-tap
-yield_self
-===
-class
-!~
-nil?
-respond_to?
-freeze
-object_id
-to_enum
-enum_for
-pretty_inspect
-equal?
-!
-!=

data/bin/console

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require_relative "../lib/code-ruby"
-
-binding.irb