lab42_match 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e2e58bcd35bea3e13fc050122d7c98e4947927d36c9cbe57f07e9c9a0a1064e
-  data.tar.gz: 7cc65dbab76674b605d836c0a529b5c9de6160ee10c835082106e2907d9e332a
+  metadata.gz: ff366ded494dfd26faa72d7fbb5c5b6c09fa7c11375ba45d35ff795f7a9459b8
+  data.tar.gz: d2cec631c3cde209563ba67ff6d0b04c2c9c8d9dafb6b71429391f1254e79838
 SHA512:
-  metadata.gz: a14691319bff7f5890138b491dab3431eebbbac4860b271fadaa6c36bc4de0a6607180e78832657a99fa720e2648d85aa39fc20eb7be8be8a7200c5175d98386
-  data.tar.gz: 6c83f662655798f2e020e98254bee7bab4f6267d270261048bc143ededf86a316655a243dd1edee1c26af55632fe2c97b3b0d99da639f6f4b59c2016a152bc65
+  metadata.gz: a81507f9267ee3720befd58dbc12c937736e7b496930ce2356db1a38f46a664fa0b514bb079f65880e90aa8ebc73286eb46e0b7fdb1552a754fd30d494f00461
+  data.tar.gz: e6b9698f1d2705bcc8d29b739dd95fddd681ac123bfd613d2d96a605284f130725441abbf85d4c03b9416e4c832d98db5a0c3e9b984a0dc4ac0a9d3fdb4d9677

data/lib/lab42/match.rb

@@ -137,13 +137,23 @@ module Lab42
     end
 
     def _init_parts_with_captures
-      @parts = [@match.pre_match, subject[@match.begin(0)...@match.begin(1)]]
+      captures = @match.captures.map{ |x| x || "" }
+      last_match_idx = 0
+      begin_ends = (1...@match.size)
+        .map do |idx|
+          x = @match.begin(idx) || last_match_idx
+          y = @match.end(idx) || x
+          last_match_idx = y
+          [x, y]
+      end
+
+      @parts = [@match.pre_match, subject[@match.begin(0)...begin_ends.first.first]]
       (1...@match.size.pred).each do |capture_index|
-        @parts << @match[capture_index]
-        @parts << subject[@match.end(capture_index)...@match.begin(capture_index.succ)]
+        @parts << captures[capture_index.pred]
+        @parts << subject[begin_ends[capture_index.pred].last...begin_ends[capture_index].first]
       end
-      @parts << @match[-1]
-      @parts << subject[@match.end(@match.size.pred)...@match.end(0)]
+      @parts << (@match[-1] || "")
+      @parts << subject[begin_ends.last.last...@match.end(0)]
       @parts << @match.post_match
       _refresh
     end

data/lib/lab42/match/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   class Match
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lab42_match
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Dober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: forwarder2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +124,7 @@ licenses:
 - Apache
 - '2'
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'Beyond Match Data: Modify Your Matches'
 test_files: []