ariadne 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d15963f0e72fcd20333f6227ced3e4dba5e3d5a7c2cc295440dcc98c9bb863a
-  data.tar.gz: bd90b66bad183442d7661fd72566ef11223d45f705817bcae2b2026efc928a3a
+  metadata.gz: e535df4d44ee5c90e5b93476249641ddf9a5a34264e69fda50d0559c17deb453
+  data.tar.gz: 42311c562c1bd5f2dac05d99f2fc0623ac5c3bfb26320bae4f8d0c246b867936
 SHA512:
-  metadata.gz: 42c4370c8b426696d7b336fc42e40c60509569f60e1260a37aa952c1ee013b8a0ef94784032907574d256eb53071e5d8563ec5a9539b555e5abb08d4165b4bff
-  data.tar.gz: 30d1d3b263dee8c331d9f8d23b8bf8b9e422fd66b7f24a9488f2b4c3b8dc464a461201a0820475231628904a9a071d3ee496e8cd5cb27b0803818ecf2fce4bab
+  metadata.gz: 24c4e890adacdb42d81c3c3f36fbb1bca05db60f3bc71fdf8eddc0a97eebe76e9edd6e5e9b2cdfc27b621e0fa478304feb6befb49cebfbf709f157f208884ce3
+  data.tar.gz: ea9e7d7e09af8e5d52e7d22cf3231ec9a69daec8da26c7dbef47c9f788f31f64e6fc8bc520a8c6d453e9ae9f76971378d3e889a93472c258c2fee0f336b2ee72

data/lib/ariadne/log.rb

@@ -1,79 +1,96 @@
 # frozen_string_literal: true
 
-require "open3"
-require "ariadne/helpers/text"
-require "ariadne/helpers/value_format"
+require "colorize"
 
 module Ariadne
   class Log
-    include Helpers::Text
-    include Helpers::ValueFormat
+    TEXTS = {
+      rank: :white,
+      depth_dashes: :white,
+      class_name: :green,
+      prefix: :blue,
+      method_name: :blue,
+      parameters: :magenta,
+      return_value_type: :yellow
+    }.freeze
 
     def initialize(seam)
       @seam = seam
     end
 
     def call
-      puts text
+      puts log
       write_log
     end
 
     private
 
-    def write_log
-      File.open(Ariadne::Thread::LOG_FILE, "a") { _1.puts text.bleach }
+    def log
+      @log ||=
+        TEXTS.map do |method, color|
+          __send__(method).colorize(color)
+        end.join
     end
 
-    def text
-      @text ||=
-        Text(
-          [
-            rank,
-            " ",
-            depth_dashes,
-            class_name,
-            prefix,
-            method_name,
-            parameters,
-            return_value
-          ].join
-        )
+    def write_log
+      File.open(Ariadne::Thread::LOG_FILE, "a") { _1.puts log.uncolorize }
     end
 
     def rank
-      Text(@seam.rank.to_s.rjust(4)).gray
+      @seam.rank.to_s.rjust(4)
     end
 
     def depth_dashes
-      Text("-" * @seam.depth).gray.tap { _1 << " " if @seam.depth.positive? }
+      str = +" "
+      if @seam.depth.positive?
+        str << ("-" * @seam.depth)
+        str << " "
+      end
+      str
     end
 
     def class_name
-      Text(@seam.klass.name).green
+      @seam.klass.name
     end
 
     def prefix
-      Text(@seam.prefix).gray
+      @seam.prefix
     end
 
     def method_name
-      Text(@seam.method_name).cyan
+      @seam.method_name.to_s
     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}"
     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
+    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/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ariadne
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Edouard Piron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Follow the code
 email:
 - ed.piron@gmail.com
@@ -102,10 +88,7 @@ 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/thread.rb
 - lib/ariadne/version.rb

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