re 0.0.5 → 0.0.6

data/README.rdoc

@@ -34,13 +34,13 @@ easier to independently verify.  As an additional bonus, the capture
 groups can be retrieved by name:
 
   result = date.match("2009-01-23")
-  result.data(:year)   # => "2009"
-  result.data(:month)  # => "01"
-  result.data(:day)    # => "23"
+  result[:year]      # => "2009"
+  result[:month]     # => "01"
+  result[:day]       # => "23"
 
 == Version
 
-This document describes Re version 0.0.5.
+This document describes Re version 0.0.6.
 
 == Usage
 

data/Rakefile

@@ -20,8 +20,8 @@ namespace "release" do
     :check_non_beta,
     :check_all_committed,
     :tag_version,
-    :gem,
-    "publish:rdoc"
+    "publish:rdoc",
+    "publish:gem",
   ]
   
   task :check_all_committed do
@@ -35,7 +35,11 @@ namespace "release" do
     sh "git commit -m 'bumped to version #{Re::VERSION}'"
   end
   
-  task :not_already_tagged
+  task :not_already_tagged do
+    if `git tag -l re-#{Re::VERSION}` != ""
+      fail "Already tagged with re-#{Re::VERSION}"
+    end
+  end
 
   task :tag_version => :not_already_tagged do
     sh "git tag re-#{Re::VERSION}"

data/TAGS

@@ -0,0 +1,140 @@
+
+bench/date_bench.rb,64
+def date_rexpdate_rexp
7,48
+def date_regexpdate_regexp
22,621
+
+lib/re.rb,2303
+module ReRe
161,5658
+  module VersionVersion
163,5671
+  class ResultResult
175,5934
+    def initialize(match_data, rexp)initialize
178,6041
+    def full_matchfull_match
184,6182
+    def [](name)[]
189,6284
+    def name_mapname_map
197,6440
+  class RexpRexp
215,6926
+    def initialize(string, level, keys, options=0)initialize
221,7163
+    def match(string)match
231,7429
+    def regexpregexp
238,7616
+    def greedy?greedy?
244,7791
+    def name_mapname_map
250,7969
+    def +(other)+
260,8196
+    def |(other)|
267,8431
+    def optionaloptional
274,8652
+    def non_greedynon_greedy
283,9059
+    def manymany
290,9200
+    def one_or_moreone_or_more
295,9383
+    def repeat(min, max=nil)repeat
302,9680
+    def at_least(min)at_least
311,10021
+    def at_most(max)at_most
316,10219
+    def allall
322,10430
+    def almost_allalmost_all
328,10611
+    def bolbol
333,10735
+    def eoleol
338,10902
+    def beginbegin
343,11075
+    def endend
349,11298
+    def very_endvery_end
355,11521
+    def lineline
360,11686
+    def groupgroup
368,11968
+    def capture(name)capture
375,12235
+    def multilinemultiline
380,12405
+    def multiline?multiline?
387,12675
+    def ignore_caseignore_case
392,12809
+    def ignore_case?ignore_case?
400,13153
+    def to_sto_s
405,13290
+    def apply_greedy(op)apply_greedy
413,13487
+    def parenthesized_encoding(new_level)parenthesized_encoding
422,13792
+    def encodingencoding
432,14053
+    def encode_options          # :nodoc:encode_options
441,14264
+    def self.literal(chars)literal
451,14652
+    def self.raw(re_string)     # :no-doc:raw
459,14980
+    def self.escape_any(chars)  # :nodoc:escape_any
464,15126
+  def re(exp=nil)re
477,15501
+  module ConstructionMethodsConstructionMethods
487,15899
+    def nullnull
495,16061
+    def any(*chars)any
525,17136
+    def none(*chars)none
554,18073
+    def char_class(chars)char_class
558,18164
+    def spacespace
576,18550
+    def spacesspaces
585,18758
+    def nonspacenonspace
594,18961
+    def nonspacesnonspaces
603,19182
+    def word_charword_char
612,19391
+    def wordword
621,19597
+    def breakbreak
630,19841
+    def digitdigit
639,20023
+    def digitsdigits
648,20212
+    def hex_digithex_digit
657,20415
+    def hex_digitshex_digits
666,20637
+
+test/re_test.rb,3835
+class ReTest < Test::Unit::TestCaseReTest
11,207
+  def test_module_access_to_re_functiontest_module_access_to_re_function
14,257
+  def test_strings_matchtest_strings_match
19,347
+  def test_not_matchtest_not_match
24,433
+  def test_special_characters_matchtest_special_characters_match
28,487
+  def test_concatenationtest_concatenation
33,572
+  def test_nulltest_null
39,674
+  def test_alterationtest_alteration
44,754
+  def test_manytest_many
51,871
+  def test_greedy_manytest_greedy_many
59,1001
+  def test_non_greedy_manytest_non_greedy_many
66,1156
+  def test_one_or_moretest_one_or_more
73,1324
+  def test_greedy_one_or_moretest_greedy_one_or_more
80,1449
+  def test_non_greedy_one_or_moretest_non_greedy_one_or_more
87,1623
+  def test_repeat_fixed_numbertest_repeat_fixed_number
94,1810
+  def test_repeat_rangetest_repeat_range
101,1944
+  def test_repeat_greedytest_repeat_greedy
110,2118
+  def test_repeat_non_greedytest_repeat_non_greedy
116,2248
+  def test_at_leasttest_at_least
122,2391
+  def test_at_least_greedytest_at_least_greedy
129,2530
+  def test_at_least_non_greedytest_at_least_non_greedy
135,2661
+  def test_at_mosttest_at_most
141,2804
+  def test_at_most_greedytest_at_most_greedy
151,2992
+  def test_at_most_non_greedytest_at_most_non_greedy
157,3122
+  def test_optionaltest_optional
169,3469
+  def test_any_with_no_argumentstest_any_with_no_arguments
176,3585
+  def test_no_optionstest_no_options
187,3788
+  def test_any_with_multilinetest_any_with_multiline
196,3973
+  def test_ignore_casetest_ignore_case
202,4086
+  def test_partial_ignore_casetest_partial_ignore_case
208,4190
+  def test_options_no_not_modify_existing_rexpstest_options_no_not_modify_existing_rexps
215,4337
+  def test_any_with_a_character_listtest_any_with_a_character_list
223,4477
+  def test_any_with_special_charstest_any_with_special_chars
231,4627
+  def test_any_with_a_range_of_charstest_any_with_a_range_of_chars
243,4860
+  def test_any_with_a_range_and_mix_of_charstest_any_with_a_range_and_mix_of_chars
248,4980
+  def test_none_with_a_character_listtest_none_with_a_character_list
253,5093
+  def test_none_with_special_charstest_none_with_special_chars
261,5245
+  def test_none_with_a_range_of_charstest_none_with_a_range_of_chars
273,5480
+  def test_none_with_a_range_and_mix_of_charstest_none_with_a_range_and_mix_of_chars
281,5644
+  def test_alltest_all
289,5820
+  def test_almost_alltest_almost_all
297,5948
+  def test_all_across_linestest_all_across_lines
305,6090
+  def test_linetest_line
311,6195
+  def test_boltest_bol
319,6335
+  def test_eoltest_eol
327,6469
+  def test_begintest_begin
335,6609
+  def test_begin2test_begin2
344,6770
+  def test_endtest_end
353,6937
+  def test_end2test_end2
363,7125
+  def test_very_endtest_very_end
373,7319
+  def test_hex_digittest_hex_digit
383,7517
+  def test_hex_digitstest_hex_digits
392,7671
+  def test_digittest_digit
398,7787
+  def test_digitstest_digits
407,7935
+  def test_breaktest_break
413,8043
+  def test_nonspacetest_nonspace
419,8180
+  def test_nonspacestest_nonspaces
430,8374
+  def test_spacetest_space
438,8531
+  def test_spacestest_spaces
449,8742
+  def test_word_chartest_word_char
458,8897
+  def test_wordtest_word
467,9052
+  def test_single_capturetest_single_capture
475,9217
+  def test_multiple_capturetest_multiple_capture
482,9387
+  def test_precedence_concatentaion_vs_alterationtest_precedence_concatentaion_vs_alteration
495,9883
+  def test_precendence_of_eoltest_precendence_of_eol
502,10046
+  def test_exampletest_example
506,10110
+  def test_date_parsertest_date_parser
516,10450
+  def test_date_capturetest_date_capture
537,11158
+  def test_name_map_returns_map_of_keywordstest_name_map_returns_map_of_keywords
545,11363
+  def date_redate_re
556,11648
+    def date_redate_re
562,11725

data/lib/re.rb

@@ -35,9 +35,9 @@
 # groups can be retrieved by name:
 #
 #   result = date.match("2009-01-23")
-#   result.data(:year)   # => "2009"
-#   result.data(:month)  # => "01"
-#   result.data(:day)    # => "23"
+#   result[:year]      # => "2009"
+#   result[:month]     # => "01"
+#   result[:day]       # => "23"
 #
 # == Usage
 #
@@ -164,8 +164,7 @@ module Re
     NUMBERS = [
       MAJOR = 0,
       MINOR = 0,
-      BUILD = 5,
-      BETA  = nil,
+      BUILD = 6,
     ].compact
   end
   VERSION = Version::NUMBERS.join('.')
@@ -173,6 +172,8 @@ module Re
   # Re::Result captures the result of a match and allows lookup of the
   # captured groups by name.
   class Result
+    include Enumerable
+
     # Create a Re result object with the match data and the original
     # Re::Rexp object.
     def initialize(match_data, rexp)
@@ -191,6 +192,20 @@ module Re
       index ? @match_data[index] : nil
     end
 
+    def keys
+      name_map.keys.sort_by { |k| name_map[k] }
+    end
+    
+    def values
+      keys.map { |k| self[k] }
+    end
+
+    def each
+      keys.each do |k|
+        yield([k, self[k]])
+      end
+    end
+
     private
 
     # Lazy eval map of names to capture indices.
@@ -516,11 +531,11 @@ module Re
     # Examples:
     #
     #   re.any                            -- matches any character
-    #   re.any("aieouy")                  -- matches vowels
-    #   re.any("0-9")                     -- matches digits
-    #   re.any("A-Z", "a-z", "0-9")       -- matches alphanumerics
-    #   re.any("A-Z", "a-z", "0-9", "_")  -- matches alphanumerics
-    #                                        plus an underscore
+    #   re.any("aieouy")                  -- matches any vowel
+    #   re.any("0-9")                     -- matches any digit
+    #   re.any("A-Z", "a-z", "0-9")       -- matches any alphanumeric character
+    #   re.any("A-Z", "a-z", "0-9", "_")  -- matches any alphanumeric character
+    #                                        or an underscore
     #
     def any(*chars)
       if chars.empty?
@@ -637,7 +652,7 @@ module Re
     # Regular expression that matches a single digit.  (equivalent to
     # /\d/)
     def digit
-      @digit ||= any("0-9")
+      @digit ||= Rexp.raw("\\d")
     end
     
     # :call-seq:

data/test/re_test.rb

@@ -8,6 +8,40 @@
 require 'test/unit'
 require 're'
 
+class ReResultTeset < Test::Unit::TestCase
+  include Re
+  extend Re
+  
+  PATTERN = re.any("a-z").one_or_more.capture(:alphas) + re.digits.capture(:digits)
+  
+  def setup
+    @result = PATTERN.match("<abc123>")
+  end
+  
+  def test_result_has_full_match
+    assert_equal "abc123", @result.full_match
+  end
+
+  def test_result_has_individual_matches
+    assert_equal "abc", @result[:alphas]
+    assert_equal "123", @result[:digits]
+  end
+
+  def test_result_has_capture_keys
+    assert_equal [:alphas, :digits], @result.keys
+  end
+
+  def test_result_has_capture_values
+    assert_equal ["abc", "123"], @result.values
+  end
+
+  def test_result_can_be_enumerated
+    assert_equal [[:alphas, "abc"], [:digits, "123"]], @result.map {
+      |item| item
+    }
+  end
+end
+
 class ReTest < Test::Unit::TestCase
   include Re
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: re
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -05:00
+date: 2010-05-06 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +30,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- TAGS
 - lib/re.rb
 - test/re_test.rb
 has_rdoc: true
@@ -45,18 +51,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: re-lib
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Construct Ruby Regular Expressions