habakiri 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 813ae70ea321d06939608a93265b91ff6ff6ba35d181321bd31572e7f4ca8945
-  data.tar.gz: 6b5553cac1efee65f7cb5ba7482fb831dd6c11f59d03085d282a8c912c09fe22
+  metadata.gz: 755f1d5a970754e4e71f8f41cd9a5aa7f02482aa2cd3b72f2bbd03de122a8d22
+  data.tar.gz: 457b9a65289f046f47ca77173baf81695af717a38370dd3a4e0e18897496e703
 SHA512:
-  metadata.gz: fe50a267573973e7cd16a511e0c6baea8c75cf64694d44677ee1fbbdbc75f4f3d80f77c1027c46f83992a85c38dc1bac0d72b7ef334b4d6e7ce67a908dd5bf54
-  data.tar.gz: b408aa0e9c13b10c322e5d91dee71537be448a1374b38db7b61d32b3050537b400a897d1117c9b17d80a1147d87f04adc35f2f515b8ab16f9bd416d80f93982b
+  metadata.gz: d48721467c27f00f134ab4186684634b10a9a6827d1e6407838448e8b0020d1f451737742fa3e658eab0142d4e63627d39bcf4e75b46cd0128b430ff245cb112
+  data.tar.gz: a03ae57eab368f16362da48bc894b2a4171d246ec4fdcf18fa45b32d752f9f7e29c46a1d1c52d70753dd9259b37c5840cc04dfc32e3d1478dc603de12975c11c

data/lib/habakiri.rb

@@ -2,23 +2,23 @@ require 'habakiri/version'
 require 'diff/lcs'
 
 class Habakiri
-  def initialize(prefix = '{{', suffix = '}}')
-    @prefix = prefix
-    @suffix = suffix
+  def initialize(template, prefix = '{{', suffix = '}}')
+    @prefix = prefix.to_s
+    @suffix = suffix.to_s
+    @template = template.to_s
+    @keywords = keywords
   end
 
-  def exec(template, text)
-    diffs = Diff::LCS.sdiff(template.to_s, text.to_s)
-    matches = template.to_enum(:scan, /#{@prefix}.+?#{@suffix}/).map{ Regexp.last_match }
+  def exec(text)
+    diffs = Diff::LCS.sdiff(@template, text.to_s)
 
-    matches.each.with_object({}){|match, object|
-      start = match.begin(0)
-      last = match.end(0)
-      range = start...last
-      list = diffs.select{|d| range.include?(d.old_position) }
+    @keywords.each.with_object({}){|(key, key_begin, key_end), object|
+      index_begin = diffs.index{|d| d.old_position == key_begin }
+      index_end = diffs.index{|d| d.old_position == key_end }
+      list = diffs[index_begin...index_end]
 
       # 改行後の追加要素も対応する文字列とみなす
-      i = diffs.index{|d| d.old_position == last }
+      i = index_end
       if i
         loop do
           diff = diffs[i]
@@ -31,14 +31,23 @@ class Habakiri
         end
       end
 
-      key = match[0].delete_prefix(@prefix).delete_suffix(@suffix).strip
       object[key] = list.map(&:new_element).join.strip
     }
   end
 
+  private
+
+  def keywords
+    @template.to_enum(:scan, /#{@prefix}.+?#{@suffix}/).map{
+      m = Regexp.last_match
+      key = m[0].delete_prefix(@prefix).delete_suffix(@suffix).strip
+      [key, m.begin(0), m.end(0)]
+    }
+  end
+
   class << self
     def exec(template, text)
-      new.exec(template, text)
+      new(template).exec(text)
     end
   end
 end

data/lib/habakiri/version.rb

@@ -1,3 +1,3 @@
 class Habakiri
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habakiri
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies: []
 description: Habariki is a template match engine for strings that can extract part
   of text by template keywords.