code-ruby 1.0.0 → 1.1.0

data/lib/code/object/dictionary.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Dictionary < ::Code::Object
-      def initialize(*args, **kargs, &_block)
+      def initialize(*args, **kargs, &)
         @raw = args.map(&:to_h).reduce({}, &:merge).merge(kargs)
       end
 
@@ -298,9 +298,7 @@ class Code
         self
       end
 
-      def code_eight?
-        code_size.code_eight?
-      end
+      delegate :code_eight?, to: :code_size
 
       def code_empty?
         Boolean.new(raw.empty?)
@@ -355,18 +353,14 @@ class Code
         List.new(raw.fetch_values(*))
       end
 
-      def code_five?
-        code_size.code_five?
-      end
+      delegate :code_five?, to: :code_size
 
       def code_flatten(level = nil)
         level = Integer.new(-1) if level.nil? || level.falsy?
         code_to_list.code_flatten(level)
       end
 
-      def code_four?
-        code_size.code_four?
-      end
+      delegate :code_four?, to: :code_size
 
       def code_get(key)
         raw[key] || Nothing.new
@@ -507,13 +501,9 @@ class Code
         self
       end
 
-      def code_nine?
-        code_size.code_nine?
-      end
+      delegate :code_nine?, to: :code_size
 
-      def code_one?
-        code_size.code_one?
-      end
+      delegate :code_one?, to: :code_size
 
       def code_select!(argument, **globals)
         if argument.is_a?(Class)
@@ -554,13 +544,9 @@ class Code
         value
       end
 
-      def code_seven?
-        code_size.code_seven?
-      end
+      delegate :code_seven?, to: :code_size
 
-      def code_six?
-        code_size.code_six?
-      end
+      delegate :code_six?, to: :code_size
 
       def code_size
         Integer.new(raw.size)
@@ -574,13 +560,9 @@ class Code
         Boolean.new(raw >= other.raw)
       end
 
-      def code_ten?
-        code_size.code_ten?
-      end
+      delegate :code_ten?, to: :code_size
 
-      def code_three?
-        code_size.code_three?
-      end
+      delegate :code_three?, to: :code_size
 
       def code_to_context
         Context.new(raw)
@@ -607,17 +589,13 @@ class Code
         )
       end
 
-      def code_two?
-        code_size.code_two?
-      end
+      delegate :code_two?, to: :code_size
 
       def code_values
         List.new(raw.values)
       end
 
-      def code_zero?
-        code_size.code_zero?
-      end
+      delegate :code_zero?, to: :code_size
     end
   end
 end

data/lib/code/object/duration.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Duration < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         raw = args.first || 0.seconds
         raw = raw.raw if raw.is_an?(Object)
         raw = raw.iso8601 if raw.is_an?(::ActiveSupport::Duration)

data/lib/code/object/function.rb

@@ -5,7 +5,7 @@ class Code
     class Function < Object
       attr_reader :parameters, :body
 
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         @parameters = List.new(args.first.presence || [])
         @parameters.raw.map! { |parameter| Parameter.new(parameter) }
         @body = Code.new(args.second.presence || Nothing.new)

data/lib/code/object/global.rb

@@ -70,7 +70,7 @@ class Code
           arguments.any? ? String.new(*arguments.raw) : Class.new(String)
         when "Time"
           sig(args) { Object.repeat }
-          arguments.any? ? Time.new(*arguments.raw) : Class.new(Time)
+          arguments.any? ? Time.zone.local(*arguments.raw) : Class.new(Time)
         when "Context"
           sig(args) { Object.repeat }
           arguments.any? ? Context.new(*arguments.raw) : Class.new(Context)

data/lib/code/object/html.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Html < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*_args, **_kargs, &)
         @raw = nil
       end
 

data/lib/code/object/integer.rb

@@ -3,12 +3,12 @@
 class Code
   class Object
     class Integer < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         whole = args.first || 0
         exponent = args.second || 0
         whole = whole.raw if whole.is_an?(Object)
         exponent = exponent.raw if exponent.is_an?(Object)
-        @raw = whole.to_i * 10**exponent
+        @raw = whole.to_i * (10**exponent)
       rescue FloatDomainError
         raise Error, "#{decimal.inspect} * 10**#{exponent.inspect} is invalid"
       end

data/lib/code/object/json.rb

@@ -20,14 +20,12 @@ class Code
           Decimal.new(json)
         elsif json.is_an?(::Integer)
           Integer.new(json)
-        elsif json.is_a?(::TrueClass)
-          Boolean.new(json)
-        elsif json.is_a?(::FalseClass)
+        elsif json.is_a?(::TrueClass) || json.is_a?(::FalseClass)
           Boolean.new(json)
         elsif json.is_a?(::NilClass)
           Nothing.new(json)
         else
-          Nothing.new
+          raise Error, "#{json.inspect} not supported"
         end
       end
     end

data/lib/code/object/list.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class List < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         raw = args.first
         raw = raw.raw if raw.is_an?(Object)
         @raw = raw.to_a
@@ -305,7 +305,7 @@ class Code
       end
 
       def code_join(separator = nil)
-        separator ||= String.new("")
+        separator ||= +""
 
         String.new(raw.join(separator.raw))
       end
@@ -326,9 +326,7 @@ class Code
         raw.inject(&:code_plus) || Nothing.new
       end
 
-      def any?
-        raw.any?
-      end
+      delegate :any?, to: :raw
     end
   end
 end

data/lib/code/object/nothing.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Nothing < Object
-      def initialize(*_args, **_kargs, &_block)
+      def initialize(*_args, **_kargs, &)
         @raw = nil
       end
 

data/lib/code/object/parameter.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class Parameter < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         @raw = Dictionary.new(args.first.presence || {})
       end
 
@@ -19,10 +19,6 @@ class Code
         Boolean.new(raw.code_get(String.new(:keyword?)))
       end
 
-      def code_keyword?
-        Boolean.new(raw.code_get(String.new(:keyword?)))
-      end
-
       def code_regular_splat?
         Boolean.new(raw.code_get(String.new(:regular_splat?)))
       end

data/lib/code/object/range.rb

@@ -5,7 +5,7 @@ class Code
     class Range < Object
       attr_reader :left, :right, :options, :exclude_end
 
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         @left = args.first.presence || Integer.new(0)
         @right = args.second.presence || Integer.new(0)
         @options = Dictionary.new(args.third.presence || {})

data/lib/code/object/string.rb

@@ -3,7 +3,7 @@
 class Code
   class Object
     class String < Object
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         raw = args.first || Nothing.new
         raw = raw.raw if raw.is_a?(Object)
         @raw = raw.to_s

data/lib/code/object/time.rb

@@ -5,7 +5,7 @@ class Code
     class Time < Object
       DEFAULT_ZONE = "Etc/UTC"
 
-      def initialize(*args, **_kargs, &_block)
+      def initialize(*args, **_kargs, &)
         ::Time.zone ||= DEFAULT_ZONE
         raw = args.first
         raw = raw.raw if raw.is_an?(Object)

data/lib/code/object.rb

@@ -104,7 +104,7 @@ class Code
         String.new(self)
       when "to_time"
         sig(args)
-        Time.new(self)
+        Time.zone.local(self)
       when "as_json"
         sig(args)
         code_as_json
@@ -187,7 +187,7 @@ class Code
     end
 
     def self.multi_fetch(hash, *keys)
-      keys.map { |key| [key, hash.fetch(key)] }.to_h
+      keys.to_h { |key| [key, hash.fetch(key)] }
     end
 
     def self.sig(args, &)
@@ -200,7 +200,7 @@ class Code
     end
 
     def self.inspect
-      to_s
+      name
     end
 
     def self.truthy?
@@ -242,7 +242,7 @@ class Code
         other == self
       end
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
     def call(**args)
       operator = args.fetch(:operator, nil)
@@ -318,7 +318,7 @@ class Code
         String.new(self)
       when "to_time"
         sig(args)
-        Time.new(self)
+        Time.zone.local(self)
       when "as_json"
         sig(args)
         code_as_json
@@ -409,7 +409,7 @@ class Code
     end
 
     def multi_fetch(hash, *keys)
-      keys.map { |key| [key, hash.fetch(key)] }.to_h
+      keys.to_h { |key| [key, hash.fetch(key)] }
     end
 
     def sig(args, &)
@@ -417,13 +417,7 @@ class Code
       nil
     end
 
-    def to_s
-      raw.to_s
-    end
-
-    def inspect
-      to_s
-    end
+    delegate :to_s, :inspect, to: :raw
 
     def truthy?
       true

data/lib/code/parser/string.rb

@@ -20,7 +20,7 @@ class Code
       end
 
       def backslash
-        str("\\")
+        str('\\')
       end
 
       def opening_curly_bracket
@@ -41,17 +41,17 @@ class Code
 
       def single_quoted_text_part
         (
-          backslash.ignore << opening_curly_bracket |
-            backslash.ignore << single_quote |
-            single_quote.absent << opening_curly_bracket.absent << any
+          (backslash.ignore << opening_curly_bracket) |
+            (backslash.ignore << single_quote) |
+            (single_quote.absent << opening_curly_bracket.absent << any)
         ).repeat(1)
       end
 
       def double_quoted_text_part
         (
-          backslash.ignore << opening_curly_bracket |
-            backslash.ignore << double_quote |
-            double_quote.absent << opening_curly_bracket.absent << any
+          (backslash.ignore << opening_curly_bracket) |
+            (backslash.ignore << double_quote) |
+            (double_quote.absent << opening_curly_bracket.absent << any)
         ).repeat(1)
       end
 

data/lib/code/type/repeat.rb

@@ -21,7 +21,7 @@ class Code
 
       def max_arguments
         max_arguments = max_arguments_of(clazz)
-        (max_arguments.nil? || maximum.nil?) ? nil : maximum * max_arguments
+        max_arguments.nil? || maximum.nil? ? nil : maximum * max_arguments
       end
 
       def name

data/lib/code/version.rb

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

data/lib/code-ruby.rb

@@ -15,5 +15,5 @@ loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
 
 class Object
-  alias_method :is_an?, :is_a?
+  alias is_an? is_a?
 end

data/package-lock.json

@@ -0,0 +1,14 @@
+{
+  "name": "code-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"
   }
 }

data/spec/code/node/call_spec.rb

@@ -1,37 +1,3 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-
-RSpec.describe Code::Node::Call do
-  #   let(:context) { <<~CONTEXT }
-  #     render = (*args, **kargs, &block) => {
-  #       [args, kargs, block&.call(:dorian)]
-  #     }
-  #
-  #     { render:, user: { name: :Dorian } }"
-  #   CONTEXT
-  #
-  #   [
-  #     ["render", "[[], {}, nothing]"],
-  #     ["render()", "[[], {}, nothing]"],
-  #     ["render(user)", "[[user], {}, nothing]"],
-  #     [
-  #       "render(user, first_name: :Dorian)",
-  #       "[[user], { first_name: :Dorian }, nothing]"
-  #     ],
-  #     ["render { }", "[[], {}, nothing]"],
-  #     ["render do end", "[[], {}, nothing]"],
-  #     ["render { |name| name.upcase }", "[[], {}, :Dorian]"],
-  #     ["render(user) { |name| name.upcase }", "[[user], {}, :Dorian]"],
-  #     ["render(user) do |name| name.upcase end", "[[user], {}, :Dorian]"],
-  #     ["render { :Dorian }", "[[], {}, :Dorian]"],
-  #     ["render(user) { :Dorian }", "[[user], {}, :Dorian]"],
-  #     ["render(user) do :Dorian end", "[[user], {}, :Dorian]"]
-  #   ].each do |input, expected|
-  #     it "#{input} == #{expected}" do
-  #       expect(Code.evaluate(input, context)).to eq(
-  #         Code.evaluate(expected, context)
-  #       )
-  #     end
-  #   end
-end

data/spec/code/parser_spec.rb

@@ -17,13 +17,13 @@ RSpec.describe Code::Parser do
     "nothing nothing nothing"
   ].each do |input, _output|
     it input.inspect do
-      Code::Parser.parse(input)
+      described_class.parse(input)
     end
   end
 
   Dir["spec/fixtures/code/parser/**/*.code"].each do |filename|
     it "parses #{filename}" do
-      Code::Parser.parse(File.read(filename))
+      described_class.parse(File.read(filename))
     end
   end
 end

data/spec/code/type_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Code::Type do
   describe "valid" do
     ["1 + 2", "2 * 3.4"].each do |input|
       it input do
-        expect { Code.evaluate(input) }.to_not raise_error
+        expect { Code.evaluate(input) }.not_to raise_error
       end
     end
   end

data/spec/code_spec.rb

@@ -3,81 +3,79 @@
 require "spec_helper"
 
 RSpec.describe Code do
-  %w[
-    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','/')
-  ].each { |input| it(input) { Code.evaluate(input) } }
-
-  ["Time.hour >= 6 and Time.hour <= 23"].each do |input|
-    it(input) { Code.evaluate(input) }
-  end
+  (
+    %w[
+      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','/')
+    ] + ["Time.hour >= 6 and Time.hour <= 23"]
+  ).each { |input| it(input) { described_class.evaluate(input) } }
 
   [
     [
@@ -317,11 +315,12 @@ RSpec.describe Code do
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       output = StringIO.new
-      input = Code.evaluate(input, output:)
-      expected = Code.evaluate(expected)
+      input = described_class.evaluate(input, output:)
+      expected = described_class.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
@@ -329,13 +328,13 @@ RSpec.describe Code do
   [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
     it "#{input} prints #{expected}" do
       output = StringIO.new
-      Code.evaluate(input, output:)
+      described_class.evaluate(input, output:)
       expect(output.string).to eq(expected)
     end
   end
 
   it "doesn't crash with dictionnary as parameter" do
-    Code.evaluate(<<~INPUT)
+    described_class.evaluate(<<~INPUT)
       [
         {
           videos: [{}]