ariadne 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d15963f0e72fcd20333f6227ced3e4dba5e3d5a7c2cc295440dcc98c9bb863a
-  data.tar.gz: bd90b66bad183442d7661fd72566ef11223d45f705817bcae2b2026efc928a3a
+  metadata.gz: a71929c19a3e8fff0abc484843c1762edf12ecf6f45d90a6e0394cb4743aa243
+  data.tar.gz: e5959ac737aaf0392957164769dcb56e72ca73362da8431fcbb4a9d47fcc835b
 SHA512:
-  metadata.gz: 42c4370c8b426696d7b336fc42e40c60509569f60e1260a37aa952c1ee013b8a0ef94784032907574d256eb53071e5d8563ec5a9539b555e5abb08d4165b4bff
-  data.tar.gz: 30d1d3b263dee8c331d9f8d23b8bf8b9e422fd66b7f24a9488f2b4c3b8dc464a461201a0820475231628904a9a071d3ee496e8cd5cb27b0803818ecf2fce4bab
+  metadata.gz: 1bec945c8243605fb555b88e817c9cfe84268e06b4ae110ef2c5b472f86360deb5c91d4cfa3a8e3cf9220f90259bddcfe902fcd829fbe53d2090722bb6f454d9
+  data.tar.gz: fbb773617d74362a76c461c0c01283239175fea01d8915e3b810299b13b7849863cdefb1f8875592c3421da5a19945236736c7ec2df296a0d4fc72f8d666082c

data/lib/ariadne/log.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 require "open3"
-require "ariadne/helpers/text"
-require "ariadne/helpers/value_format"
+require "ariadne/string/color"
 
 module Ariadne
   class Log
-    include Helpers::Text
-    include Helpers::ValueFormat
-
     def initialize(seam)
       @seam = seam
     end
@@ -26,54 +22,68 @@ module Ariadne
 
     def text
       @text ||=
-        Text(
-          [
-            rank,
-            " ",
-            depth_dashes,
-            class_name,
-            prefix,
-            method_name,
-            parameters,
-            return_value
-          ].join
-        )
+        [
+          rank,
+          " ",
+          depth_dashes,
+          class_name,
+          prefix,
+          method_name,
+          parameters,
+          return_value_type
+        ].join
     end
 
     def rank
-      Text(@seam.rank.to_s.rjust(4)).gray
+      @seam.rank.to_s.rjust(4).gray
     end
 
     def depth_dashes
-      Text("-" * @seam.depth).gray.tap { _1 << " " if @seam.depth.positive? }
+      ("-" * @seam.depth).gray.tap { _1 << " " if @seam.depth.positive? }
     end
 
     def class_name
-      Text(@seam.klass.name).green
+      @seam.klass.name.green
     end
 
     def prefix
-      Text(@seam.prefix).gray
+      @seam.prefix.gray
     end
 
     def method_name
-      Text(@seam.method_name).cyan
+      @seam.method_name.to_s.cyan
     end
 
-    def return_value
-      value = Text(cast(@seam.return_value)).truncate(50)
-      value = type(@seam.return_value) ? "<#{type(@seam.return_value)}> #{value}" : value
-      Text(" -> #{value}").yellow
+    def return_value_type
+      value = type(@seam.return_value)
+      " -> #{value}".yellow
     end
 
     def parameters
-      str =
-        @seam.parameters.map do |parameter|
-          arg = Text(cast(parameter.arg)).truncate(50)
-          arg = type(parameter.arg) ? "<#{type(parameter.arg)}> #{arg}" : arg
-          "#{parameter.param}: #{arg}"
-        end.join(", ")
-      Text(str.empty? ? "" : "(#{str})").magenta
+      return if @seam.parameters.empty?
+
+      [
+        "(",
+        @seam.parameters.flat_map { "#{_1.param}:  #{arg(_1)}" }.join(", "),
+        ")"
+      ].join.magenta
+    end
+
+    def arg(parameter)
+      if parameter.type == :rest || %i[* ** &].include?(parameter.param)
+        parameter.arg.map { type(_1) }.join(", ")
+      else
+        type(parameter.arg)
+      end
+    end
+
+    def type(arg)
+      case arg
+      when "<?>" then "<?>"
+      when TrueClass, FalseClass then "Boolean"
+      when NilClass then "nil"
+      else arg.class.to_s
+      end
     end
   end
 end

data/lib/ariadne/seam.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require "open3"
-require "ariadne/parameter"
 
 module Ariadne
   class Seam
     attr_reader :rank, :depth, :klass, :method_name, :prefix, :parameters, :return_value, :binding, :path
 
+    Parameter = Struct.new(:type, :param, :arg)
+
     class << self
       # We cannot make public methods because accessing the TracePoint
       # after it has been disabled would raise a RunTimeError
@@ -44,11 +45,23 @@ module Ariadne
 
       def parameters(tracepoint)
         method = tracepoint.self.method(tracepoint.method_id)
-        method.parameters.map do |parameter|
-          Parameter.new(parameter, binding: tracepoint.binding)
+        if forwarded_parameters?(method)
+          [Parameter.new(:rest, "...", ["<?>"])]
+        else
+          method.parameters.flat_map do |parameter|
+            type = parameter.first
+            param = parameter.last
+            arg = %i[* ** &].include?(param) ? ["<?>"] : tracepoint.binding.local_variable_get(param)
+            Parameter.new(type, param, arg)
+          rescue NameError
+            Parameter.new(type, param, type == :rest ? ["<?>"] : "<?>")
+          end
         end
-      rescue NoMethodError
-        []
+      end
+
+      # return true if method's signature is like `def my_method(...)`
+      def forwarded_parameters?(method)
+        method.parameters == [%i[rest *], %i[block &]]
       end
 
       def path(tracepoint)

data/lib/ariadne/string/color.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Ariadne
+  module String
+    module Color
+      COLORS = %w[
+        black
+        red
+        green
+        yellow
+        blue
+        magenta
+        cyan
+        gray
+      ].freeze
+
+      COLORS.each.with_index do |color, index|
+        code = index + 30
+        define_method(color) do
+          "\e[#{code}m#{bleach}\e[0m"
+        end
+        bg_code = index + 40
+        define_method("bg_#{color}") do
+          "\e[#{bg_code}m#{bleach}\e[0m"
+        end
+      end
+
+      def bleach
+        gsub(/\e\[\d{1,2}m/, "")
+      end
+    end
+  end
+end
+
+String.include Ariadne::String::Color

data/lib/ariadne/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ariadne
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ariadne
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Edouard Piron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,11 +102,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ariadne.rb
-- lib/ariadne/helpers/text.rb
-- lib/ariadne/helpers/value_format.rb
 - lib/ariadne/log.rb
-- lib/ariadne/parameter.rb
 - lib/ariadne/seam.rb
+- lib/ariadne/string/color.rb
 - lib/ariadne/thread.rb
 - lib/ariadne/version.rb
 homepage: https://github.com/BigBigDoudou/ariadne

data/lib/ariadne/helpers/text.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Ariadne
-  module Helpers
-    module Text
-      class Text < String
-        COLORS = %w[
-          black
-          red
-          green
-          yellow
-          blue
-          magenta
-          cyan
-          gray
-        ].freeze
-
-        COLORS.each.with_index do |color, index|
-          code = index + 30
-          define_method(color) do
-            "\e[#{code}m#{bleach}\e[0m"
-          end
-          bg_code = index + 40
-          define_method("bg_#{color}") do
-            "\e[#{bg_code}m#{bleach}\e[0m"
-          end
-        end
-
-        def initialize(str)
-          super(str.to_s)
-        end
-
-        def truncate(size)
-          if self.size > size
-            Text.new("#{self[..size]}...")
-          else
-            self
-          end
-        end
-
-        def bleach
-          gsub(/\e\[\d{1,2}m/, "")
-        end
-      end
-
-      def Text(str) # rubocop:disable Naming/MethodName
-        Text.new(str)
-      end
-    end
-  end
-end

data/lib/ariadne/helpers/value_format.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Ariadne
-  module Helpers
-    module ValueFormat
-      RUBY_LITERALS = [
-        NilClass,
-        String,
-        Integer,
-        Float,
-        Proc,
-        TrueClass,
-        FalseClass,
-        Symbol,
-        Array,
-        Range,
-        Regexp,
-        Hash
-      ].freeze
-
-      def type(value)
-        return if value.is_a?(Class) || RUBY_LITERALS.include?(value.class)
-
-        value.class.name
-      end
-
-      def cast(value)
-        case value
-        when NilClass
-          "nil"
-        when Proc
-          "#<Proc>"
-        when Class
-          value.name
-        when String
-          "\"#{value}\""
-        else
-          value.to_s
-        end
-      end
-    end
-  end
-end

data/lib/ariadne/parameter.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-
-module Ariadne
-  class Parameter < SimpleDelegator
-    def initialize(parameter, binding:)
-      super(parameter)
-      @binding = binding
-    end
-
-    def param
-      last
-    end
-
-    def arg
-      @binding.local_variable_get(last)
-    rescue NameError
-      "?"
-    end
-  end
-end