code-ruby 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2885af9560ee132a0d9ab0be653fadd74e54e04975a1673ff98d929e14040088
-  data.tar.gz: 68450cd4d425cc61bccd154f32b7786a2e7f0778ca567a2e19346b017f6e40c2
+  metadata.gz: 22e265eb7980e078c895b92b71d1e5b0e3e3a35cb833537bdc0f1614ce2ac76b
+  data.tar.gz: 9d2f374bb8a627bc3b0fbb2325630a692fa01bef52a9a81750db643454163f60
 SHA512:
-  metadata.gz: f090263fb431fa7d6ab1193bd5735b8ef8c425783eea75c8495537a2f2c80576dbe8a71ecf3d41202eea787687cdf9f2d6ef0b4dcec931e38be9cc28baa2ed50
-  data.tar.gz: d2fbf7f1e6534a1f15e9fca4271b9505fb0229984a53e85d9adbfaaeba5b94535cfde135eede3289f564f06949d0f4bb3c2ff3ac384ffa56596bb802eef2be7e
+  metadata.gz: b43ac0ea5ad94cdf569518df455be616c0a1a21ba90ec548c278080eaf36b8466707960ff07bc90739a3ebb2cd9e31e481da4646eebd47ef9cd4e5d543b7c7a2
+  data.tar.gz: 33c41f911e6a9043f79a2c89a58e373fd200715f35bfcd8c0bea5554a10c2eca2c8b4fd145f4676c33a7723e5d5fb15179a6af568b079e43170fa0ce09eced15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.6.3)
+    code-ruby (0.6.4)
       bigdecimal (~> 3)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -42,4 +42,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.5
+   2.5.6

data/bin/code

@@ -1,24 +1,24 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "optparse"
-require_relative "../lib/code-ruby"
+require 'optparse'
+require_relative '../lib/code-ruby'
 
-options = { timeout: 0, profile: false, profiler: "text" }
+options = { timeout: 0, profile: false, profiler: 'text' }
 
 OptionParser
   .new do |opts|
-    opts.banner = "Usage: template [options]"
+    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
 
     opts.on(
-      "-i INPUT",
-      "--input=INPUT",
-      "Input in the code language (String or File)"
+      '-i INPUT',
+      '--input=INPUT',
+      'Input in the code language (String or File)'
     ) do |input|
       input = File.read(input) if File.exist?(input)
 
@@ -26,43 +26,43 @@ OptionParser
     end
 
     opts.on(
-      "-c CONTEXT",
-      "--context=CONTEXT",
-      "Context in the code language (String or File)"
+      '-c CONTEXT',
+      '--context=CONTEXT',
+      'Context in the code language (String or File)'
     ) do |context|
       context = File.read(context) if File.exist?(context)
 
       options[:context] = context
     end
 
-    opts.on("-p", "--parse", "Get parser results for input") do |parse|
+    opts.on('-p', '--parse', 'Get parser results for input') do |parse|
       options[:parse] = parse
     end
 
     opts.on(
-      "-t TIMEOUT",
-      "--timeout=TIMEOUT",
-      "Set timeout in seconds"
+      '-t TIMEOUT',
+      '--timeout=TIMEOUT',
+      'Set timeout in seconds'
     ) { |timeout| options[:timeout] = timeout.to_f }
 
-    opts.on("--profile", "Profile Ruby code") do |_timeout|
-      require "ruby-prof"
+    opts.on('--profile', 'Profile Ruby code') do |_timeout|
+      require 'ruby-prof'
       options[:profile] = true
     end
 
     opts.on(
-      "--profiler TYPE",
-      "Profiler output type (text (default) or html)"
+      '--profiler TYPE',
+      'Profiler output type (text (default) or html)'
     ) do |profiler|
-      require "ruby-prof"
+      require 'ruby-prof'
       options[:profile] = true
       options[:profiler] = profiler
     end
   end
   .parse!
 
-input = options.fetch(:input, "")
-context = options.fetch(:context, "")
+input = options.fetch(:input, '')
+context = options.fetch(:context, '')
 
 RubyProf.start if options[:profile]
 
@@ -74,10 +74,10 @@ end
 
 if options[:profile]
   result = RubyProf.stop
-  if options[:profiler] == "text"
+  if options[:profiler] == 'text'
     printer = RubyProf::FlatPrinter.new(result)
     printer.print($stdout)
-  elsif options[:profiler] == "html"
+  elsif options[:profiler] == 'html'
     printer = RubyProf::GraphHtmlPrinter.new(result)
     printer.print($stdout)
   else

data/lib/code/node/base_10.rb

@@ -6,9 +6,7 @@ class Code
       def initialize(parsed)
         @whole = parsed.delete(:whole)
 
-        if parsed.key?(:exponent)
-          @exponent = Node::Statement.new(parsed.delete(:exponent))
-        end
+        @exponent = Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(:exponent)
 
         super(parsed)
       end

data/lib/code/node/call.rb

@@ -40,13 +40,14 @@ class Code
         @arguments.each do |argument|
           if argument.keyword?
             if arguments.last&.value.is_a?(Object::Dictionary)
-              arguments.last.value[argument.name] = argument.evaluate(
-                **args
-              ).value
+              arguments.last.value.code_set(
+                argument.name,
+                argument.evaluate(**args).value
+              )
             else
               arguments << Object::Argument.new(
                 Object::Dictionary.new(
-                  { argument.name => argument.evaluate(**args).value }
+                  {argument.name => argument.evaluate(**args).value}
                 )
               )
             end

data/lib/code/node/decimal.rb

@@ -6,9 +6,7 @@ class Code
       def initialize(parsed)
         @decimal = parsed.delete(:decimal)
 
-        if parsed.key?(:exponent)
-          @exponent = Node::Statement.new(parsed.delete(:exponent))
-        end
+        @exponent = Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(:exponent)
 
         super(parsed)
       end

data/lib/code/node/dictionary.rb

@@ -8,7 +8,7 @@ class Code
           if parsed.key?(:statement)
             @key = Node::Statement.new(parsed.delete(:statement))
           elsif parsed.key?(:name)
-            @key = Node::String.new([{ text: parsed.delete(:name) }])
+            @key = Node::String.new([{text: parsed.delete(:name)}])
           end
 
           @value = Node::Code.new(parsed.delete(:value)) if parsed[:value]

data/lib/code/node/if.rb

@@ -32,21 +32,21 @@ class Code
 
       def evaluate(**args)
         if @first_operator == IF_KEYWORD &&
-             @first_statement.evaluate(**args).truthy?
+            @first_statement.evaluate(**args).truthy?
           @first_body.evaluate(**args)
         elsif @first_operator == UNLESS_KEYWORD &&
-              @first_statement.evaluate(**args).falsy?
+            @first_statement.evaluate(**args).falsy?
           @first_body.evaluate(**args)
         else
           @elses.each do |elses|
             if elses.operator == ELSIF_KEYWORD &&
-                 elses.statement.evaluate(**args).truthy?
+                elses.statement.evaluate(**args).truthy?
               return elses.body.evaluate(**args)
             elsif elses.operator == IF_KEYWORD &&
-                  elses.statement.evaluate(**args).truthy?
+                elses.statement.evaluate(**args).truthy?
               return elses.body.evaluate(**args)
             elsif elses.operator == UNLESS_KEYWORD &&
-                  elses.statement.evaluate(**args).falsy?
+                elses.statement.evaluate(**args).falsy?
               return elses.body.evaluate(**args)
             elsif elses.operator == ELSE_KEYWORD
               return elses.body.evaluate(**args)

data/lib/code/object/decimal.rb

@@ -9,9 +9,7 @@ class Code
         @raw = BigDecimal(decimal)
 
         return unless exponent
-        unless exponent.is_a?(Number)
-          raise ::Code::Error::TypeError, "exponent is not a number"
-        end
+        raise ::Code::Error::TypeError, "exponent is not a number" unless exponent.is_a?(Number)
 
         @raw *= 10**exponent.raw
       end

data/lib/code/object/dictionary.rb

@@ -215,9 +215,7 @@ class Code
       def code_delete(*arguments, index: Integer.new(0), **globals)
         default =
           (
-            if arguments.last.is_a?(Function) && arguments.size > 1
-              arguments.last
-            end
+            arguments.last if arguments.last.is_a?(Function) && arguments.size > 1
           )
 
         arguments = arguments[..-2] if default
@@ -342,9 +340,7 @@ class Code
       def code_fetch(*arguments, index: Integer.new(0), **globals)
         default =
           (
-            if arguments.last.is_a?(Function) && arguments.size > 1
-              arguments.last
-            end
+            arguments.last if arguments.last.is_a?(Function) && arguments.size > 1
           )
 
         arguments = arguments[..-2] if default
@@ -494,9 +490,7 @@ class Code
       def code_merge(*arguments, **globals)
         conflict =
           (
-            if arguments.last.is_a?(Function) && arguments.size > 1
-              arguments.last
-            end
+            arguments.last if arguments.last.is_a?(Function) && arguments.size > 1
           )
 
         arguments = arguments[..-2] if conflict

data/lib/code/object/function.rb

@@ -76,7 +76,7 @@ class Code
               signature.last[parameter.name] = Object
               signature
             else
-              signature + [{ parameter.name => Object }]
+              signature + [{parameter.name => Object}]
             end
           else
             signature + [Object]

data/lib/code/object/integer.rb

@@ -10,9 +10,7 @@ class Code
 
         return unless exponent
 
-        unless exponent.is_a?(Number)
-          raise Code::Error::TypeError, "exponent is not a number"
-        end
+        raise Code::Error::TypeError, "exponent is not a number" unless exponent.is_a?(Number)
 
         @raw *= 10**exponent.raw
       end
@@ -40,15 +38,9 @@ class Code
         when "**", "power"
           sig(args) { Number }
           code_power(value)
-        when "+", "plus"
-          sig(args) { Object.maybe }
-          value ? code_plus(value) : self
         when "+", "plus", "self"
           sig(args) { Object.maybe }
           value ? code_plus(value) : code_self
-        when "-", "minus"
-          sig(args) { Number.maybe }
-          value ? code_minus(value) : code_unary_minus
         when "-", "minus", "unary_minus"
           sig(args) { Number.maybe }
           value ? code_minus(value) : code_unary_minus

data/lib/code/object/ruby_function.rb

@@ -25,8 +25,8 @@ class Code
           args
             .select(&:keyword?)
             .map do |argument|
-              [argument.name.to_sym, Ruby.from_code(argument.value)]
-            end
+            [argument.name.to_sym, Ruby.from_code(argument.value)]
+          end
             .to_h
 
         Ruby.to_code(raw.call(*regular_arguments, **keyword_arguments))

data/lib/code/object/string.rb

@@ -68,7 +68,7 @@ class Code
           [
             {
               function: {
-                parameters: [{ name: "_" }],
+                parameters: [{name: "_"}],
                 body: [
                   {
                     left_operation: {
@@ -78,7 +78,7 @@ class Code
                         }
                       },
                       others: [
-                        { operator: ".", statement: { call: { name: raw } } }
+                        {operator: ".", statement: {call: {name: raw}}}
                       ]
                     }
                   }

data/lib/code/object.rb

@@ -149,9 +149,7 @@ class Code
     end
 
     def hash
-      unless respond_to?(:raw)
-        raise NotImplementedError, "#{self.class.name}#hash"
-      end
+      raise NotImplementedError, "#{self.class.name}#hash" unless respond_to?(:raw)
 
       [self.class, raw].hash
     end

data/lib/code/ruby.rb

@@ -54,19 +54,8 @@ class Code
 
     def from_code
       if code?
-        if code_nothing?
-          raw.raw
-        elsif code_boolean?
-          raw.raw
-        elsif code_decimal?
-          raw.raw
-        elsif code_integer?
-          raw.raw
-        elsif code_nothing?
-          raw.raw
-        elsif code_range?
-          raw.raw
-        elsif code_string?
+        if code_nothing? || code_boolean? || code_decimal? || code_integer? ||
+            code_range? || code_string?
           raw.raw
         elsif code_dictionnary?
           raw
@@ -153,10 +142,6 @@ class Code
       raw.is_a?(::Code::Object::Integer)
     end
 
-    def code_nothing?
-      raw.is_a?(::Code::Object::Nothing)
-    end
-
     def code_range?
       raw.is_a?(::Code::Object::Range)
     end

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.6.4")
+Code::Version = Gem::Version.new("0.6.5")

data/spec/code_spec.rb

@@ -141,7 +141,7 @@ RSpec.describe Code do
   end
 
   it "converts nil" do
-    ruby = Code::Ruby.from_code(Code.evaluate("a", ruby: { a: nil }))
+    ruby = Code::Ruby.from_code(Code.evaluate("a", ruby: {a: nil}))
 
     expect(ruby).to eq(nil)
   end
@@ -154,7 +154,7 @@ RSpec.describe Code do
 
   it "works with nested objects" do
     expect(
-      Code.evaluate("items.first.title", ruby: { items: [{ title: "Hello" }] })
+      Code.evaluate("items.first.title", ruby: {items: [{title: "Hello"}]})
     ).to eq(Code.evaluate(":Hello"))
   end
 
@@ -163,7 +163,7 @@ RSpec.describe Code do
       Code.evaluate(
         "items.map { |item| item.title }",
         ruby: {
-          items: [{ title: "Hello" }]
+          items: [{title: "Hello"}]
         }
       )
     ).to eq(Code.evaluate("[:Hello]"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal