email_address_validator 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a7903f966cc1c88ea370e25ef041484c4d1fa6
-  data.tar.gz: d1f7aeafad963a543d4ad128e2a3b1108ea7cc67
+  metadata.gz: 2cc3e2b1d36178731391c09de74d8ee9c378f5f6
+  data.tar.gz: 30b987b6aed56e55292fea9240f272613d63fc8a
 SHA512:
-  metadata.gz: 6f9aa6e4b76be4595fff9ee5c04776bdf7fc6f77bc32ebed9f11167059559252807877c2d32cd6e4f03f87ddcea78a755fa373fd35894f07a424a245ab9fc8c6
-  data.tar.gz: b9092df595f541c160d68558f4f44b41fc48dfe92763a61bce501e5722a9faeb8df8ac31f2b226a5408306995e5de9787aefb750c1c90c73f37def73b846b0ba
+  metadata.gz: 8dd649a91a55f24208cffdfd3f681b80e8b31759c728b2ef8ca355a0a398697d70cd022de075ab61d346e0918255bd8071930ef2f5210dbc7110e63b53f8a162
+  data.tar.gz: 8620453673d42a5e172e4afe70af4c84f271780c875a8e1a6f61c71ebf5ef12511af9c74e915493294355df7eaec629fef9238bfe9fefe36a4b3be0e6140eae6

data/Gemfile

@@ -2,5 +2,5 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "rspec"
+gem "rspec", "~> 2.0"
 # gem "rails"

data/Gemfile.lock

@@ -3,22 +3,18 @@ GEM
   specs:
     diff-lcs (1.2.5)
     rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake
-  rspec
+  rspec (~> 2.0)

data/grammars/rfc2822.kpeg

@@ -3,7 +3,7 @@
 %% { attr_accessor :validate_domain }
 
 d(num) = <.> &{ text[0] == num }
-d_btw(start,fin) = <.> &{ t = text[0]; t >= start && t <= fin }
+d_btw(start,fin) = <.> &{ t = text[0].ord; t >= start && t <= fin }
 
 WSP = " " | d(9)
 

data/grammars/rfc822.kpeg

@@ -19,16 +19,16 @@ CRLF = CR LF
 
 linear_white_space = (CRLF? LWSP_char)+
 
-atom = /[^\]\x00-\x20 \x7F\x80-\xFF()<>@,;:\\".\[]+/
+atom = /[^\]\x00-\x20 \x7F\x80-\xFF()<>@,;:\\".\[]+/n
 
-ctext = /[^)\\\x0D\x80-\xFF(]+/
+ctext = /[^)\\\x0D\x80-\xFF(]+/n
       | linear_white_space
 
 
-dtext = /[^\]\\\x0D\x80-\xFF\[]+/
+dtext = /[^\]\\\x0D\x80-\xFF\[]+/n
       | linear_white_space
 
-qtext = /[^"\\\x0D\x80-\xFF]+/
+qtext = /[^"\\\x0D\x80-\xFF]+/n
       | linear_white_space
 
 

data/lib/email_address_validator.rb

@@ -52,7 +52,9 @@ module EmailAddressValidator
   end
   
   # Shorthand for +EmailAddressParser.validate_2822_addr
-  def self.validate_addr(addr, validate_domain=false); self.validate_2822; end
+  def self.validate_addr(addr, validate_domain=false)
+    validate_2822_addr addr, validate_domain
+  end
 
   # Validates +addr+ against the addr_spec portion of RFC 2822.
   # This is what most people actually want out of an email validator
@@ -65,7 +67,9 @@ module EmailAddressValidator
   end
 
   # Shorthand for +EmailAddressParser.validate_2822
-  def self.validate(addr, validate_domain=false); self.validate_2822; end
+  def self.validate(addr, validate_domain=false)
+    validate_2822 addr, validate_domain
+  end
 
   # Validates an email address according to RFC 2822
   # This validates addresses against the full spec, which

data/lib/email_address_validator/domain-parser.rb

@@ -1,8 +1,19 @@
 class EmailAddressValidator::DomainParser
-# STANDALONE START
+  # :stopdoc:
+
+    # This is distinct from setup_parser so that a standalone parser
+    # can redefine #initialize and still have access to the proper
+    # parser setup code.
+    def initialize(str, debug=false)
+      setup_parser(str, debug)
+    end
+
+
+
+    # Prepares for parsing +str+.  If you define a custom initialize you must
+    # call this method before #parse
     def setup_parser(str, debug=false)
-      @string = str
-      @pos = 0
+      set_string str, 0
       @memoizations = Hash.new { |h,k| h[k] = {} }
       @result = nil
       @failed_rule = nil
@@ -11,22 +22,10 @@ class EmailAddressValidator::DomainParser
       setup_foreign_grammar
     end
 
-    def setup_foreign_grammar
-    end
-
-    # This is distinct from setup_parser so that a standalone parser
-    # can redefine #initialize and still have access to the proper
-    # parser setup code.
-    #
-    def initialize(str, debug=false)
-      setup_parser(str, debug)
-    end
-
     attr_reader :string
-    attr_reader :result, :failing_rule_offset
-    attr_accessor :pos
+    attr_reader :failing_rule_offset
+    attr_accessor :result, :pos
 
-    # STANDALONE START
     def current_column(target=pos)
       if c = string.rindex("\n", target-1)
         return target - c - 1
@@ -54,12 +53,19 @@ class EmailAddressValidator::DomainParser
       lines
     end
 
-    #
+
 
     def get_text(start)
       @string[start..@pos-1]
     end
 
+    # Sets the string and current parsing position for the parser.
+    def set_string string, pos
+      @string = string
+      @string_size = string ? string.size : 0
+      @pos = pos
+    end
+
     def show_pos
       width = 10
       if @pos < width
@@ -166,19 +172,19 @@ class EmailAddressValidator::DomainParser
       return nil
     end
 
-    if "".respond_to? :getbyte
+    if "".respond_to? :ord
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
-        s = @string.getbyte @pos
+        s = @string[@pos].ord
         @pos += 1
         s
       end
     else
       def get_byte
-        if @pos >= @string.size
+        if @pos >= @string_size
           return nil
         end
 
@@ -189,41 +195,37 @@ class EmailAddressValidator::DomainParser
     end
 
     def parse(rule=nil)
+      # We invoke the rules indirectly via apply
+      # instead of by just calling them as methods because
+      # if the rules use left recursion, apply needs to
+      # manage that.
+
       if !rule
-        _root ? true : false
+        apply(:_root)
       else
-        # This is not shared with code_generator.rb so this can be standalone
         method = rule.gsub("-","_hyphen_")
-        __send__("_#{method}") ? true : false
+        apply :"_#{method}"
       end
     end
 
-    class LeftRecursive
-      def initialize(detected=false)
-        @detected = detected
-      end
-
-      attr_accessor :detected
-    end
-
     class MemoEntry
       def initialize(ans, pos)
         @ans = ans
         @pos = pos
-        @uses = 1
         @result = nil
+        @set = false
+        @left_rec = false
       end
 
-      attr_reader :ans, :pos, :uses, :result
-
-      def inc!
-        @uses += 1
-      end
+      attr_reader :ans, :pos, :result, :set
+      attr_accessor :left_rec
 
       def move!(ans, pos, result)
         @ans = ans
         @pos = pos
         @result = result
+        @set = true
+        @left_rec = false
       end
     end
 
@@ -231,30 +233,61 @@ class EmailAddressValidator::DomainParser
       old_pos = @pos
       old_string = @string
 
-      @pos = other.pos
-      @string = other.string
+      set_string other.string, other.pos
 
       begin
         if val = __send__(rule, *args)
           other.pos = @pos
+          other.result = @result
         else
           other.set_failed_rule "#{self.class}##{rule}"
         end
         val
       ensure
-        @pos = old_pos
-        @string = old_string
+        set_string old_string, old_pos
+      end
+    end
+
+    def apply_with_args(rule, *args)
+      memo_key = [rule, args]
+      if m = @memoizations[memo_key][@pos]
+        @pos = m.pos
+        if !m.set
+          m.left_rec = true
+          return nil
+        end
+
+        @result = m.result
+
+        return m.ans
+      else
+        m = MemoEntry.new(nil, @pos)
+        @memoizations[memo_key][@pos] = m
+        start_pos = @pos
+
+        ans = __send__ rule, *args
+
+        lr = m.left_rec
+
+        m.move! ans, @pos, @result
+
+        # Don't bother trying to grow the left recursion
+        # if it's failing straight away (thus there is no seed)
+        if ans and lr
+          return grow_lr(rule, args, start_pos, m)
+        else
+          return ans
+        end
+
+        return ans
       end
     end
 
     def apply(rule)
       if m = @memoizations[rule][@pos]
-        m.inc!
-
-        prev = @pos
         @pos = m.pos
-        if m.ans.kind_of? LeftRecursive
-          m.ans.detected = true
+        if !m.set
+          m.left_rec = true
           return nil
         end
 
@@ -262,19 +295,20 @@ class EmailAddressValidator::DomainParser
 
         return m.ans
       else
-        lr = LeftRecursive.new(false)
-        m = MemoEntry.new(lr, @pos)
+        m = MemoEntry.new(nil, @pos)
         @memoizations[rule][@pos] = m
         start_pos = @pos
 
         ans = __send__ rule
 
+        lr = m.left_rec
+
         m.move! ans, @pos, @result
 
         # Don't bother trying to grow the left recursion
         # if it's failing straight away (thus there is no seed)
-        if ans and lr.detected
-          return grow_lr(rule, start_pos, m)
+        if ans and lr
+          return grow_lr(rule, nil, start_pos, m)
         else
           return ans
         end
@@ -283,12 +317,16 @@ class EmailAddressValidator::DomainParser
       end
     end
 
-    def grow_lr(rule, start_pos, m)
+    def grow_lr(rule, args, start_pos, m)
       while true
         @pos = start_pos
         @result = m.result
 
-        ans = __send__ rule
+        if args
+          ans = __send__ rule, *args
+        else
+          ans = __send__ rule
+        end
         return nil unless ans
 
         break if @pos <= m.pos
@@ -314,7 +352,9 @@ class EmailAddressValidator::DomainParser
       RuleInfo.new(name, rendered)
     end
 
-    #
+
+  # :startdoc:
+  # :stopdoc:
   def setup_foreign_grammar; end
 
   # domain = < subdomain > &{ text.size < 255 }
@@ -322,22 +362,22 @@ class EmailAddressValidator::DomainParser
 
     _save = self.pos
     while true # sequence
-    _text_start = self.pos
-    _tmp = apply(:_subdomain)
-    if _tmp
-      text = get_text(_text_start)
-    end
-    unless _tmp
-      self.pos = _save
+      _text_start = self.pos
+      _tmp = apply(:_subdomain)
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = begin;  text.size < 255 ; end
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end
-    _save1 = self.pos
-    _tmp = begin;  text.size < 255 ; end
-    self.pos = _save1
-    unless _tmp
-      self.pos = _save
-    end
-    break
     end # end sequence
 
     set_failed_rule :_domain unless _tmp
@@ -350,31 +390,31 @@ class EmailAddressValidator::DomainParser
     _save = self.pos
     while true # choice
 
-    _save1 = self.pos
-    while true # sequence
-    _tmp = apply(:_subdomain)
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    _tmp = match_string(".")
-    unless _tmp
-      self.pos = _save1
-      break
-    end
-    _tmp = apply(:_label)
-    unless _tmp
-      self.pos = _save1
-    end
-    break
-    end # end sequence
+      _save1 = self.pos
+      while true # sequence
+        _tmp = apply(:_subdomain)
+        unless _tmp
+          self.pos = _save1
+          break
+        end
+        _tmp = match_string(".")
+        unless _tmp
+          self.pos = _save1
+          break
+        end
+        _tmp = apply(:_label)
+        unless _tmp
+          self.pos = _save1
+        end
+        break
+      end # end sequence
 
-    break if _tmp
-    self.pos = _save
-    _tmp = apply(:_label)
-    break if _tmp
-    self.pos = _save
-    break
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_label)
+      break if _tmp
+      self.pos = _save
+      break
     end # end choice
 
     set_failed_rule :_subdomain unless _tmp
@@ -386,31 +426,31 @@ class EmailAddressValidator::DomainParser
 
     _save = self.pos
     while true # sequence
-    _tmp = apply(:_let_hyphen_dig)
-    unless _tmp
-      self.pos = _save
-      break
-    end
-    _text_start = self.pos
-    while true
-    _tmp = apply(:_let_hyphen_dig_hyphen_hyp)
-    break unless _tmp
-    end
-    _tmp = true
-    if _tmp
-      text = get_text(_text_start)
-    end
-    unless _tmp
-      self.pos = _save
+      _tmp = apply(:_let_hyphen_dig)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _text_start = self.pos
+      while true
+        _tmp = apply(:_let_hyphen_dig_hyphen_hyp)
+        break unless _tmp
+      end
+      _tmp = true
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _tmp = begin;  text.size < 63 && (text.size == 0 || text[-1] != ?-) ; end
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end
-    _save2 = self.pos
-    _tmp = begin;  text.size < 63 && (text.size == 0 || text[-1] != ?-) ; end
-    self.pos = _save2
-    unless _tmp
-      self.pos = _save
-    end
-    break
     end # end sequence
 
     set_failed_rule :_label unless _tmp
@@ -422,13 +462,13 @@ class EmailAddressValidator::DomainParser
 
     _save = self.pos
     while true # choice
-    _tmp = apply(:_let_hyphen_dig)
-    break if _tmp
-    self.pos = _save
-    _tmp = match_string("-")
-    break if _tmp
-    self.pos = _save
-    break
+      _tmp = apply(:_let_hyphen_dig)
+      break if _tmp
+      self.pos = _save
+      _tmp = match_string("-")
+      break if _tmp
+      self.pos = _save
+      break
     end # end choice
 
     set_failed_rule :_let_hyphen_dig_hyphen_hyp unless _tmp
@@ -440,13 +480,13 @@ class EmailAddressValidator::DomainParser
 
     _save = self.pos
     while true # choice
-    _tmp = apply(:_letter)
-    break if _tmp
-    self.pos = _save
-    _tmp = apply(:_digit)
-    break if _tmp
-    self.pos = _save
-    break
+      _tmp = apply(:_letter)
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_digit)
+      break if _tmp
+      self.pos = _save
+      break
     end # end choice
 
     set_failed_rule :_let_hyphen_dig unless _tmp
@@ -472,19 +512,19 @@ class EmailAddressValidator::DomainParser
 
     _save = self.pos
     while true # sequence
-    _tmp = apply(:_domain)
-    unless _tmp
-      self.pos = _save
+      _tmp = apply(:_domain)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = get_byte
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+      end
       break
-    end
-    _save1 = self.pos
-    _tmp = get_byte
-    _tmp = _tmp ? nil : true
-    self.pos = _save1
-    unless _tmp
-      self.pos = _save
-    end
-    break
     end # end sequence
 
     set_failed_rule :_root unless _tmp
@@ -500,4 +540,5 @@ class EmailAddressValidator::DomainParser
   Rules[:_letter] = rule_info("letter", "/[A-Za-z]/")
   Rules[:_digit] = rule_info("digit", "/[0-9]/")
   Rules[:_root] = rule_info("root", "domain !.")
+  # :startdoc:
 end