sirop 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ef982b49313b55ac8b76d8886f406ee315421080e728bc1d9cdf05bcce93e7
-  data.tar.gz: 40c33682b5c44f10e242049041f40f20f58a2939340debb858307b5bc12b9319
+  metadata.gz: 0aa1bac2ed98532aeed671c846e23c49d64a0df0c838f908d345aff6b3eb20db
+  data.tar.gz: 0efe8bb07a5f691e60978b8a523891808dd849c2b05d62aa28fad1b5b46045ed
 SHA512:
-  metadata.gz: 9d92a9e43cfa127c5d2a8e1ccb963ea38e66b54670c0a33558a874a95e5b3ae11fc9092d5b69c0486828a8a759bb6a20c4596280e90e3f1285928badc1da9d55
-  data.tar.gz: e5f76b7f45f7fd5a6ddb94613aa381b7f36ecc737f1c5c62a19c3257f48398509e61df2439b6b3d2716cbc80d8605cafe349174e6c61c4b21173e6ab7f21dbd6
+  metadata.gz: c92e0f7c2cf5c4452e4af50b5b1e99786eb8d2453668020c5a9fe2d955f242562e96d068b23fee50a304bc02f446e903c43ec8bb720cff0a681a648e6528f7d4
+  data.tar.gz: daf7af4d543398a0e34d4e0521737d179ed120530921c5b560148bbe806e3f38d8b7c12b9d2e3c0665eed26560f46106e80e23751fd0258c354df9d4fa7b1354

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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
@@ -29,4 +34,3 @@
 # 2024-02-20 0.1
 
 - Find node for a given `Proc` object
--

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],
@@ -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
@@ -298,7 +299,7 @@ module Sirop
     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
@@ -318,7 +319,7 @@ module Sirop
     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
@@ -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 =~ /^%/

data/lib/sirop/version.rb

@@ -1,4 +1,4 @@
 module Sirop
   # Sirop version
-  VERSION = '0.6'
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sirop
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -29,14 +29,14 @@ dependencies:
     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,7 +69,7 @@ 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:
   - - ">="