code-ruby 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63a5dc762c3ac1d5e2f37910c24806b092a78f0bc8ed5ad4409f2e6283f7880
-  data.tar.gz: 5cd2966db552e1b06a7946767af43005a670dbe76378e8680524af6abf3a2479
+  metadata.gz: 7ab3a0f0749357d4065315d58b613f8d44cba5f567b6ae33444cff90c1dedde0
+  data.tar.gz: b48a0d5c713c0eb33c53bd30fafaaa7bc03f657a7ac7a5c70ae257eedf677cc0
 SHA512:
-  metadata.gz: 7d364133a93859542602ac10730d4b539e2e090e7b91fa9ffacfec1602edc5701da4ab8c6d1208e6e9a1967983ea2c62d80fbf7aab6df62141da332199ed7796
-  data.tar.gz: ad10fe135a0391fa37d769282b13a1fa7b1423a9226daa147553d91ee0d61f03f8b49d6e7b1c0514709bbf0cb03fe6c64db9ea7a71b10b9761cdcc1cdc95f2a1
+  metadata.gz: e137c317b1d87a1a61d30ce70d4bccdd75417ab002c6ad57249081f2e8b8189e4194efaad6e277f68448fa8f55b1402e337d5387d34449b69fce4425b17d72e7
+  data.tar.gz: 2bdfced46d44b0ef4787a998fb17ce073b38a939d044a9f48f39c74dc42adbec3962622792f9852579203f090a66db78dc45aa118d25ff325089cde03cb00c93

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

@@ -2,5 +2,7 @@ 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.2)
       bigdecimal (~> 3)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -38,5 +38,8 @@ DEPENDENCIES
   rspec
   ruby-prof
 
+RUBY VERSION
+   ruby 3.3.0p0
+
 BUNDLED WITH
    2.5.5

data/bin/code

@@ -9,11 +9,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 +44,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 +63,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/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
 
@@ -337,7 +341,11 @@ class Code
 
       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
 
@@ -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/string.rb

@@ -33,7 +33,7 @@ class Code
           sig(args)
           code_downcase
         when "include?"
-          sig(args) { String }
+          sig(args) { { a: String } }
           code_include?(value)
         when "reverse"
           sig(args)

data/lib/code/type/hash.rb

@@ -6,7 +6,7 @@ class Code
       attr_reader :hash
 
       def initialize(hash)
-        @hash = hash
+        @hash = hash.transform_keys { |key| Object::String.new(key) }
       end
 
       def valid?(argument)
@@ -19,15 +19,11 @@ class Code
       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/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,3 @@
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.6.2")
+Code::Version = Gem::Version.new("0.6.3")

data/spec/code/object/function_spec.rb

@@ -19,8 +19,8 @@ RSpec.describe Code::Object::Function do
   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],
+    [":Hello.include?(a: :H)", true],
     %w["Hello".downcase :hello],
     ["true ? 1", "1"],
     ["false ? 1", ""],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 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
@@ -59,7 +59,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
+- ".ruby-version"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - README.md