sirop 0.5 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee92f9d96e1938e770c3c2eb445e43a68c67920e3e885a8016f2150ce429ec5
-  data.tar.gz: 5a7ebbb732eae90b4b3f35f54728f118684eab3f32575ce6000795310a6ca541
+  metadata.gz: 0aa1bac2ed98532aeed671c846e23c49d64a0df0c838f908d345aff6b3eb20db
+  data.tar.gz: 0efe8bb07a5f691e60978b8a523891808dd849c2b05d62aa28fad1b5b46045ed
 SHA512:
-  metadata.gz: bda8d3c698363b564d14077994cb96ccaabbf1408bab88e37492d88ec30d251926af93340ac376174b7f7c18f27408b9ab942bc68a16d3fdc27b32755d9209aa
-  data.tar.gz: 2a84dd4f5586e18f2a5b2eb87759285b20b422e484e6d4afebd58fd10a707a4baa962713b296c9b36a45b8a219b10552ceae3e29e8882e36c26022f9dc144371
+  metadata.gz: c92e0f7c2cf5c4452e4af50b5b1e99786eb8d2453668020c5a9fe2d955f242562e96d068b23fee50a304bc02f446e903c43ec8bb720cff0a681a648e6528f7d4
+  data.tar.gz: daf7af4d543398a0e34d4e0521737d179ed120530921c5b560148bbe806e3f38d8b7c12b9d2e3c0665eed26560f46106e80e23751fd0258c354df9d4fa7b1354

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.7 2025-07-24
+
+- Add minimize_whitespace option to `Sourcifier#initialize`
+- Fix `Sirop.to_ast` for wrapped procs
+
+# 0.6 2025-07-23
+
+- Update to current version of Prism
+
 # 2025-01-09 0.5
 
 - Add after_body hook for lambdas

data/lib/sirop/finder.rb

@@ -5,8 +5,7 @@ require 'prism'
 module Sirop
   class Finder < Prism::BasicVisitor
     def self.find(*, &)
-      finder = self.new
-      finder.find(*, &)
+      new.find(*, &)
     end
 
     def find(root, key, &)

data/lib/sirop/sourcifier.rb

@@ -3,7 +3,7 @@
 require 'prism'
 
 module Sirop
-  # 
+  #
   class Sourcifier < Prism::BasicVisitor
     VISIT_PLANS = {
       alias_global_variable:      [:keyword_loc, :new_name, :old_name],
@@ -21,7 +21,7 @@ module Sirop
       class_variable_read:        :emit_verbatim,
       class_variable_target:      :emit_verbatim,
       class_variable_write:       [:name_loc, :operator_loc, :value],
-      constant_path:              [:parent, :delimiter_loc, :child],
+      constant_path:              [:parent, :delimiter_loc, :name_loc],
       constant_path_write:        [:target, :operator_loc, :value],
       constant_read:              :emit_verbatim,
       constant_write:             [:name_loc, :operator_loc, :value],
@@ -49,7 +49,7 @@ module Sirop
       keyword_rest_parameter:     [:operator_loc, :name_loc],
       keyword_parameter:          :emit_verbatim,
       local_variable_and_write:   [:name_loc, :operator_loc, :value],
-      local_variable_operator_write: [:name_loc, :operator_loc, :value],
+      local_variable_operator_write: [:name_loc, :binary_operator_loc, :value],
       local_variable_or_write:    [:name_loc, :operator_loc, :value],
       local_variable_read:        :emit_verbatim,
       local_variable_target:      :emit_verbatim,
@@ -91,20 +91,21 @@ module Sirop
 
     attr_reader :buffer
 
-    def initialize
+    def initialize(minimize_whitespace: false)
       @buffer = +''
+      @minimize_whitespace = minimize_whitespace
     end
-  
+
     def to_source(node)
       @buffer.clear
       visit(node)
       @buffer
     end
-  
+
     def loc_start(loc)
       [loc.start_line, loc.start_column]
     end
-  
+
     def loc_end(loc)
       [loc.end_line, loc.end_column]
     end
@@ -120,16 +121,16 @@ module Sirop
         line_diff = loc.start_line - @last_loc_end.first
         if line_diff > 0
           @buffer << "\n" * line_diff
-          @buffer << ' ' * loc.start_column
+          @buffer << ' ' * loc.start_column if !@minimize_whitespace
         elsif line_diff == 0
           ofs = loc.start_column - @last_loc_end.last
           if ofs > 0
-            @buffer << ' ' * ofs
+            @buffer << (@minimize_whitespace ? ' ' : (' ' * ofs))
           end
         end
       else
         # empty buffer
-        @buffer << ' ' * loc.start_column
+        @buffer << ' ' * loc.start_column if !@minimize_whitespace
       end
       @last_loc = loc
       @last_loc_start = loc_start(loc)
@@ -141,7 +142,7 @@ module Sirop
 
       if @last_loc
         loc_loc = loc.is_a?(Prism::Node) ? loc.location : loc
-        return if loc_loc.slice == @last_loc.slice && loc_loc.start_line == @last_loc.start_line && 
+        return if loc_loc.slice == @last_loc.slice && loc_loc.start_line == @last_loc.start_line &&
           loc_loc.start_column == @last_loc.start_column
       end
 
@@ -155,20 +156,20 @@ module Sirop
       str = str.chomp if chomp
       emit(str)
     end
-  
+
     def emit_verbatim(node)
       emit_code(node.location)
     end
 
     def emit_nothing(node)
       # emit nothing
-    end  
+    end
 
     def emit_str(str)
       emit(str)
       @last_loc_end[1] += str.size
     end
-  
+
     def emit_comma
       emit_str(',')
     end
@@ -193,7 +194,7 @@ module Sirop
       sym = :"visit_#{key}_node"
       define_method(sym) { |n| visit_plan(plan, n) }
     end
-  
+
     def visit_plan(plan, node)
       return send(plan, node) if plan.is_a?(Symbol)
 
@@ -270,7 +271,7 @@ module Sirop
     def visit_arguments_node(node, subscript = 0..-1)
       visit_comma_separated_nodes(node.arguments[subscript])
     end
-  
+
     def visit_keyword_hash_node(node)
       visit_comma_separated_nodes(node.elements)
     end
@@ -286,7 +287,7 @@ module Sirop
       emit_code(node.predicate)
       emit_code(node.then_keyword_loc)
       emit_code(node.statements, semicolon: true)
-      emit_code(node.consequent) if node.consequent
+      emit_code(node.subsequent) if node.subsequent
       emit_code(node.end_keyword_loc, semicolon: true) if node.if_keyword_loc.slice == 'if'
     end
 
@@ -294,11 +295,11 @@ module Sirop
       emit_code(node.predicate)
       emit_code(node.then_keyword_loc)
       emit_code(node.statements)
-      emit_code(node.consequent)
+      emit_code(node.subsequent)
     end
 
     def visit_if_node_guard(node)
-      emit_code(node.statements)        
+      emit_code(node.statements)
       emit_code(node.if_keyword_loc)
       emit_code(node.predicate)
     end
@@ -313,12 +314,12 @@ module Sirop
       emit_code(node.then_keyword_loc)
       @semicolon = true
       emit_code(node.statements)
-      emit_code(node.consequent) if node.consequent
+      emit_code(node.else_clause) if node.else_clause
       emit_code(node.end_keyword_loc, semicolon: true) if node.keyword_loc.slice == 'unless'
     end
 
     def visit_unless_node_guard(node)
-      emit_code(node.statements)        
+      emit_code(node.statements)
       emit_code(node.keyword_loc)
       emit_code(node.predicate)
     end
@@ -327,7 +328,7 @@ module Sirop
       emit_code(node.case_keyword_loc)
       emit_code(node.predicate)
       node.conditions.each { |c| emit_code(c, semicolon: true) }
-      emit_code(node.consequent, semicolon: true)
+      emit_code(node.else_clause, semicolon: true)
       emit_code(node.end_keyword_loc, semicolon: true)
     end
 
@@ -385,7 +386,7 @@ module Sirop
       end
       emit_code(node.opening_loc)
       emit_code(node.arguments)
-      
+
       if block.is_a?(Prism::BlockArgumentNode)
         emit_comma if node.arguments && node.arguments.arguments.size > 0
         emit_code(block)
@@ -461,7 +462,7 @@ module Sirop
       visit_comma_separated_nodes(node.elements)
       emit_code(node.closing_loc)
     end
-  
+
     def visit_array_node(node)
       emit_code(node.opening_loc)
       if node.opening_loc && node.opening_loc.slice =~ /^%/
@@ -492,7 +493,7 @@ module Sirop
       emit_code(node.operator_loc)
       emit_code(node.reference)
       emit_code(node.statements, semicolon: true)
-      emit_code(node.consequent)
+      emit_code(node.subsequent)
     end
 
     def visit_begin_node(node)

data/lib/sirop/version.rb

@@ -1,4 +1,4 @@
 module Sirop
   # Sirop version
-  VERSION = '0.5'
+  VERSION = '0.7'
 end

data/lib/sirop.rb

@@ -22,15 +22,15 @@ module Sirop
       end
     end
 
-    def to_source(obj)
+    def to_source(obj, **)
       obj = to_ast(obj) if !obj.is_a?(Prism::Node)
-      Sourcifier.new.to_source(obj)
+      Sourcifier.new(**).to_source(obj)
     end
 
     private
 
     def proc_ast(proc)
-      fn, lineno = proc.source_location  
+      fn, lineno = proc.source_location
       pr = Prism.parse(IO.read(fn), filepath: fn)
       program = pr.value
 
@@ -39,6 +39,10 @@ module Sirop
           found!(node) if node.location.start_line == lineno
           super(node)
         end
+        on(:block) do |node|
+          found!(node) if node.location.start_line == lineno
+          super(node)
+        end
         on(:call) do |node|
           case node.name
           when :proc, :lambda

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sirop
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.7'
 platform: ruby
 authors:
 - Sharon Rosner
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: 5.25.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: 5.25.5
 email: sharon@noteflakes.com
 executables: []
 extensions: []
@@ -69,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: 'Sirop: Ruby code rewriter'
 test_files: []