defmastership 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a98ba2cd70decfd584d57f914d05bc31356cd53846fa13b01f3406ff41dc087
-  data.tar.gz: 999f28e56b654a6dd35d9da30a8701abd1121f62db4df730fcf903a255b34eff
+  metadata.gz: 9e81c3ab45ea06b43ad767d8ab89231e05eacca67dee259a8d968d515da6adb6
+  data.tar.gz: bb2abcc00dea06b45b35373eec37923236770310cd70842770be8d1ac92149e7
 SHA512:
-  metadata.gz: 44bd90676d2ebd37cf47c0e6d9160340d1861497eb4a110e47e5b35c26cd23a28a1ddd24c93e489238520f916997fb2f45801ec1c74b84a7c44f16798b3c0eaf
-  data.tar.gz: 60d4904b54cbb6708ff1633ad0d01d9e43a97d0e4cb90c51126487de2eae477e81e670db38fc151784bde3bb59f1f473abf804f08f0968f06d99dbd58a32c3fa
+  metadata.gz: 3df9a3fd838a4600b66690fd30fedcbf28b8e3af6d2afbe8d1ef813ea8b3b163b854f16ff3f219550a24b9624302ea0d32b8a043f90047070425d39e1b017cc4
+  data.tar.gz: 5b2b9c5105d548c2cba1571ad36830453bec01664d7ab4edec71a1132b30bb0651dd4d5a197f1d4c13a2a09d0ea9e69b2b0f3af975f0611de32b1cd52737c92d

data/lib/defmastership.rb

@@ -6,6 +6,7 @@ require('defmastership/version')
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
 require('defmastership/constants')
+require('defmastership/parsing_state')
 require('defmastership/definition')
 require('defmastership/definition_parser')
 require('defmastership/filters')

data/lib/defmastership/change_ref_line_modifier.rb

@@ -28,7 +28,7 @@ module DefMastership
         to_template: '',
         next_ref: 0
       }
-      @in_literal = false
+      @parsing_state = ParsingState.new
     end
 
     def replace(method, line)
@@ -36,10 +36,10 @@ module DefMastership
     end
 
     def replace_refdef(line)
-      if in_literal(line)
-        line
-      else
+      if @parsing_state.enabled?(line)
         do_replace_refdef(line)
+      else
+        line
       end
     end
 
@@ -78,10 +78,5 @@ module DefMastership
     def hmerge(match)
       @config.merge(match.names.map(&:to_sym).zip(match.captures).to_h)
     end
-
-    def in_literal(line)
-      @in_literal ^= true if line.chomp == '....'
-      @in_literal
-    end
   end
 end

data/lib/defmastership/parsing_state.rb

@@ -0,0 +1,23 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
+# frozen_string_literal: true
+
+module DefMastership
+  # Allow to know if we need to parse the line or simply ignore it
+  class ParsingState
+    def initialize
+      @last_disabling_line = nil
+    end
+
+    def enabled?(line)
+      line = line.dup.chomp
+      if ['....', '----'].include?(line)
+        if @last_disabling_line == line
+          @last_disabling_line = nil
+        elsif @last_disabling_line.nil?
+          @last_disabling_line = line
+        end
+      end
+      @last_disabling_line.nil?
+    end
+  end
+end

data/lib/defmastership/version.rb

@@ -2,6 +2,6 @@
 # frozen_string_literal: true
 
 module DefMastership
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
   public_constant :VERSION
 end

data/spec/unit/defmastership/parsing_state_spec.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
+# frozen_string_literal: true
+
+require('defmastership')
+
+RSpec.describe(DefMastership::ParsingState) do
+  subject(:parsing_state) do
+    described_class.new
+  end
+
+  describe '.new' do
+    it { is_expected.not_to(be(nil)) }
+  end
+
+  describe '#enabled_with?' do
+    context 'when starting' do
+      it { expect(parsing_state.enabled?("whatever\n")).to(eq(true)) }
+      it { expect(parsing_state.enabled?("----\n")).to(eq(false)) }
+      it { expect(parsing_state.enabled?("....\n")).to(eq(false)) }
+      it { expect(parsing_state.enabled?('....')).to(eq(false)) }
+    end
+
+    context 'when disabled' do
+      before { parsing_state.enabled?("----\n") }
+
+      it { expect(parsing_state.enabled?("whatever\n")).to(eq(false)) }
+      it { expect(parsing_state.enabled?("----\n")).to(eq(true)) }
+      it { expect(parsing_state.enabled?("....\n")).to(eq(false)) }
+    end
+
+    context 'with intricated disables satrting with "...."' do
+      before do
+        ["....\n", "----\n", "whatever\n"].each { |line| parsing_state.enabled?(line) }
+      end
+
+      it { expect(parsing_state.enabled?("----\n")).to(eq(false)) }
+      it { expect(parsing_state.enabled?("....\n")).to(eq(true)) }
+    end
+
+    context 'with intricated disables satrting with "----"' do
+      before do
+        ["....\n", "----\n", "whatever\n"].each { |line| parsing_state.enabled?(line) }
+      end
+
+      it { expect(parsing_state.enabled?("....\n")).to(eq(true)) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -216,6 +216,7 @@ files:
 - lib/defmastership/filters.rb
 - lib/defmastership/line_modifier_base.rb
 - lib/defmastership/modifier_base.rb
+- lib/defmastership/parsing_state.rb
 - lib/defmastership/rename_included_files_line_modifier.rb
 - lib/defmastership/rename_included_files_modifier.rb
 - lib/defmastership/update_def_checksum_line_modifier.rb
@@ -234,6 +235,7 @@ files:
 - spec/unit/defmastership/definition_parser_spec.rb
 - spec/unit/defmastership/definition_spec.rb
 - spec/unit/defmastership/document_spec.rb
+- spec/unit/defmastership/parsing_state_spec.rb
 - spec/unit/defmastership/rename_included_files_line_modifier_spec.rb
 - spec/unit/defmastership/rename_included_files_modifier_spec.rb
 - spec/unit/defmastership/update_def_checksum_line_modifier_spec.rb