speculate_about 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f8a6b1bd4d875d642678f3587c58494d61280f9064debbac19b5b60c3da4ee
-  data.tar.gz: 409f1b1d636138e95180144267eab84a81eee537734e0bc417ee4e0e7af579f0
+  metadata.gz: d6c603b51bd04471204c4584fb1697f5a27dd7b578abd012c805046e7d9a49dc
+  data.tar.gz: 82f31cc63352e6d3c380b860a40a1f84a2f133b7b4f8a391363176f57d808415
 SHA512:
-  metadata.gz: ea0a3e7ec17457a6de3bbefe6cc01c4a99be7626ad87ff3c766a04e62795f0648048e5fea50a6d85f31be9b321a73b7296ffa1ff65bfb4dbb38a4670216d13ad
-  data.tar.gz: 455a502c19ca76b5aa5ebf5ddabec69d435f4af28a00b3f96bc048c98b50b44d6b72646e2e2f39ca62f2d486b6b9b2b57880eed493d43cc43338a7ec19930469
+  metadata.gz: bd30e3a46232a0d38b0d0725aa89df98f7d724faef50e350e3bacf106c552e279569087b830f93a656015dca03f5fe1e0ff0c511484a2c12ac3331ebb8e5c51a
+  data.tar.gz: f48a6400a5bd1d6971780e5c8261d957b64af79c96baa544dd21b4050240343da77bc48141b4d0097da32ee4ee4ff5d065c7d3aa0df65584a71caf99b4724d09

data/lib/speculate_about.rb

@@ -5,15 +5,15 @@ require 'speculations/parser'
 module SpeculateAbout
   def speculate_about file
     path = _find_file(file, File.dirname( caller.first ))
-    code = _compile path
+    code = _compile path, file
     ENV["SPECULATE_ABOUT_DEBUG"] ? puts(code) : instance_eval(code)
   end
 
 
   private
 
-  def _compile path
-    ast  = Speculations::Parser.new.parse_from_file(path)
+  def _compile path, file
+    ast  = Speculations::Parser.new.parse_from_file(path, file)
     ast.to_code
   end
   def _find_file file, local_path

data/lib/speculations/parser.rb

@@ -3,7 +3,7 @@ class Speculations::Parser
   require_relative './parser/context'
   require_relative './parser/state'
 
-  attr_reader :filename, :input, :root, :state
+  attr_reader :filename, :input, :orig_filename, :root, :state
 
   def self.parsers
      @__parsers__ ||= {
@@ -14,8 +14,9 @@ class Speculations::Parser
      }
   end
 
-  def parse_from_file file
+  def parse_from_file file, orig_filename = nil
     @filename = file
+    @orig_filename = orig_filename || file
     @input = File
       .new(file)
       .each_line(chomp: true)
@@ -30,7 +31,7 @@ class Speculations::Parser
   end
 
   def parse!
-    root = node = Context.new(name: "Speculations from #{@filename}", lnb: 0, filename: @filename, parent: nil)
+    root = node = Context.new(name: "Speculations from #{@filename}", lnb: 0, filename: @filename, orig_filename: orig_filename, parent: nil)
     input.each_with_index do |line, lnb|
       @state, node = self.class.parsers.fetch(@state).parse(line, lnb.succ, node)
     end

data/lib/speculations/parser/context.rb

@@ -3,7 +3,7 @@ class Speculations::Parser::Context
   require_relative './context/example'
   require_relative './context/setup'
 
-  attr_reader :filename, :level, :lnb, :name, :parent, :setup
+  attr_reader :filename, :level, :lnb, :name, :orig_filename, :parent, :setup
 
   def add_child(name:, lnb:)
     raise "Illegal nesting" if parent
@@ -55,21 +55,22 @@ class Speculations::Parser::Context
   
   private
 
-  def initialize(lnb:, name:, filename: nil, parent: nil)
-    _init_from_parent filename, parent
-    @level    = parent ? parent.level.succ : 1
-    @lnb      = lnb
-    @setup    = nil
-    @name     = name
-    @parent   = parent
+  def initialize(lnb:, name:, filename: nil, orig_filename: nil, parent: nil)
+    _init_from_parent filename, orig_filename, parent
+    @level         = parent ? parent.level.succ : 1
+    @lnb           = lnb
+    @setup         = nil
+    @name          = name
+    @parent        = parent
   end
 
   def _header
     map_lines(%{context "#{name}" do}, indent: -1)
   end
 
-  def _init_from_parent filename, parent
+  def _init_from_parent filename, orig_filename, parent
     @filename = parent ? parent.filename : filename
+    @orig_filename = parent ? parent.orig_filename : orig_filename
     raise ArgumentError, "no filename given in root context" unless @filename
   end
 

data/lib/speculations/parser/context/example.rb

@@ -34,9 +34,9 @@ class Speculations::Parser::Context::Example
     _, name = NAMED_EXAMPLE.match(line).to_a
     
     if name&.empty? == false # SIC
-      "#{name} (#{File.basename(parent.filename)}:#{lnb.succ})"
+      "#{name} (#{parent.orig_filename}:#{lnb.succ})"
     else
-      "Example from #{parent.filename}:#{lnb.succ}"
+      "Example from #{parent.orig_filename}:#{lnb.succ}"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec