code-ruby 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1de692db935f0bf2da829334bd120b8fa972a686b700c529379f4ac4631d34b
-  data.tar.gz: 1fc45c35736818f606f17ccb0876be91d6b40c71415dab4e5b66693f3ace40d5
+  metadata.gz: 64c95ed04939ffd5a6ef493a612ecd1e6b8d877d84be3d3f5bf3420a91642651
+  data.tar.gz: e8b9314d611e70a621f003ddf70d1e848a34dd479c907701c7bbddfdba7c136c
 SHA512:
-  metadata.gz: e4f23cc4451bc13bed8b98068707c026bbf3e603849872e6c3593d0fd18d81b62afdc27105437138156bd7edc88716b2864a4653b2af49efe915ad0d097d3b1a
-  data.tar.gz: 533109d631965b229c82a46ed04f5158a956f38eaa1154cdaed66f0a6f50943e2e7fb47ec8f81f229b14bb24b611fe1b32ffa3420ecf44eb5a61eb902cee78b7
+  metadata.gz: f4fd860c6788054132fab89667660dde0907f816cc9c07d251569a3599b1504a23b620145173243cc2d2e0f22cd35bedec8e695bd589b195de22adf6ee12ddbc
+  data.tar.gz: 627970ecc40ebc5831be9a099fab08d8372564fd036baa247ae1b953ffa693feda02da7c9d23dbbe217afd57ec807184ecb40f75a59cdd97aab97ff897ee44dd

data/bin/code

@@ -1,13 +1,13 @@
 #!/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',
+  profiler: "text",
   input: "",
   context: "",
   parse: false
@@ -15,17 +15,17 @@ options = {
 
 OptionParser
   .new do |opts|
-    opts.banner = 'Usage: code [options]'
+    opts.banner = "Usage: code [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)
 
@@ -33,35 +33,35 @@ 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
@@ -74,21 +74,21 @@ if options[:parse]
   pp Code::Parser.parse(options[:input]).to_raw
 else
   print Code.evaluate(
-    options[:input],
-    options[:context],
-    output: $stdout,
-    error: $stderr,
-    timeout: options[:timeout]
-  )
+          options[:input],
+          options[:context],
+          output: $stdout,
+          error: $stderr,
+          timeout: options[:timeout]
+        )
 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,7 +6,10 @@ class Code
       def initialize(parsed)
         @whole = parsed.delete(:whole)
 
-        @exponent = Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(:exponent)
+        @exponent =
+          Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(
+          :exponent
+        )
 
         super(parsed)
       end

data/lib/code/node/call.rb

@@ -47,7 +47,7 @@ class Code
             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,7 +6,10 @@ class Code
       def initialize(parsed)
         @decimal = parsed.delete(:decimal)
 
-        @exponent = Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(:exponent)
+        @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/node/string.rb

@@ -20,7 +20,16 @@ class Code
           end
 
           def evaluate(**_args)
-            ::Code::Object::String.new(@text)
+            ::Code::Object::String.new(
+              @text
+                .gsub('\n', "\n")
+                .gsub('\r', "\r")
+                .gsub('\t', "\t")
+                .gsub('\b', "\b")
+                .gsub('\f', "\f")
+                .gsub('\a', "\a")
+                .gsub('\e', "\e")
+            )
           end
         end
 

data/lib/code/object/decimal.rb

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

data/lib/code/object/dictionary.rb

@@ -215,7 +215,9 @@ 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
@@ -340,7 +342,9 @@ 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
@@ -490,7 +494,9 @@ 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

@@ -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/global.rb

@@ -12,7 +12,7 @@ class Code
         arguments = args.fetch(:arguments, [])
         output = args.fetch(:output)
         context = args.fetch(:context)
-        multi_fetch(args, *GLOBALS)
+        globals = multi_fetch(args, *GLOBALS)
         value = arguments.first&.value
 
         case operator.to_s
@@ -28,6 +28,9 @@ class Code
         when "Dictionary"
           sig(args) { Object.maybe }
           value ? value.code_to_dictionnary : Class.new(Dictionary)
+        when "fetch"
+          sig(args) { [Object, Function.maybe] }
+          context.code_fetch(*arguments.map(&:value), **globals)
         when "Function"
           sig(args) { Object.maybe }
           value ? value.code_to_function : Class.new(Function)

data/lib/code/object/integer.rb

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

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

data/lib/code/parser/list.rb

@@ -38,8 +38,7 @@ class Code
 
       def root
         (
-          opening_square_bracket.ignore << whitespace? <<
-            element.repeat <<
+          opening_square_bracket.ignore << whitespace? << element.repeat <<
             (whitespace? << closing_square_bracket.ignore).maybe
         ).aka(:list) | String
       end

data/lib/code/ruby.rb

@@ -55,7 +55,7 @@ class Code
     def from_code
       if code?
         if code_nothing? || code_boolean? || code_decimal? || code_integer? ||
-            code_range? || code_string?
+             code_range? || code_string?
           raw.raw
         elsif code_dictionnary?
           raw

data/lib/code/type/hash.rb

@@ -15,7 +15,10 @@ class Code
         argument = argument.raw
         (argument.keys + hash.keys).uniq.all? do |key|
           if hash[key]
-            valid_for?(expected: hash[key], actual: argument[key] || Object::Nothing.new)
+            valid_for?(
+              expected: hash[key],
+              actual: argument[key] || Object::Nothing.new
+            )
           else
             false
           end

data/lib/code/type/maybe.rb

@@ -10,8 +10,7 @@ class Code
       end
 
       def valid?(argument)
-        !argument ||
-          argument.is_a?(Object::Nothing) ||
+        !argument || argument.is_a?(Object::Nothing) ||
           valid_for?(expected: clazz, actual: argument)
       end
 

data/lib/code/version.rb

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

data/lib/code.rb

@@ -37,7 +37,13 @@ class Code
         if context == EMPTY_STRING
           Object::Context.new
         else
-          Code.evaluate(context, timeout:, output:, error:, ruby:).code_to_context
+          Code.evaluate(
+            context,
+            timeout:,
+            output:,
+            error:,
+            ruby:
+          ).code_to_context
         end
 
       context = ruby.merge(context)

data/spec/code/object/string_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+RSpec.describe Code::Object::String do
+  [
+    [":a", "a"],
+    [":a_b_c_0123", "a_b_c_0123"],
+    ['"Hello"', "Hello"],
+    ["'Hello'", "Hello"],
+    ['"Hello\nWorld"', "Hello\nWorld"],
+    ["'Hello\\nWorld'", "Hello\nWorld"],
+  ].each do |input, expected|
+    it "(#{input}).to_s == #{expected.inspect}" do
+      expect(Code.evaluate(input).to_s).to eq(expected)
+    end
+  end
+end

data/spec/code_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 
 RSpec.describe Code do
   [
-    ["9975×14÷8", "17456.25"],
+    %w[9975×14÷8 17456.25],
     ["\r\n", "nothing"],
     ["1 + 1", "2"],
     ["a = 1", "1"],
@@ -148,7 +148,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
@@ -159,9 +159,23 @@ RSpec.describe Code do
     )
   end
 
+  describe "#fetch" do
+    it "returns the value when present" do
+      expect(Code.evaluate("fetch(:downcase)", "{ downcase: 1 }")).to eq(
+        Code.evaluate("1")
+      )
+    end
+
+    it "returns the default value when not present" do
+      expect(Code.evaluate("fetch(:downcase) { 2 }")).to eq(
+        Code.evaluate("2")
+      )
+    end
+  end
+
   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
 
@@ -170,7 +184,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Dorian Marié
@@ -174,6 +174,7 @@ files:
 - spec/code/object/list_spec.rb
 - spec/code/object/nothing_spec.rb
 - spec/code/object/range_spec.rb
+- spec/code/object/string_spec.rb
 - spec/code/parser/boolean_spec.rb
 - spec/code/parser/chained_call.rb
 - spec/code/parser/dictionary_spec.rb