code-ruby 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63a5dc762c3ac1d5e2f37910c24806b092a78f0bc8ed5ad4409f2e6283f7880
-  data.tar.gz: 5cd2966db552e1b06a7946767af43005a670dbe76378e8680524af6abf3a2479
+  metadata.gz: 2885af9560ee132a0d9ab0be653fadd74e54e04975a1673ff98d929e14040088
+  data.tar.gz: 68450cd4d425cc61bccd154f32b7786a2e7f0778ca567a2e19346b017f6e40c2
 SHA512:
-  metadata.gz: 7d364133a93859542602ac10730d4b539e2e090e7b91fa9ffacfec1602edc5701da4ab8c6d1208e6e9a1967983ea2c62d80fbf7aab6df62141da332199ed7796
-  data.tar.gz: ad10fe135a0391fa37d769282b13a1fa7b1423a9226daa147553d91ee0d61f03f8b49d6e7b1c0514709bbf0cb03fe6c64db9ea7a71b10b9761cdcc1cdc95f2a1
+  metadata.gz: f090263fb431fa7d6ab1193bd5735b8ef8c425783eea75c8495537a2f2c80576dbe8a71ecf3d41202eea787687cdf9f2d6ef0b4dcec931e38be9cc28baa2ed50
+  data.tar.gz: d2fbf7f1e6534a1f15e9fca4271b9505fb0229984a53e85d9adbfaaeba5b94535cfde135eede3289f564f06949d0f4bb3c2ff3ac384ffa56596bb802eef2be7e

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+.env

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.0

data/Gemfile

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
 
+ruby "3.3.0"
+
 gem "rspec"
 gem "ruby-prof"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.6.1)
+    code-ruby (0.6.3)
       bigdecimal (~> 3)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -11,7 +11,7 @@ GEM
   specs:
     bigdecimal (3.1.6)
     diff-lcs (1.5.0)
-    language-ruby (0.6.0)
+    language-ruby (0.6.1)
       zeitwerk (~> 2)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -38,5 +38,8 @@ DEPENDENCIES
   rspec
   ruby-prof
 
+RUBY VERSION
+   ruby 3.3.0p0
+
 BUNDLED WITH
    2.5.5

data/bin/code

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "optparse"
 require_relative "../lib/code-ruby"
@@ -9,11 +10,7 @@ OptionParser
   .new do |opts|
     opts.banner = "Usage: template [options]"
 
-    opts.on(
-      "-v",
-      "--version",
-      "Version of template"
-    ) do |input|
+    opts.on("-v", "--version", "Version of template") do |_input|
       puts Code::Version
       exit
     end
@@ -48,10 +45,7 @@ OptionParser
       "Set timeout in seconds"
     ) { |timeout| options[:timeout] = timeout.to_f }
 
-    opts.on(
-      "--profile",
-      "Profile Ruby code"
-    ) do |timeout|
+    opts.on("--profile", "Profile Ruby code") do |_timeout|
       require "ruby-prof"
       options[:profile] = true
     end
@@ -70,9 +64,7 @@ OptionParser
 input = options.fetch(:input, "")
 context = options.fetch(:context, "")
 
-if options[:profile]
-  RubyProf.start
-end
+RubyProf.start if options[:profile]
 
 if options[:parse]
   pp Code::Parser.parse(input).to_raw

data/code-ruby.gemspec

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require "English"
 require_relative "lib/code/version"
 
 Gem::Specification.new do |s|
@@ -7,14 +10,13 @@ Gem::Specification.new do |s|
   s.description = 'A programming language, like Code.evaluate("1 + 1") # => 2'
   s.authors = ["Dorian Marié"]
   s.email = "dorian@dorianmarie.fr"
-  s.files = `git ls-files`.split($/)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.require_paths = ["lib"]
   s.homepage = "https://github.com/dorianmariefr/code-ruby"
   s.license = "MIT"
   s.executables = "code"
 
-  s.add_dependency "zeitwerk", "~> 2"
-  s.add_dependency "language-ruby", "~> 0"
   s.add_dependency "bigdecimal", "~> 3"
+  s.add_dependency "language-ruby", "~> 0"
+  s.add_dependency "zeitwerk", "~> 2"
 end

data/lib/code/node/nothing.rb

@@ -3,7 +3,8 @@
 class Code
   class Node
     class Nothing < Node
-      def initialize(parsed)
+      def initialize(nothing)
+        @nothing = nothing
       end
 
       def evaluate(**_args)

data/lib/code/object/dictionary.rb

@@ -214,7 +214,11 @@ class Code
 
       def code_delete(*arguments, index: Integer.new(0), **globals)
         default =
-          (arguments.last if arguments.last.is_a?(Function) && arguments.size > 1)
+          (
+            if arguments.last.is_a?(Function) && arguments.size > 1
+              arguments.last
+            end
+          )
 
         arguments = arguments[..-2] if default
 
@@ -303,8 +307,8 @@ class Code
         self
       end
 
-      def code_dig(*arguments)
-        raw.dig(*arguments) || Nothing.new
+      def code_dig(*)
+        raw.dig(*) || Nothing.new
       end
 
       def code_each(argument, **globals)
@@ -331,13 +335,17 @@ class Code
         Boolean.new(raw.empty?)
       end
 
-      def code_except(*arguments)
-        self.class.new(raw.except(*arguments))
+      def code_except(*)
+        self.class.new(raw.except(*))
       end
 
       def code_fetch(*arguments, index: Integer.new(0), **globals)
         default =
-          (arguments.last if arguments.last.is_a?(Function) && arguments.size > 1)
+          (
+            if arguments.last.is_a?(Function) && arguments.size > 1
+              arguments.last
+            end
+          )
 
         arguments = arguments[..-2] if default
 
@@ -386,8 +394,8 @@ class Code
         end
       end
 
-      def code_fetch_values(*arguments)
-        List.new(raw.fetch_values(*arguments))
+      def code_fetch_values(*)
+        List.new(raw.fetch_values(*))
       end
 
       def code_five?
@@ -485,7 +493,11 @@ class Code
 
       def code_merge(*arguments, **globals)
         conflict =
-          (arguments.last if arguments.last.is_a?(Function) && arguments.size > 1)
+          (
+            if arguments.last.is_a?(Function) && arguments.size > 1
+              arguments.last
+            end
+          )
 
         arguments = arguments[..-2] if conflict
 

data/lib/code/object/function.rb

@@ -36,9 +36,7 @@ class Code
             if parameter.regular_splat?
               context.code_set(
                 parameter.name,
-                List.new(
-                  arguments.select(&:regular?).map(&:value)
-                )
+                List.new(arguments.select(&:regular?).map(&:value))
               )
             elsif parameter.keyword_splat?
               context.code_set(
@@ -53,7 +51,10 @@ class Code
               context.code_set(parameter.name, argument)
             end
           elsif parameter.keyword?
-            argument = arguments.detect { |argument| argument.name == parameter.name }&.value
+            argument =
+              arguments
+                .detect { |argument| argument.name == parameter.name }
+                &.value
             argument = parameter.evaluate(**globals) if argument.nil?
             context.code_set(parameter.name, argument)
           else

data/lib/code/object.rb

@@ -33,7 +33,7 @@ class Code
         other == self
       end
     end
-    alias eql? ==
+    alias_method :eql?, :==
 
     def call(**args)
       operator = args.fetch(:operator, nil)

data/lib/code/parser/string.rb

@@ -20,7 +20,7 @@ class Code
       end
 
       def backslash
-        str('\\')
+        str("\\")
       end
 
       def opening_curly_bracket

data/lib/code/type/hash.rb

@@ -6,28 +6,26 @@ class Code
       attr_reader :hash
 
       def initialize(hash)
-        @hash = hash
+        @hash = hash.transform_keys { |key| Object::String.new(key) }
       end
 
       def valid?(argument)
         return false unless argument.is_a?(Object::Dictionary)
+
         argument = argument.raw
         (argument.keys + hash.keys).uniq.all? do |key|
           next false unless hash[key] && argument[key]
+
           valid_for?(expected: hash[key], actual: argument[key])
         end
       end
 
       def min_arguments
-        hash.sum do |_, value|
-          min_arguments_of(value)
-        end
+        hash.sum { |_, value| min_arguments_of(value) }
       end
 
       def max_arguments
-        hash.sum do |_, value|
-          max_arguments_of(value)
-        end
+        hash.sum { |_, value| max_arguments_of(value) }
       end
 
       def name

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/type/sig.rb

@@ -23,9 +23,10 @@ class Code
       attr_reader :args, :block, :object
 
       def expected_arguments
-        @expected_arguments ||= Array(block&.call || []).map do |clazz|
-          clazz.is_a?(::Hash) ? Hash.new(clazz) : clazz
-        end
+        @expected_arguments ||=
+          wrap(block&.call || []).map do |clazz|
+            clazz.is_a?(::Hash) ? Hash.new(clazz) : clazz
+          end
       end
 
       def min_arguments_of(clazz)
@@ -53,7 +54,8 @@ class Code
       end
 
       def max_arguments
-        max_arguments = expected_arguments.map { |clazz| max_arguments_of(clazz) }
+        max_arguments =
+          expected_arguments.map { |clazz| max_arguments_of(clazz) }
         max_arguments.include?(nil) ? nil : max_arguments.sum
       end
 
@@ -96,6 +98,10 @@ class Code
         expected.is_a?(Type) ? expected.valid?(actual) : actual.is_a?(expected)
       end
 
+      def wrap(object)
+        object.is_a?(Array) ? object : [object]
+      end
+
       def check_types_of_arguments!
         expected_index = 0
         repeat_index = 0

data/lib/code/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.6.2")
+Code::Version = Gem::Version.new("0.6.4")

data/lib/code-ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bigdecimal"
 require "stringio"
 require "timeout"

data/spec/code/node/call_spec.rb

@@ -3,37 +3,35 @@
 require "spec_helper"
 
 RSpec.describe Code::Node::Call do
-=begin
-  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
+  #   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/object/function_spec.rb

@@ -3,24 +3,22 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::Function do
-=begin
-  [
-    ["even? = (i) => { i.even? } even?(2)", "true"],
-    ["even? = (i:) => { i.even? } even?(i: 2)", "true"],
-    ["add = (a, b) => { a + b } add(1, 2)", "3"],
-    ["minus = (a:, b:) => { a - b } minus(b: 1, a: 2)", "1"]
-  ].each do |input, expected|
-    it "#{input} == #{expected}" do
-      expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
-    end
-  end
-=end
+  #   [
+  #     ["even? = (i) => { i.even? } even?(2)", "true"],
+  #     ["even? = (i:) => { i.even? } even?(i: 2)", "true"],
+  #     ["add = (a, b) => { a + b } add(1, 2)", "3"],
+  #     ["minus = (a:, b:) => { a - b } minus(b: 1, a: 2)", "1"]
+  #   ].each do |input, expected|
+  #     it "#{input} == #{expected}" do
+  #       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
+  #     end
+  #   end
 
   context "valid" do
     [
       "f = () => {} f",
-      "f = (x) => {} f(1)",
-#      "f = (x:) => {} f(x: 1)"
+      "f = (x) => {} f(1)"
+      #      "f = (x:) => {} f(x: 1)"
     ].each do |input|
       it "#{input} is valid" do
         Code.evaluate(input)

data/spec/code/object/list_spec.rb

@@ -3,10 +3,7 @@
 require "spec_helper"
 
 RSpec.describe Code::Object::List do
-  [
-    ["[] == []", "true"],
-    ["[1, 2, 3].sum", "6"],
-  ].each do |input, expected|
+  [["[] == []", "true"], ["[1, 2, 3].sum", "6"]].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
     end

data/spec/code_spec.rb

@@ -109,7 +109,7 @@ RSpec.describe Code do
     ['"Hello \\{name}"', '"Hello \\{" + "name}"'],
     ["'Hello {1}'", '"Hello 1"'],
     ['"Hello {1}"', '"Hello 1"'],
-    %w["Hello".include?("H") true],
+    %w[:Hello.include?(:H) true],
     %w["Hello".downcase :hello],
     ["true ? 1", "1"],
     ["false ? 1", ""],

data/spec/spec_helper.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "../lib/code-ruby"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: language-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
 description: 'A programming language, like Code.evaluate("1 + 1") # => 2'
 email: dorian@dorianmarie.fr
 executables:
@@ -59,7 +59,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
+- ".ruby-version"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -203,30 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A programming language
-test_files:
-- spec/code/node/call_spec.rb
-- spec/code/object/boolean_spec.rb
-- spec/code/object/decimal_spec.rb
-- spec/code/object/dictionary_spec.rb
-- spec/code/object/function_spec.rb
-- spec/code/object/integer_spec.rb
-- spec/code/object/list_spec.rb
-- spec/code/object/nothing_spec.rb
-- spec/code/object/range_spec.rb
-- spec/code/parser/boolean_spec.rb
-- spec/code/parser/chained_call.rb
-- spec/code/parser/dictionary_spec.rb
-- spec/code/parser/function_spec.rb
-- spec/code/parser/group_spec.rb
-- spec/code/parser/if_modifier_spec.rb
-- spec/code/parser/list_spec.rb
-- spec/code/parser/number_spec.rb
-- spec/code/parser/string_spec.rb
-- spec/code/parser_spec.rb
-- spec/code/type_spec.rb
-- spec/code_spec.rb
-- spec/spec_helper.rb
+test_files: []