code-ruby 1.5.6 → 1.6.0

data/lib/code/parser/equal.rb

@@ -52,7 +52,7 @@ class Code
       end
 
       def right_statement
-        OrKeyword
+        Statement
       end
 
       def operator

data/lib/code/parser/equality.rb

@@ -19,7 +19,7 @@ class Code
         str("<")
       end
 
-      def exclamation_point
+      def exclamation_mark
         str("!")
       end
 
@@ -32,9 +32,10 @@ class Code
       end
 
       def operator
-        (equal << equal << equal) | (equal << equal) |
-          (lesser << equal << greater) | (exclamation_point << equal) |
-          (equal << tilde) | (tilde << equal) | (exclamation_point << tilde)
+        (exclamation_mark << equal << equal) | (equal << equal << equal) |
+          (equal << equal) | (lesser << equal << greater) |
+          (exclamation_mark << equal) | (equal << tilde) | (tilde << equal) |
+          (exclamation_mark << tilde)
       end
     end
   end

data/lib/code/parser/if.rb

@@ -51,6 +51,10 @@ class Code
         str("elsif")
       end
 
+      def elsunless_keyword
+        str("elsunless")
+      end
+
       def else_keyword
         str("else")
       end
@@ -76,8 +80,9 @@ class Code
             statement.aka(:first_statement) << body.aka(:first_body) <<
             (
               (
-                elsif_keyword.aka(:operator) << whitespace <<
-                  statement.aka(:statement) << body.aka(:body)
+                (elsif_keyword | elsunless_keyword).aka(
+                  :operator
+                ) << whitespace << statement.aka(:statement) << body.aka(:body)
               ) |
                 (
                   else_keyword << whitespace <<

data/lib/code/parser/name.rb

@@ -99,7 +99,47 @@ class Code
         str("else")
       end
 
-      def special_character
+      def while_keyword
+        str("while")
+      end
+
+      def until_keyword
+        str("until")
+      end
+
+      def if_keyword
+        str("if")
+      end
+
+      def unless_keyword
+        str("unless")
+      end
+
+      def elsunless_keyword
+        str("elsunless")
+      end
+
+      def true_keyword
+        str("true")
+      end
+
+      def false_keyword
+        str("false")
+      end
+
+      def nothing_keyword
+        str("nothing")
+      end
+
+      def exclamation_mark
+        str("!")
+      end
+
+      def question_mark
+        str("?")
+      end
+
+      def reserved_character
         ampersand | equal | pipe | dot | colon | comma | space | newline |
           opening_curly_bracket | closing_curly_bracket | opening_parenthesis |
           closing_parenthesis | opening_square_bracket |
@@ -108,19 +148,27 @@ class Code
       end
 
       def character
-        special_character.absent << any
+        reserved_character.absent << any
       end
 
       def separator
-        special_character | any.absent
+        reserved_character | any.absent
+      end
+
+      def special_characters
+        exclamation_mark | question_mark
+      end
+
+      def keyword
+        do_keyword | begin_keyword | end_keyword | while_keyword |
+          until_keyword | if_keyword | elsif_keyword | else_keyword |
+          unless_keyword | elsunless_keyword | true_keyword | false_keyword |
+          nothing_keyword
       end
 
       def root
-        (do_keyword << separator).absent << (
-          begin_keyword << separator
-        ).absent << (else_keyword << separator).absent <<
-          (elsif_keyword << separator).absent <<
-          (end_keyword << separator).absent << character.repeat(1)
+        (keyword << separator).absent << special_characters.absent <<
+          character.repeat(1)
       end
     end
   end

data/lib/code/parser/negation.rb

@@ -3,7 +3,7 @@
 class Code
   class Parser
     class Negation < Language
-      def exclamation_point
+      def exclamation_mark
         str("!")
       end
 
@@ -16,7 +16,7 @@ class Code
       end
 
       def operator
-        exclamation_point | tilde | plus
+        exclamation_mark | tilde | plus
       end
 
       def negation

data/lib/code.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Code
-  GLOBALS = %i[context error input object output source object].freeze
+  GLOBALS = %i[context error input object output source].freeze
   DEFAULT_TIMEOUT = 0
 
   def initialize(

data/spec/code/object/decimal_spec.rb

@@ -24,7 +24,6 @@ RSpec.describe Code::Object::Decimal do
     %w[-1.123.floor(2) -1.13],
     %w[1.1.round 1],
     %w[1.123.round(2) 1.12],
-    %w[1.2.clone 1.2],
     %w[0.0.zero? true],
     %w[1.2.truncate 1],
     %w[1.234.truncate(2) 1.23],

data/spec/code/object/http_spec.rb

@@ -3,77 +3,81 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::Http do
-  VERBS = %w[get head post put delete options trace patch].freeze
+  def self.verbs
+    %w[get head post put delete options trace patch]
+  end
 
-  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
+  def self.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
+    }
+  end
 
-  VERBS.each do |verb|
+  verbs.each do |verb|
     describe ".#{verb}" do
-      RESPONSE_CODES.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/object/integer_spec.rb

@@ -24,7 +24,6 @@ RSpec.describe Code::Object::Integer do
     %w[1234.floor(-2) 1200],
     %w[1.round 1],
     %w[1234.round(-2) 1200],
-    %w[1.clone 1],
     %w[0.zero? true],
     %w[1.truncate 1],
     %w[1234.truncate(-2) 1200],

data/spec/code/parser/if_modifier_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe Code::Parser::IfModifier do
     ["1 if false", "nothing"],
     ["1 unless true", "nothing"],
     ["1 unless false", "1"],
-    ["a = 0 a += 1 while a < 10 a", "10"],
-    ["a = 0 a += 1 until a > 10 a", "11"]
+    ["a = 0 (a += 1) while a < 10 a", "10"],
+    ["a = 0 (a += 1) until a > 10 a", "11"]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))

data/spec/code_spec.rb

@@ -4,136 +4,146 @@ require "spec_helper"
 
 RSpec.describe Code do
   (
-    %w[
-      {}.zero?
-      {}.any?
-      {}.many?
-      1.zero?
-      1.any?
-      1.many?
-      1.0.zero?
-      1.0.any?
-      1.0.many?
-      [].zero?
-      [].any?
-      [].many?
-      Base64
-      Base64.new
-      Smtp
-      Smtp.new
-      Time.monday?
-      Time.tuesday?
-      Time.wednesday?
-      Time.thursday?
-      Time.friday?
-      Time.saturday?
-      Time.sunday?
-      Time.now.monday?
-      Time.now.tuesday?
-      Time.now.wednesday?
-      Time.now.thursday?
-      Time.now.friday?
-      Time.now.saturday?
-      Time.now.sunday?
-      Time.now.second
-      Time.now.seconds
-      Time.now.minute
-      Time.now.minutes
-      Time.now.hour
-      Time.now.hours
-      Time.now.day
-      Time.now.days
-      Time.now.month
-      Time.now.months
-      Time.now.year
-      Time.now.years
-      Time.second
-      Time.seconds
-      Time.minute
-      Time.minutes
-      Time.hour
-      Time.hours
-      Time.day
-      Time.days
-      Time.month
-      Time.months
-      Time.year
-      Time.years
-      1.day.ago
-      1.day.from_now
-      1.hour.ago
-      1.hour.from_now
-      2.days.ago
-      2.days.from_now
-      2.hours.ago
-      2.hours.ago.hour
-      2.hours.from_now
-      2.hours.from_now.hour
-      Time.hour
-      Date.hour
-      Boolean.new
-      Boolean.new(true)
-      Boolean.new(false)
-      Class.new
-      Class.new(Boolean)
-      Class.new(Class)
-      Context.new
-      Context.new(a:1)
-      Date.new
-      Date.new.hour
-      Date.new("2024-03-05")
-      Date.new("2024-03-05").hour
-      Date.today
-      Date.yesterday
-      Date.tomorrow
-      Date.tomorrow.hour
-      Decimal.new
-      Decimal.new(0)
-      Decimal.new(1.2)
-      Dictionary.new
-      Dictionary.new(a:1)
-      Duration.new
-      Duration.new(1.day)
-      Duration.new("P1D")
-      Function.new
-      Integer.new
-      Integer.new(0)
-      Integer.new(1)
-      Integer.new(1.2)
-      List.new
-      List.new([])
-      List.new([1,2])
-      Nothing.new
-      Nothing.new(1)
-      Object.new
-      Object.new(1)
-      Range.new
-      Range.new(1,2)
-      Range.new(-1)
-      Range.new(1,2,exclude_end:false)
-      Range.new(1,2,exclude_end:true)
-      String.new
-      String.new(:hello)
-      Time.new
-      Time.new("2024-03-05.06:10:59.UTC")
-      Time.now
-      Time.tomorrow
-      Time.yesterday
-      Time.tomorrow
-      Code.new
-      Parameter.new
-      IdentifierList.new
-      IdentifierList.new([])
-      Time.new(nothing).before?
-      Html.link_to
-      Html.link_to('/')
-      Html.link_to('Home','/')
-      Json.parse('1')
-      Json.parse('[]')
-      Json.parse('{}')
-      Json.parse('random-string')
-      {}["".to_string]
-    ] + ["Time.hour >= 6 and Time.hour <= 23"]
+    [
+      "{ a: 1, b: 2 }.transform_values { |key| key.upcase }",
+      "{ a: { b: [1, 2, 3, 4] } }.dig(:a, :b, 2)",
+      "{ a: 1, b: 2 }.transform_values { |key, value, index| index * 2 }",
+      "{ a: 1, b: 2 }.transform_values { |key, value, index, dictionary| dictionary.a }",
+      "sum = (a, b: 2) => { a + b } sum(1)",
+      "Object.new !== Object.new"
+    ] +
+      %w[
+        :abc.size
+        Date.new.change
+        {}.zero?
+        {}.any?
+        {}.many?
+        1.zero?
+        1.any?
+        1.many?
+        1.0.zero?
+        1.0.any?
+        1.0.many?
+        [].zero?
+        [].any?
+        [].many?
+        Base64
+        Base64.new
+        Smtp
+        Smtp.new
+        Time.monday?
+        Time.tuesday?
+        Time.wednesday?
+        Time.thursday?
+        Time.friday?
+        Time.saturday?
+        Time.sunday?
+        Time.now.monday?
+        Time.now.tuesday?
+        Time.now.wednesday?
+        Time.now.thursday?
+        Time.now.friday?
+        Time.now.saturday?
+        Time.now.sunday?
+        Time.now.second
+        Time.now.seconds
+        Time.now.minute
+        Time.now.minutes
+        Time.now.hour
+        Time.now.hours
+        Time.now.day
+        Time.now.days
+        Time.now.month
+        Time.now.months
+        Time.now.year
+        Time.now.years
+        Time.second
+        Time.seconds
+        Time.minute
+        Time.minutes
+        Time.hour
+        Time.hours
+        Time.day
+        Time.days
+        Time.month
+        Time.months
+        Time.year
+        Time.years
+        1.day.ago
+        1.day.from_now
+        1.hour.ago
+        1.hour.from_now
+        2.days.ago
+        2.days.from_now
+        2.hours.ago
+        2.hours.ago.hour
+        2.hours.from_now
+        2.hours.from_now.hour
+        Time.hour
+        Date.hour
+        Boolean.new
+        Boolean.new(true)
+        Boolean.new(false)
+        Class.new
+        Class.new(Boolean)
+        Class.new(Class)
+        Context.new
+        Context.new(a:1)
+        Date.new
+        Date.new.hour
+        Date.new("2024-03-05")
+        Date.new("2024-03-05").hour
+        Date.today
+        Date.yesterday
+        Date.tomorrow
+        Date.tomorrow.hour
+        Decimal.new
+        Decimal.new(0)
+        Decimal.new(1.2)
+        Dictionary.new
+        Dictionary.new(a:1)
+        Duration.new
+        Duration.new(1.day)
+        Duration.new("P1D")
+        Function.new
+        Integer.new
+        Integer.new(0)
+        Integer.new(1)
+        Integer.new(1.2)
+        List.new
+        List.new([])
+        List.new([1,2])
+        Nothing.new
+        Nothing.new(1)
+        Object.new
+        Object.new(1)
+        Range.new
+        Range.new(1,2)
+        Range.new(-1)
+        Range.new(1,2,exclude_end:false)
+        Range.new(1,2,exclude_end:true)
+        String.new
+        String.new(:hello)
+        Time.new
+        Time.new("2024-03-05.06:10:59.UTC")
+        Time.now
+        Time.tomorrow
+        Time.yesterday
+        Time.tomorrow
+        Code.new
+        Parameter.new
+        IdentifierList.new
+        IdentifierList.new([])
+        Time.new(nothing).before?
+        Html.link_to
+        Html.link_to('/')
+        Html.link_to('Home','/')
+        Json.parse('1')
+        Json.parse('[]')
+        Json.parse('{}')
+        Json.parse('random-string')
+        {}["".to_string]
+      ] + ["Time.hour >= 6 and Time.hour <= 23"]
   ).each { |input| it(input) { described_class.evaluate(input) } }
 
   [
@@ -258,8 +268,8 @@ RSpec.describe Code do
     ["Class(true, 1)", "Boolean"],
     ["Class.new(Boolean, Time)", "Boolean"],
     ["Class.new(Time, Boolean)", "Time"],
-    ["Date(2024, 3, 2).to_string", ":2024-03-02"],
-    ["Date(2024,3, 2).to_string", ":2024-03-02"],
+    ['Date("2024-3-2").to_string', ":2024-03-02"],
+    ['Date("2024-3-2").to_string', ":2024-03-02"],
     ["Decimal(1, :2)", "100"],
     ["Decimal(:1, 2)", "100.0"],
     ["Decimal.new(1, :2)", "100"],