code-ruby 3.0.6 → 3.0.7

data/lib/code-ruby.rb

@@ -21,152 +21,19 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
 
-module WordNumberComparaisons
-  def zero?
-    zero?
-  end
-
-  def one?
-    self == 1
-  end
-
-  def two?
-    self == 2
-  end
-
-  def three?
-    self == 3
-  end
-
-  def four?
-    self == 4
-  end
-
-  def five?
-    self == 5
-  end
-
-  def six?
-    self == 6
-  end
-
-  def seven?
-    self == 7
-  end
-
-  def eight?
-    self == 8
-  end
-
-  def nine?
-    self == 9
-  end
-
-  def ten?
-    self == 10
-  end
-end
-
-class Object
-  alias is_an? is_a?
-
-  def to_code
-    raise NotImplementedError, "to_code not defined on #{self.class.name}"
-  end
-end
-
-class Class
-  def to_code
-    Code::Object::Class.new(self)
-  end
-end
-
-class Module
-  def to_code
-    Code::Object::Class.new(self)
-  end
-end
-
-class NilClass
-  def to_code
-    Code::Object::Nothing.new(self)
-  end
-end
-
-class TrueClass
-  def to_code
-    Code::Object::Boolean.new(self)
-  end
-end
-
-class FalseClass
-  def to_code
-    Code::Object::Boolean.new(self)
-  end
-end
-
-class String
-  def to_code
-    Code::Object::String.new(self)
-  end
-end
-
-class Symbol
-  def to_code
-    Code::Object::String.new(self)
-  end
-end
-
-class Integer
-  include WordNumberComparaisons
-
-  def to_code
-    Code::Object::Integer.new(self)
-  end
-end
-
-class Float
-  include WordNumberComparaisons
-
-  def to_code
-    Code::Object::Decimal.new(self)
-  end
-end
-
-class BigDecimal
-  include WordNumberComparaisons
-
-  def to_code
-    Code::Object::Decimal.new(self)
-  end
-end
-
-class Array
-  def to_code
-    Code::Object::List.new(self)
-  end
-end
-
-class Hash
-  def to_code
-    Code::Object::Dictionary.new(self)
-  end
-end
-
-module Nokogiri
-  module XML
-    class Element
-      def to_code
-        Code::Object::Html.new(self)
-      end
-    end
-  end
-end
-
-module ActiveSupport
-  class TimeWithZone
-    def to_code
-      Code::Object::Time.new(self)
-    end
-  end
-end
+require_relative "code/extensions/word_number_comparaisons"
+require_relative "code/extensions/object"
+require_relative "code/extensions/class"
+require_relative "code/extensions/module"
+require_relative "code/extensions/nil_class"
+require_relative "code/extensions/true_class"
+require_relative "code/extensions/false_class"
+require_relative "code/extensions/string"
+require_relative "code/extensions/symbol"
+require_relative "code/extensions/integer"
+require_relative "code/extensions/float"
+require_relative "code/extensions/big_decimal"
+require_relative "code/extensions/array"
+require_relative "code/extensions/hash"
+require_relative "code/extensions/nokogiri"
+require_relative "code/extensions/active_support"

data/spec/bin/code_spec.rb

@@ -5,6 +5,9 @@ require "spec_helper"
 
 RSpec.describe "bin/code" do
   let(:bin) { File.expand_path("../../bin/code", __dir__) }
+  let(:tmp_glob_dir) { File.expand_path("../tmp/code_glob", __dir__) }
+
+  after { FileUtils.rm_rf(tmp_glob_dir) }
 
   it "formats input with -f" do
     stdout, stderr, status = Open3.capture3(bin, "-f", "{a:1}")
@@ -13,4 +16,33 @@ RSpec.describe "bin/code" do
     expect(stderr).to eq("")
     expect(stdout).to eq("{ a: 1 }")
   end
+
+  it "formats quoted globbed files with -f" do
+    FileUtils.mkdir_p(File.join(tmp_glob_dir, "a"))
+    FileUtils.mkdir_p(File.join(tmp_glob_dir, "b"))
+    File.write(File.join(tmp_glob_dir, "a", "first.code"), "{a:1}")
+    File.write(File.join(tmp_glob_dir, "b", "second.code"), "{b:2}")
+
+    stdout, stderr, status =
+      Open3.capture3(bin, "-f", File.join(tmp_glob_dir, "**", "*.code"))
+
+    expect(status.success?).to be(true)
+    expect(stderr).to eq("")
+    expect(stdout).to eq("{ a: 1 }\n\n{ b: 2 }")
+  end
+
+  it "formats shell-expanded globbed files with -f" do
+    FileUtils.mkdir_p(File.join(tmp_glob_dir, "a"))
+    FileUtils.mkdir_p(File.join(tmp_glob_dir, "b"))
+    first = File.join(tmp_glob_dir, "a", "first.code")
+    second = File.join(tmp_glob_dir, "b", "second.code")
+    File.write(first, "{a:1}")
+    File.write(second, "{b:2}")
+
+    stdout, stderr, status = Open3.capture3(bin, "-f", first, second)
+
+    expect(status.success?).to be(true)
+    expect(stderr).to eq("")
+    expect(stdout).to eq("{ a: 1 }\n\n{ b: 2 }")
+  end
 end

data/spec/code/format_spec.rb

@@ -6,19 +6,16 @@ require "json"
 RSpec.describe Code::Format do
   describe ".format" do
     [
-      ["Time.now.second", "Time.now.second"],
-      ["{}", "{}"],
+      %w[Time.now.second Time.now.second],
+      %w[{} {}],
       ["[]", "[]"],
-      ['""', '""'],
-      ["100000", "100_000"],
-      ["1000000", "1_000_000"],
-      ["1.0000000001", "1.000_000_000_1"],
+      %w["" ""],
+      %w[100000 100_000],
+      %w[1000000 1_000_000],
+      %w[1.0000000001 1.000_000_000_1],
       ["{a:1}", "{ a: 1 }"],
       ["[1,2,3]", "[1, 2, 3]"],
-      [
-        "[1, 2, 3].select { |n| n.even? }",
-        "[1, 2, 3].select { |n| n.even? }"
-      ],
+      ["[1, 2, 3].select { |n| n.even? }", "[1, 2, 3].select { |n| n.even? }"],
       [
         "if true 1 elsif false 2 else 3 end",
         "if true\n  1\nelsif false\n  2\nelse\n  3\nend"

data/spec/code/node/call_spec.rb

@@ -3,9 +3,7 @@
 require "spec_helper"
 
 RSpec.describe "parser call" do
-  [
-    "f(end: 2)"
-  ].each do |input|
+  ["f(end: 2)"].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)
     end

data/spec/code/object/function_spec.rb

@@ -39,8 +39,7 @@ RSpec.describe Code::Object::Function do
   end
 
   it "captures self for constructor-like functions that return self" do
-    result =
-      Code.evaluate(<<~CODE)
+    result = Code.evaluate(<<~CODE)
         User = (given_name:, family_name:, birth_date:) => {
           self.given_name = given_name.to_string.presence
           self.family_name = family_name.to_string.presence
@@ -74,8 +73,7 @@ RSpec.describe Code::Object::Function do
   end
 
   it "supports constructor methods on functions" do
-    result =
-      Code.evaluate(<<~CODE)
+    result = Code.evaluate(<<~CODE)
         User = (given_name:, family_name:) => {
           self.given_name = given_name
           self.family_name = family_name
@@ -103,8 +101,7 @@ RSpec.describe Code::Object::Function do
   end
 
   it "supports extending constructors and forwarding super arguments" do
-    result =
-      Code.evaluate(<<~CODE)
+    result = Code.evaluate(<<~CODE)
         Person = (given_name:, family_name:) => {
           self.given_name = given_name
           self.family_name = family_name
@@ -135,8 +132,7 @@ RSpec.describe Code::Object::Function do
   end
 
   it "distinguishes super from super()" do
-    result =
-      Code.evaluate(<<~CODE)
+    result = Code.evaluate(<<~CODE)
         Person = (given_name:, family_name:) => {
           self.full_name = () => {
             [given_name, family_name].join(" ")

data/spec/code/object/http_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code::Object::Http do
+  describe ".code_get" do
+    it "wraps connection reset errors as Code::Error" do
+      allow_any_instance_of(Net::HTTP).to receive(:request).and_raise(
+        Errno::ECONNRESET,
+        "Connection reset by peer - SSL_connect"
+      )
+
+      expect do
+        described_class.code_get(
+          Code::Object::String.new("https://httpbin.org/status/200")
+        )
+      end.to raise_error(Code::Error, "http error")
+    end
+  end
+end

data/spec/code/object/ics_spec.rb

@@ -4,8 +4,7 @@ require "spec_helper"
 
 RSpec.describe Code::Object::Ics do
   it "normalizes binary event strings before json serialization" do
-    source =
-      <<~ICS
+    source = <<~ICS
         BEGIN:VCALENDAR
         VERSION:2.0
         PRODID:-//code-ruby//EN
@@ -21,12 +20,13 @@ RSpec.describe Code::Object::Ics do
 
     events = described_class.code_parse(Code::Object::String.new(source.b))
 
-    expect { expect(events.to_json).to include("Joséphine") }.not_to output.to_stderr
+    expect do
+      expect(events.to_json).to include("Joséphine")
+    end.not_to output.to_stderr
   end
 
   it "serializes comma-separated descriptions as strings" do
-    source =
-      <<~ICS
+    source = <<~ICS
         BEGIN:VCALENDAR
         VERSION:2.0
         PRODID:-//code-ruby//EN

data/spec/code/object/list_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Code::Object::List do
     ["[] + []", "[]"],
     ["[1, 2, 3].second", "2"],
     ["[1, 2, 3].third", "3"],
-    ["(1..100).to_list.one_hundredth", "100"],
+    %w[(1..100).to_list.one_hundredth 100],
     ["[1, 2, 3].one_hundredth", "nothing"]
   ].each do |input, expected|
     it "#{input} == #{expected}" do

data/spec/code/parser_spec.rb

@@ -27,4 +27,26 @@ RSpec.describe Code::Parser do
       described_class.parse(File.read(filename))
     end
   end
+
+  it "raises instead of hanging when lexing makes no progress" do
+    parser = described_class.new('"hello"')
+
+    allow(parser).to receive(:scan_string).and_return({ parts: [], index: 0 })
+
+    expect { parser.send(:lex, '"hello"') }.to raise_error(
+      Code::Parser::Error,
+      /lexer made no progress/
+    )
+  end
+
+  it "raises instead of hanging when parsing makes no progress" do
+    parser = described_class.new("a\n.b")
+
+    allow(parser).to receive(:skip_newlines)
+
+    expect { parser.parse }.to raise_error(
+      Code::Parser::Error,
+      /parser made no progress/
+    )
+  end
 end