speculate_about 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e318f99308bc176c98e6bbf5c5367b626123058b6fc356928a60946ff338d574
-  data.tar.gz: 3f659caecff4fc5721aff5e113f5bef38d3b405a7661848a550cd2f84810cb54
+  metadata.gz: bec8c1ea49a9e43ea7e174e2505a6bba43785bac98e53267a4c662bf194a0027
+  data.tar.gz: 14f2d1f6d251187eb3125a1f2eea5d34c9b573f28184bf33e7f2db4fe45fbb5f
 SHA512:
-  metadata.gz: a1ef2fc905252a43b7c585042d9028609fd1a62ce4c0cf3b6ad7f570550e220d800717cc8895744ccbb0de93193c084801e634f23ecb4a03b20512a98f691524
-  data.tar.gz: 52c2f1123864067ce0b5ce5a44196a453c9ac306c24d394ffe4f6efc58cbd80a53e25f6d83ebabb6e9bd6ad4a3315e1b65ba08b55418354c92bb4098564672dd
+  metadata.gz: afb73ccfc87fc19f1bac309942f2f920a2609c47a0739f7c7060ce7b65e52769f5259c518b0f143c016ce235e84961ee39f1d8f535ee628351462316efc16c67
+  data.tar.gz: c0687c470470b498dd295b95a57a7366daea2a68587a94d8d3470e005d69c99350349ab7a3ffe7f33bda38f186489ff9e14784c8f7f3d88e35c8c2e62ad29ee7

data/lib/speculations/data.rb

@@ -2,7 +2,7 @@
 
 module Speculations
   class Data
-    attr_reader :ctxt, :debug, :line, :lnb, :node, :state
+    attr_reader :ctxt, :debug, :filename, :line, :lnb, :node, :state
       
     def info(label) = node.info(label)
 
@@ -19,9 +19,10 @@ module Speculations
     end
 
     private
-    def initialize(line:, lnb:, state:, node:, ctxt: nil, debug: false)
+    def initialize(line:, lnb:, state:, node:, filename: nil, ctxt: nil, debug: false)
       @ctxt = ctxt
       @debug = debug
+      @filename = filename
       @line = line
       @lnb = lnb
       @node = node

data/lib/speculations/debugging.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'l43/simple_color'
+module Speculations
+  module Debugging
+    S = L43::SimpleColor
+
+    def debug__(subject=nil, msg: nil, rtrn: nil, debug:)
+      return rtrn || subject unless debug
+
+      S.putc(msg) if msg
+      S.putc(3, :bold_green, subject.inspect) if subject
+      rtrn || subject
+    end
+
+    def dbg_match(msg, data)
+      designation = name.split("::").last.downcase
+      debug__(msg: [:blue, "#{data.lnb.succ}", :reset, " #{msg} match in :#{designation}"], debug: data.debug)
+    end
+
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/speculations/parser/state/context_maker.rb

@@ -13,6 +13,7 @@ module Speculations
 
         def make_spec_context(data, title:)
           level = data.node.level.succ
+          title << " (#{data.filename}:#{data.lnb})"
           node = data.node.new_context(title:, lnb: data.lnb, level:)
           data.update(state: :examples, node:)
         end

data/lib/speculations/parser/state/includes.rb

@@ -5,13 +5,15 @@ module Speculations
       module Includes extend self
         include ContextMaker
 
-        # def parse line, lnb, node, _ctxt, debug: true
         def parse(data)
           line = data.line
           case
           when match = State.context_match(line)
             #dbg_match("context", data)
             make_new_context(data, match: match)
+          when match = State.spec_context_line(line)
+            #dbg_match("specify context", data)
+            make_spec_context(data, title: data.line.strip)
           when match = State.maybe_include(line)
             #dbg_match("maybe_include", data)
             data.update(state: :candidate, ctxt: :inc)

data/lib/speculations/parser/state/specify_block.rb

@@ -4,7 +4,6 @@ module Speculations
   class Parser
     module State
       module SpecifyBlock extend self
-        # def parse line, lnb, node, _ctxt, debug: false
         def parse(data)
           # data.info(:specify_block)
           line = data.line

data/lib/speculations/parser/state/triggers.rb

@@ -6,7 +6,7 @@ module Speculations::Parser::State::Triggers
   GIVEN_RGX        = %r[\A\s{0,3}(?:Given|When|And)\b]
   EXAMPLE_RGX      = %r[\A\s{0,3}Example\:?\s+(?<title>.*)]
   RUBY_RGX         = %r[\A\s{0,3}```ruby]
-  SPEC_CONTEXT_RGX = %r[following examples:\s*\z]
+  SPEC_CONTEXT_RGX = %r[(?:\sfollowing examples:\s*)|(?:\sas follows:\s*)\z]
   THEN_RGX         = %r[\A\s{0,3}(?:Then|But|And|Also|Or|However|Furhermore)\b\s*(?<title>.*)]
 
   def blank_line(line) = BLANK_RGX.match(line)

data/lib/speculations/parser/state.rb

@@ -4,7 +4,6 @@ module Speculations::Parser::State extend self
   require_relative './state/in'
   require_relative './state/includes'
   require_relative './state/out'
-  require_relative './state/spec_context'
   require_relative './state/specify_block'
   require_relative './state/triggers'
 

data/lib/speculations/parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../debugging'
+require_relative 'debugging'
 require_relative './parser/context'
 require_relative './parser/state'
 module Speculations
@@ -13,7 +13,6 @@ module Speculations
         in: State::In,
         includes: State::Includes,
         out: State::Out,
-        spec_context: State::SpecContext,
         specify_block: State::SpecifyBlock
       }
     end
@@ -31,13 +30,13 @@ module Speculations
 
     def parse!(debug:)
       root = node = Context.new(filename: @filename)
-      data = Data.new(node:, lnb: 0, line: nil, state: :out, debug:) 
+      data = Data.new(node:, lnb: 0, line: nil, filename: @filename, state: :out, debug:) 
       @input.each_with_index do |line, lnb|
         data.update(line:, lnb:)
         parser = self.class.parsers.fetch(data.state)
         old_state = data.state
         data = parser.parse(data)
-        # debug_state(old_state:, data:)
+        debug_state(old_state:, data:)
       end
       root
     end

data/lib/speculations/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Speculations
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/speculations.rb

@@ -1,8 +1,9 @@
 require 'fileutils'
-require_relative 'debugging'
+require_relative 'speculations/debugging'
 require_relative 'speculations/data'
 require_relative 'speculations/parser'
 module Speculations extend self
+  include Debugging
 
   HELPER_FILE = 'speculations_helper'
   HELPER_PATH = "spec/#{HELPER_FILE}.rb"
@@ -20,13 +21,13 @@ module Speculations extend self
     raise ArgumentError, "#{infile} not found" unless File.readable? infile
     outfile ||= _speculation_path(infile)
     if _out_of_date?(outfile, infile)
-      debug__(msg: "recompiling #{infile} -> #{outfile}", debug:)
+      debug__(msg: ["recompiling ", :b_blue, infile, :reset, " -> ", :b_blue, outfile], debug:)
       _compile(infile:, outfile:, debug:)
     elsif force
-      debug__(msg: "*** forced recompilation #{infile} -> #{outfile}", debug:)
+      debug__(msg: [:b_yellow, "*** forced recompilation ", :b_blue, infile, :reset, " -> ", :b_blue, outfile], debug:)
       _compile(infile:, outfile:, debug:)
     else
-      debug__(msg: "#{infile} ignored as it is upto date", debug:)
+      debug__(msg: [:green, infile, :reset, " ignored as it is upto date"], debug:)
     end
     outfile
   end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
-date: 2026-04-25 00:00:00.000000000 Z
-dependencies: []
+date: 2026-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: l43_simple_color
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Allows Markdown or other text files to be used as literal specs, à la
   Elixir doctest, but from any file.
 email: robert.dober@gmail.com
@@ -19,11 +33,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/speculate
-- lib/debugging.rb
 - lib/speculate_about.rb
 - lib/speculations.rb
 - lib/speculations/cli.rb
 - lib/speculations/data.rb
+- lib/speculations/debugging.rb
 - lib/speculations/parser.rb
 - lib/speculations/parser/context.rb
 - lib/speculations/parser/context/example.rb
@@ -35,7 +49,6 @@ files:
 - lib/speculations/parser/state/in.rb
 - lib/speculations/parser/state/includes.rb
 - lib/speculations/parser/state/out.rb
-- lib/speculations/parser/state/spec_context.rb
 - lib/speculations/parser/state/specify_block.rb
 - lib/speculations/parser/state/triggers.rb
 - lib/speculations/version.rb

data/lib/debugging.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Kernel
-  def debug__(subject=nil, msg: nil, rtrn: nil, debug:)
-    return rtrn || subject unless debug
-
-    $stderr.puts(msg) if msg
-    $stderr.puts(subject.inspect) if subject
-    rtrn || subject
-  end
-
-  def dbg_match(msg, data)
-    designation = name.split("::").last.downcase
-    debug__(msg: "#{data.lnb.succ}: #{msg} match in :#{designation}", debug: data.debug)
-  end
-
-end
-# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/speculations/parser/state/spec_context.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Speculations
-  class Parser
-    module State
-      module SpecContext extend self
-        extend ContextMaker
-
-        def parse line, lnb, node, title, debug: false
-          # node.info(:spec_context)
-          if State.ruby_code_block(line)
-            #dbg_match("examples", lnb, debug:)
-            make_spec_context(lnb:, node:, title:)
-          else
-            #dbg_match("abandon spec context", lnb, debug:)
-            [:out, node]
-          end
-        end
-      end
-    end
-  end
-end
-# SPDX-License-Identifier: AGPL-3.0-or-later