mail_address 1.2.19 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13603b8b09a30e1641652023214e199d838af06d4d7022c5d0c97a53798f495f
-  data.tar.gz: 1c6ca7323e50be0d24572415bbc90afe7c5f7f0b205a92fb4a03c84594def2f2
+  metadata.gz: 3ac1b18916f09e9ab8d6b774632f191f7eb3cc941df6e96267f4f72aec2fdfe5
+  data.tar.gz: 19ec24086e0f203ed3c9a18052d82acebd4831d968b25fdc5124ec8ed582302f
 SHA512:
-  metadata.gz: 97d7c77f4e28b7c5bb38b2a035356e54147c0d0abbbedd7b028140283656b3a67289eadc5c8406782f8dd4b03f0479e54324402f4c84aa8fc7259ddfe4d5d7bb
-  data.tar.gz: 65c4d48be8dd2f856803a0825018200c736fcd25084505c7b5deb06a80e3743929630060f6a72e23d89257608469ce6a19c6ddfad6a221b0a9564c2a7de54048
+  metadata.gz: cb6fecb18ae04b8aa664b870c1c90751ad612c6a78b216c6760df79565b652e5822dd6d29ee0586e47891aaaa8fd70925d38eb6177c0217491df3bf5673f253e
+  data.tar.gz: 81cd4080f262badace8c5254f91934b7086304f5977308c28461cf87156c47ff4dd65486ff1a78977204dbf33eab0ce9d48630da96bb8b31ce3d9e3dcad2bedc

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake spec

data/CLAUDE.md

@@ -0,0 +1,43 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+MailAddress は Perl の `Mail::Address` モジュールを Ruby に移植したメールアドレスパーサー gem。RFC非準拠のアドレス（docomo/au などの日本のキャリアメールで使われる `..` や末尾 `.`）もパース可能。ランタイム依存なし（Pure Ruby）。
+
+## Commands
+
+```bash
+# テスト実行（デフォルトの rake タスク）
+bundle exec rake spec
+
+# 特定ファイルのテスト
+bundle exec rspec spec/mail_address_spec.rb
+
+# 特定行のテスト
+bundle exec rspec spec/mail_address_spec.rb:10
+```
+
+リンターは未設定。
+
+## Architecture
+
+### コア構造
+
+- **`lib/mail_address.rb`** — エントリポイント。`MailAddress.parse`, `MailAddress.parse_first`, `MailAddress.parse_simple` を提供
+- **`lib/mail_address/address.rb`** — `MailAddress::Address` クラス。パース結果を保持（`phrase`, `address`, `original`）し、`name`, `host`, `user`, `format` メソッドを提供
+- **`lib/mail_address/mail_address.rb`** — メインのパースロジック。トークン化と複雑なアドレスフォーマットの処理
+- **`lib/mail_address/simple_parser.rb`** — Google Closure Library ベースのシンプルパーサー（スペース/カンマ区切りのアドレス向け）
+
+### パース戦略
+
+2つのパーサーを使い分ける:
+- **メインパーサー** (`parse`) — RFC準拠・非準拠の複雑なフォーマットを処理。括弧コメント、クォート、MIME エンコードなどに対応
+- **シンプルパーサー** (`parse_simple` / `g_parse`) — 空白・カンマ区切りの単純なリスト向け
+
+### コーディング規約
+
+- プライベートメソッドは `_` プレフィックス（例: `_tokenize`, `_complete`）
+- 定数は `UPPER_CASE`
+- テストは RSpec 3 の `expect` 構文を使用

data/lib/mail_address/address.rb

@@ -27,7 +27,7 @@ module MailAddress
 
       email_address = enquote ? quoted_address : @address
 
-      if !@phrase.nil? && @phrase.length > 0
+      if !@phrase.nil? && !@phrase.empty?
         # if @phrase.match(/\A\(/) && @phrase.match(/\)\z/)
         #   addr.push(email_address) if !@address.nil? && @address.length > 0
         #   addr.push(@phrase)
@@ -35,11 +35,11 @@ module MailAddress
           addr.push(
             @phrase.match(/^(?:#{ATEXT})+$/) ? @phrase
             : @phrase.match(/(?<!\\)"/)      ? @phrase
-            : %Q("#{@phrase}")
+            : "\"#{@phrase}\""
             )
-          addr.push "<#{email_address}>" if !@address.nil? && @address.length > 0
+          addr.push "<#{email_address}>" if !@address.nil? && !@address.empty?
         # end
-      elsif !@address.nil? && @address.length > 0
+      elsif !@address.nil? && !@address.empty?
         addr.push(email_address)
       end
       addr.join(' ')
@@ -48,19 +48,19 @@ module MailAddress
     def name
       phrase = @phrase.dup
       name   = Address._extract_name(phrase)
-      name.length > 0 ? name : nil
+      !name.empty? ? name : nil
     end
 
     def host
-      addr = @address || '';
+      addr = @address || ''
       i = addr.rindex('@')
-      i.nil? ? nil : addr[i + 1 .. -1]
+      addr[(i + 1)..] if i
     end
 
     def user
-      addr = @address || '';
+      addr = @address || ''
       i = addr.rindex('@')
-      i.nil? ? addr : addr[0 ... i]
+      i ? addr[0...i] : addr
     end
 
     def quoted_address
@@ -78,18 +78,16 @@ module MailAddress
     # given a comment, attempt to extract a person's name
     def self._extract_name(name)
       # This function can be called as method as well
-      return '' if name.nil? || name == ''
+      return '' if name.nil? || name.empty?
 
       # Using encodings, too hard. See Mail::Message::Field::Full.
-      return '' if name.match(/\=\?.*?\?\=/)
+      return '' if name.match?(/\=\?.*?\?\=/)
 
       # trim whitespace
-      name.sub!(/^\s+/, '')
-      name.sub!(/\s+$/, '')
-      name.sub!(/\s+/, ' ')
+      name = name.strip.gsub(/\s+/, ' ')
 
       # Disregard numeric names (e.g. 123456.1234@compuserve.com)
-      return "" if name.match(/^[\d ]+$/)
+      return '' if name.match?(/^[\d ]+$/)
 
       name.sub!(/^\((.*)\)$/, '\1') # remove outermost parenthesis
       name.sub!(/^"(.*)"$/, '\1')   # remove outer quotation marks

data/lib/mail_address/mail_address.rb

@@ -10,12 +10,12 @@ module MailAddress
     line = lines.join('').strip
 
     # empty or <> or < or >
-    if line.empty? || line.match(/\A[<>;, \\]+\z/)
+    if line.empty? || line.match?(/\A[<>;, \\]+\z/)
       return [ MailAddress::Address.new(line, nil, line) ]
     end
 
     # undisclosed-recipient
-    if line.match(/undisclosed[ \-]recipients?: ?;?/i)
+    if line.match?(/undisclosed[ \-]recipients?: ?;?/i)
       return [ MailAddress::Address.new(line, nil, line) ]
     end
 
@@ -27,7 +27,7 @@ module MailAddress
     len    = tokens.length
     _next  = _find_next idx, tokens, len
 
-    for idx in 0 ... len do
+    (0...len).each do |idx|
 
       token = tokens[idx]
       substr = token[0, 1]
@@ -55,7 +55,8 @@ module MailAddress
         if depth > 0
           # raise "Unmatched '<>' in line"
           o = MailAddress::Address.new(original, nil, original)
-          phrase.clear; address.clear
+          phrase.clear
+          address.clear
         else
           o = _complete(phrase, address, original)
         end
@@ -70,7 +71,7 @@ module MailAddress
         address.push(token)
       elsif (_next == '<')
         phrase.push(token)
-      elsif ( token.match(/^[.\@:;]/) || address.empty? || address[-1].match(/^[.\@:;]/) )
+      elsif ( token.match?(/^[.\@:;]/) || address.empty? || address[-1].match?(/^[.\@:;]/) )
         token.strip!
         address.push(token)
       else
@@ -90,10 +91,9 @@ module MailAddress
     line.sub!(/\A\s+/, '')
     line.gsub!(/[\r\n]+/,' ')
 
-    while (line != '')
-      tmp = nil
+    until line.empty?
       if (
-          line.match(/"[^"]+"/) && line.sub!(/\A(\\?"(?:[^"\\]+|\\.)*")(\s*)/, '')  || # "..."
+          line.match?(/"[^"]+"/) && line.sub!(/\A(\\?"(?:[^"\\]+|\\.)*")(\s*)/, '')  || # "..."
           line.sub!(/\A([^\s()<>\@,;:\\".\[\]]+)(\s*)/, '') ||
           line.sub!(/\A([()<>\@,;:\\".\[\]])(\s*)/, '')
           )
@@ -127,7 +127,7 @@ module MailAddress
   end
 
   def self._complete (phrase, address, original)
-    phrase.length > 0 || address.length > 0 or return nil
+    return nil if phrase.empty? && address.empty?
 
     name = phrase.join('').strip
 
@@ -140,7 +140,8 @@ module MailAddress
     name = name.gsub(ESCAPED_BACKSLASHES_, '\\')
 
     new_address = MailAddress::Address.new(name, address.join(''), original)
-    phrase.clear; address.clear
+    phrase.clear
+    address.clear
     new_address
   end
 

data/lib/mail_address/simple_parser.rb

@@ -12,10 +12,10 @@ module MailAddress
   # CHARS_REQUIRE_QUOTES_ = SPECIAL_CHARS + ADDRESS_SEPARATORS_
   ESCAPED_DOUBLE_QUOTES_ = /\\\"/
   ESCAPED_BACKSLASHES_ = /\\\\/
-  QUOTED_REGEX_STR_ = '[+a-zA-Z0-9_.!#$%&\'*\\/=?^`{|}~-]+'
+  QUOTED_REGEX_STR_ = '[+a-zA-Z0-9_.!#$%&\'*\\/=?^`{|}~\-]+'
   UNQUOTED_REGEX_STR_ = '"' + QUOTED_REGEX_STR_ + '"'
   LOCAL_PART_REGEXP_STR_ = '(?:' + QUOTED_REGEX_STR_ + '|' + UNQUOTED_REGEX_STR_ + ')'
-  DOMAIN_PART_REGEXP_STR_ = '([a-zA-Z0-9-_]+\\.)+[a-zA-Z0-9]{2,63}'
+  DOMAIN_PART_REGEXP_STR_ = '([a-zA-Z0-9\-_]+\\.)+[a-zA-Z0-9]{2,63}'
   EMAIL_ADDRESS_ = Regexp.new('\\A' + LOCAL_PART_REGEXP_STR_ + '@' + DOMAIN_PART_REGEXP_STR_ + '\\z')
 
   def self.parse_simple(str)
@@ -25,13 +25,13 @@ module MailAddress
     # Remove non-UNIX-style newlines that would otherwise cause getToken_ to
     # choke. Remove multiple consecutive whitespace characters for the same
     # reason.
-    str = self.collapse_whitespace(str)
+    str = collapse_whitespace(str)
     i = 0
-    while (i < str.length)
+    while i < str.length
       token = get_token(str, i)
-      if self.is_address_separator(token) || (token == ' ' && self.is_valid(self.parse_internal(email)))
-        if !self.is_empty_or_whitespace(email)
-          result.push(self.parse_internal(email))
+      if is_address_separator(token) || (token == ' ' && is_valid(parse_internal(email)))
+        if !is_empty_or_whitespace(email)
+          result.push(parse_internal(email))
         end
         email = ''
         i += 1
@@ -42,34 +42,34 @@ module MailAddress
     end
 
     # Add the final token.
-    if (!self.is_empty_or_whitespace(email))
-      result.push(self.parse_internal(email))
+    if !is_empty_or_whitespace(email)
+      result.push(parse_internal(email))
     end
-    return result
+    result
   end
 
   def self.parse_internal(addr)
     name = ''
     address = ''
     i = 0
-    while (i < addr.length)
+    while i < addr.length
       token = get_token(addr, i)
-      if (token[0] == '<' && token.index('>'))
+      if token[0] == '<' && token.index('>')
         end_i = token.index('>')
         address = token[1, end_i - 1]
-      elsif (address == '')
+      elsif address == ''
         name << token
       end
       i += token.length
     end
 
     # Check if it's a simple email address of the form "jlim@google.com".
-    if (address == '' && name.index('@'))
+    if address == '' && name.index('@')
       address = name
       name = ''
     end
 
-    name = self.collapse_whitespace(name)
+    name = collapse_whitespace(name)
     name = name[1 .. -2] if name.start_with?('\'') && name.end_with?('\'')
     name = name[1 .. -2] if name.start_with?('"') && name.end_with?('"')
 
@@ -89,7 +89,7 @@ module MailAddress
     p = OPENERS_.index(ch)
     return ch unless p
 
-    if (self.is_escaped_dbl_quote(str, pos))
+    if is_escaped_dbl_quote(str, pos)
       # If an opener is an escaped quote we do not treat it as a real opener
       # and keep accumulating the token.
       return ch
@@ -99,19 +99,18 @@ module MailAddress
 
     # If the closer is a quote we go forward skipping escaped quotes until we
     # hit the real closing one.
-    while (end_pos && end_pos >= 0 && self.is_escaped_dbl_quote(str, end_pos))
+    while end_pos && end_pos >= 0 && is_escaped_dbl_quote(str, end_pos)
       end_pos = str.index(closer_char, end_pos + 1)
     end
 
-    token = (end_pos && end_pos >= 0) ? str[pos .. end_pos] : ch
-    return token
+    (end_pos && end_pos >= 0) ? str[pos .. end_pos] : ch
   end
 
   def self.is_escaped_dbl_quote(str, pos)
     return false if str[pos] != '"'
     slash_count = 0
 
-    for idx in (pos - 1).downto(0)
+    (pos - 1).downto(0) do |idx|
       break unless str[idx] == '\\'
       slash_count += 1
     end
@@ -123,7 +122,7 @@ module MailAddress
   end
 
   def self.is_empty_or_whitespace(str)
-    /\A[\s\xc2\xa0]*\z/ =~ str
+    str.match?(/\A[\s\xc2\xa0]*\z/)
   end
 
   def self.is_address_separator(ch)

data/lib/mail_address/version.rb

@@ -1,3 +1,3 @@
 module MailAddress
-  VERSION = "1.2.19"
+  VERSION = "1.3.0"
 end

data/lib/mail_address.rb

@@ -4,5 +4,4 @@ module MailAddress
   require "mail_address/address"
   require "mail_address/mail_address"
   require "mail_address/simple_parser"
-  require "mail_address/version"
 end

data/mail_address.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mail_address/version'
 
@@ -8,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = MailAddress::VERSION
   spec.authors       = ["Kizashi Nagata"]
   spec.email         = ["kizashi1122@gmail.com"]
-  spec.summary       = %q{Simple Mail Address Parser}
-  spec.description   = %q{A practical mail address parser implemented based on Perl Module Mail::Address.}
+  spec.summary       = "Simple Mail Address Parser"
+  spec.description   = "A practical mail address parser implemented based on Perl Module Mail::Address."
   spec.homepage      = "https://github.com/kizashi1122/mail_address"
   spec.license       = "MIT"
 

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
 require 'simplecov'
-require 'coveralls'
-Coveralls.wear!
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
-SimpleCov.start do
-  add_filter '.bundle/'
+begin
+  require 'coveralls'
+  Coveralls.wear! do
+    add_filter '.bundle/'
+  end
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ])
+rescue LoadError
+  SimpleCov.start do
+    add_filter '.bundle/'
+  end
 end
 
 require 'rubygems'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_address
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.3.0
 platform: ruby
 authors:
 - Kizashi Nagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2026-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,9 +80,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CLAUDE.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Simple Mail Address Parser

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-- 2.0.0