re_expand 0.0.2 → 0.0.3

data/lib/Generator.rb

@@ -114,11 +114,7 @@ module ReExpand
                         patstr = (["(.*)"] * sslen).join("\t")
                         /#{patstr}/ =~ ss.join("\t")
                       end
-                      ##                    next if $1 == $2
                       # 'set date #{$2}' のような記述の$変数にsubstringの値を代入
-                      File.open("/tmp/log","a"){ |f|
-                        f.puts "#{s}-----" + eval('%('+@commands[acceptno]+')')
-                      }
                       res[ambig] << [s, eval('%('+@commands[acceptno]+')')]
                     end
                   end

data/lib/re_expand.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module ReExpand
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 
 require 'Generator'
@@ -15,29 +15,32 @@ class String
   # ExpandHelp用のライブラリを利用
   def expand(filterpat=' ')
     g = ReExpand::Generator.new
-    g.add(self,'')
+    g.add(self,"\#{$1}\t\#{$2}\t\#{$3}\t\#{$4}\t\#{$5}\t\#{$6}\t\#{$7}\t\#{$8}\t\#{$9}")
     strings = []
+    #if filterpat.class == Regexp && block then
+    #  g.generate(' ',block)
+    #  return
     if filterpat.class == String then
-      matched = g.generate(filterpat)
-      res = matched[0].length > 0 ? matched[0] : matched[1].length > 0 ? matched[1] : matched[2]
-      strings = res.collect { |r|
-        r[0]
-      }
-    elsif
-      matched = g.generate(' ')
-      strings = matched[0].collect { |r|
+      m = g.generate(filterpat)
+      matched = m[0].length > 0 ? m[0] : m[1].length > 0 ? m[1] : m[2]
+      strings = matched.collect { |r|
         r[0]
       }
+    else
+      matched = g.generate(' ')[0]
       if filterpat.class == Regexp then
-        strings = strings.find_all { |s|
-          filterpat.match(s)
+        matched = matched.find_all { |r|
+          filterpat.match(r[0])
         }
       end
+      strings = matched.collect { |r|
+        r[0]
+      }
     end
 
     if block_given? then
-      strings.each { |string|
-        yield string
+      matched.collect { |m|
+        yield m[0], m[1].split(/\t/)
       }
     else
       strings

data/test/test_re_expand.rb

@@ -1,11 +1,36 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestReExpand < Test::Unit::TestCase
+module ReExpand
+  class TestReExpand < Test::Unit::TestCase
+    
+    def setup
+    end
+    
+    def test_truth
+      assert true
+    end
+
+    def test_array
+      e = "(月|火|水|木|金)曜(1|2|3|4|5|6)限".expand
+      assert_equal e.class, Array
+      assert_equal e.length, 30
+    end
+
+    def test_2
+      "(月|火|水|木|金)曜(1|2|3|4|5|6)限".expand { |s,a|
+        assert_equal a.length, 2
+      }
+
+      e = "(月|火|水|木|金)曜(1|2|3|4|5|6)限".expand(' 1 ')
+      assert_equal e.length, 5
+
+      '(ab|cd)*'.expand(/bc/){ |s,a|
+        assert_equal a.length, 1
+        assert s =~ /abcd/
+      }
+
+    end
 
-  def setup
-  end
-  
-  def test_truth
-    assert true
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: re_expand
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Toshiyuki Masui