namae 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd611e09da3c6d134065dbe46162518556ce531
-  data.tar.gz: b91fd641df6a06e2b2da4bd8bcad70baa753a612
+  metadata.gz: 9c35acb2595cb60e9256141f209a97ebe717c5fd
+  data.tar.gz: ce3c39facdf1b12051b56edb8330376f777eb2d8
 SHA512:
-  metadata.gz: aa0a37702affcb7a5aa8c54961303cec1b7bfc45856bd364949a67251a66a5cde33365d0489cfe303d62beb5dd7a88c018b493b719d4d67793f8391f965a5cc5
-  data.tar.gz: 745d03394228e6420f1f95383ac62d76c9d46a4b2a101e42af6d8406e13edef0c17d3fae7740633c77504d745395427e3a996c4399e939e9bb4acf2d6afdd17f
+  metadata.gz: e3e158d44f41686c75eadb19b9a4ef984db05b57d7e2be63aa4db7b8c62bb119216ddbd6a7a1c2bc28d6068f6a7df7a7cbb2cb8f176903b43e54e2af07df21f5
+  data.tar.gz: e440237a7f090dc85cbb1e68f1388831147823794b305fcc0e6ae131fe4cb26692d841ca0f9a2facf3bcf65f5ab6ac79fe0ec492a2adeb9e8cb6eac427435eb8

data/Gemfile

@@ -8,10 +8,10 @@ end
 
 
 group :development do
-  gem 'simplecov', '~>0.8', :require => false, :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'simplecov', '~>0.8', :require => false, :platforms => :ruby
   gem 'rubinius-coverage', '~>2.0', :platform => :rbx
   gem 'coveralls', '~>0.7', :require => false
-  gem 'racc', '1.4.9', :platform => [:ruby]
+  gem 'racc', '1.4.9', :platform => :ruby
 end
 
 group :optional do
@@ -21,7 +21,8 @@ group :optional do
 end
 
 group :debug do
-  gem 'debugger', '~>1.6', :platform => [:mri_20, :mri_21, :mri_19]
+  gem 'debugger', '~>1.6', :platform => [:mri_20, :mri_19]
+  gem 'byebug', '~>3.5', :platform => [:mri_21, :mri_22]
   gem 'rubinius-compiler', '~>2.0', :platform => :rbx
   gem 'rubinius-debugger', '~>2.0', :platform => :rbx
 end

data/features/examples.feature

@@ -25,3 +25,10 @@ Feature: Parse the names in the Readme file
     Scenarios: Readme examples (sort-order)
       | name                         | given        | particle | family           | suffix | title | appellation | nick |
       | Carreño Quiñones, María-Jose | María-Jose   |          | Carreño Quiñones |        |       |             |      |
+
+    @issues @appellation @nick @suffix
+    Scenarios: Nicknames Appellations and Suffices
+      | name                              | given        | particle | family       | suffix | title     | appellation | nick |
+      | Mr. Yukihiro "Matz" Matsumoto     | Yukihiro     |          | Matsumoto    |        |           | Mr.         | Matz |
+      | Yukihiro "Matz" Matsumoto Sr.     | Yukihiro     |          | Matsumoto    | Sr.    |           |             | Matz |
+      | Mr. Yukihiro "Matz" Matsumoto Sr. | Yukihiro     |          | Matsumoto    | Sr.    |           | Mr.         | Matz |

data/features/support/env.rb

@@ -15,8 +15,11 @@ rescue LoadError
 end unless RUBY_VERSION < '1.9'
 
 begin
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  case
+  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
+  when RUBY_VERSION > '2.0'
+    require 'byebug'
   else
     require 'debugger'
   end

data/features/title.feature

@@ -0,0 +1,17 @@
+Feature: Parse names with a title
+  As a hacker who works with Namae
+  I want to be able to parse names with a title
+
+  Scenario Outline: Names with titles
+
+    When I parse the name "<name>"
+    Then the parts should be:
+      |  given  |  particle  |  family  |  suffix  |  title  |  appellation  |  nick  |
+      | <given> | <particle> | <family> | <suffix> | <title> | <appellation> | <nick> |
+
+  @names @title
+  Scenarios: Names with titles
+    | name                         | given        | particle | family       | suffix | title     |
+#    | Bernado Franecki, PhD        | Bernado      |          | Franecki     |        | PhD       |
+#    | Dr. John Smith, Ph.D.        | John         |          | Smith        |        | Dr. Ph.D. |
+

data/lib/namae/parser.rb

@@ -12,7 +12,7 @@ require 'strscan'
 module Namae
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 99)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
 
   include Singleton
 
@@ -180,72 +180,78 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 99)
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -38,   -40,   -39,    14,    22,    15,    24,   -38,   -40,   -39,
-   -38,   -40,   -39,    62,    53,    52,    54,    63,    58,   -22,
-   -22,   -34,   -22,    56,    16,    56,   -22,   -22,    53,    52,
-    54,    17,    53,    52,    54,    39,    53,    52,    54,    39,
-   -38,    39,   -22,    39,    14,    12,    15,   -38,    33,     7,
-     8,    14,    12,    15,    39,    32,     7,     8,    14,    22,
-    15,    24,    30,    46,    31,    30,    42,    31,    53,    52,
-    54,    30,    28,    31,    30,    28,    31,    30,    28,    31,
-    30,    28,    31,    30,    28,    31,    14,    22,    15,    30,
-    56,    31,    53,    52,    54,    45 ]
+   -39,    16,    32,    30,   -40,    31,    33,   -39,    17,   -39,
+   -39,   -40,    67,   -40,   -40,    66,    53,    52,    54,   -38,
+    59,   -22,    39,   -34,    45,    58,   -38,    53,    52,    54,
+    53,    52,    54,    59,    39,    39,    62,    39,    53,    52,
+    54,    14,    12,    15,    68,    39,     7,     8,    14,    12,
+    15,    58,    39,     7,     8,    14,    22,    15,    24,    14,
+    22,    15,    24,    14,    22,    15,    30,    28,    31,    30,
+    28,    31,   -19,   -19,   -19,    30,    42,    31,    30,    28,
+    31,   -20,   -20,   -20,    30,    46,    31,    30,    28,    31,
+    30,    28,    31,   -19,   -19,   -19,    53,    52,    54,    53,
+    52,    54,    39,    58,    59 ]
 
 racc_action_check = [
-    22,    15,    14,     9,     9,     9,     9,    22,    15,    14,
-    22,    15,    14,    49,    49,    49,    49,    50,    44,    42,
-    28,    49,    28,    38,     1,    50,    42,    28,    32,    32,
-    32,     1,    58,    58,    58,    32,    45,    45,    45,    58,
-    12,    23,    12,    45,     0,     0,     0,    12,    16,     0,
-     0,    17,    17,    17,    60,    11,    17,    17,    20,    20,
-    20,    20,    29,    29,    29,    24,    24,    24,    63,    63,
-    63,    25,    25,    25,    10,    10,    10,    35,    35,    35,
-    21,    21,    21,    41,    41,    41,     5,     5,     5,    43,
-    65,    43,    66,    66,    66,    27 ]
+    14,     1,    11,    43,    15,    43,    16,    14,     1,    14,
+    14,    15,    50,    15,    15,    49,    49,    49,    49,    12,
+    50,    12,    23,    49,    27,    37,    12,    32,    32,    32,
+    45,    45,    45,    38,    32,    40,    44,    45,    62,    62,
+    62,     0,     0,     0,    57,    62,     0,     0,    17,    17,
+    17,    60,    61,    17,    17,     9,     9,     9,     9,    20,
+    20,    20,    20,     5,     5,     5,    10,    10,    10,    21,
+    21,    21,    22,    22,    22,    24,    24,    24,    25,    25,
+    25,    28,    28,    28,    29,    29,    29,    35,    35,    35,
+    41,    41,    41,    42,    42,    42,    67,    67,    67,    73,
+    73,    73,    64,    70,    72 ]
 
 racc_action_pointer = [
-    41,    24,   nil,   nil,   nil,    83,   nil,   nil,   nil,     0,
-    71,    53,    40,   nil,     2,     1,    48,    48,   nil,   nil,
-    55,    77,     0,    31,    62,    68,   nil,    93,    20,    59,
-   nil,   nil,    25,   nil,   nil,    74,   nil,   nil,    13,   nil,
-   nil,    80,    19,    86,    16,    33,   nil,   nil,   nil,    11,
-    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,   nil,
-    44,   nil,   nil,    65,   nil,    80,    89 ]
+    38,     1,   nil,   nil,   nil,    60,   nil,   nil,   nil,    52,
+    63,     0,    19,   nil,     0,     4,     6,    45,   nil,   nil,
+    56,    66,    69,    12,    72,    75,   nil,    22,    78,    81,
+   nil,   nil,    24,   nil,   nil,    84,   nil,    16,    23,   nil,
+    25,    87,    90,     0,    34,    27,   nil,   nil,   nil,    13,
+    10,   nil,   nil,   nil,   nil,   nil,   nil,    35,   nil,   nil,
+    42,    42,    35,   nil,    92,   nil,   nil,    93,   nil,   nil,
+    94,   nil,    94,    96,   nil ]
 
 racc_action_default = [
-    -1,   -45,    -2,    -4,    -5,   -45,    -8,    -9,   -10,   -23,
-   -45,   -45,   -19,   -28,   -30,   -31,   -45,   -45,    -6,    -7,
-   -45,   -45,   -19,   -41,   -45,   -45,   -29,   -15,   -20,   -23,
-   -30,   -31,   -36,    67,    -3,   -45,   -15,   -11,   -42,   -43,
-   -12,   -45,   -19,   -23,   -14,   -36,   -21,   -16,   -24,   -37,
-   -26,   -32,   -38,   -39,   -40,   -14,   -44,   -13,   -36,   -17,
-   -45,   -33,   -35,   -45,   -18,   -25,   -27 ]
+    -1,   -49,    -2,    -4,    -5,   -49,    -8,    -9,   -10,   -23,
+   -49,   -49,   -19,   -28,   -30,   -31,   -49,   -49,    -6,    -7,
+   -49,   -49,   -38,   -41,   -49,   -49,   -29,   -15,   -22,   -23,
+   -30,   -31,   -36,    75,    -3,   -49,   -15,   -45,   -42,   -43,
+   -41,   -49,   -22,   -23,   -14,   -36,   -21,   -16,   -24,   -37,
+   -26,   -32,   -38,   -39,   -40,   -14,   -11,   -46,   -47,   -44,
+   -45,   -41,   -36,   -17,   -49,   -33,   -35,   -49,   -48,   -12,
+   -45,   -18,   -25,   -27,   -13 ]
 
 racc_goto_table = [
-     3,    38,    26,    66,    27,    18,     9,     2,    47,    23,
-    37,    20,    21,    26,    60,    36,    25,     3,    40,    44,
-    23,    59,    26,     9,    34,    19,     1,    35,   nil,    55,
-    43,    41,   nil,   nil,    64,    57,    26,   nil,    65,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    61,
+     3,    37,    26,    50,    56,    18,     2,     9,    47,    23,
+     1,    19,    20,    26,    73,    27,    50,     3,    60,    64,
+    23,    63,    26,    34,     9,   nil,    36,    69,    21,    40,
+    44,    43,    25,    50,   nil,    72,    26,    74,    71,    70,
+    55,   nil,   nil,    35,   nil,   nil,    61,    41,   nil,    65,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    61 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    65 ]
 
 racc_goto_check = [
-     3,    15,    16,    13,     9,     3,     7,     2,    11,     3,
-     8,     7,    10,    16,    14,     9,    10,     3,     9,     9,
-     3,    11,    16,     7,     2,     4,     1,    10,   nil,     9,
-     7,    10,   nil,   nil,    11,     9,    16,   nil,    15,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3,
+     3,     8,    17,    16,     9,     3,     2,     7,    12,     3,
+     1,     4,     7,    17,    14,    10,    16,     3,     8,    15,
+     3,    12,    17,     2,     7,   nil,    10,     9,    11,    10,
+    10,     7,    11,    16,   nil,    16,    17,     9,    12,     8,
+    10,   nil,   nil,    11,   nil,   nil,    10,    11,   nil,     3,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     3 ]
+   nil,   nil,   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,    26,     7,     0,    20,   nil,   nil,     6,   -13,    -6,
-     7,   -24,   nil,   -60,   -35,   -22,    -7 ]
+   nil,    10,     6,     0,     6,   nil,   nil,     7,   -22,   -33,
+     5,    23,   -24,   nil,   -53,   -30,   -29,    -7,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    51,     4,     5,     6,    29,   nil,    11,
-    10,   nil,    48,    49,   nil,    50,    13 ]
+   nil,   nil,   nil,    51,     4,     5,     6,    29,   nil,   nil,
+    11,    10,   nil,    48,    49,   nil,    38,    13,    57 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -259,44 +265,48 @@ racc_reduce_table = [
   1, 13, :_reduce_none,
   1, 16, :_reduce_9,
   1, 16, :_reduce_10,
-  3, 15, :_reduce_11,
-  3, 15, :_reduce_12,
-  4, 15, :_reduce_13,
+  4, 15, :_reduce_11,
+  5, 15, :_reduce_12,
+  6, 15, :_reduce_13,
   3, 15, :_reduce_14,
   2, 15, :_reduce_15,
   3, 17, :_reduce_16,
   4, 17, :_reduce_17,
   5, 17, :_reduce_18,
+  1, 22, :_reduce_none,
+  2, 22, :_reduce_20,
+  3, 22, :_reduce_21,
   1, 21, :_reduce_none,
-  2, 21, :_reduce_20,
-  3, 21, :_reduce_21,
-  1, 20, :_reduce_none,
-  1, 20, :_reduce_none,
-  1, 22, :_reduce_24,
-  3, 22, :_reduce_25,
-  1, 22, :_reduce_26,
-  3, 22, :_reduce_27,
+  1, 21, :_reduce_none,
+  1, 23, :_reduce_24,
+  3, 23, :_reduce_25,
+  1, 23, :_reduce_26,
+  3, 23, :_reduce_27,
   1, 18, :_reduce_none,
   2, 18, :_reduce_29,
-  1, 27, :_reduce_none,
-  1, 27, :_reduce_none,
-  1, 24, :_reduce_none,
-  2, 24, :_reduce_33,
-  0, 25, :_reduce_none,
+  1, 28, :_reduce_none,
+  1, 28, :_reduce_none,
   1, 25, :_reduce_none,
-  0, 23, :_reduce_none,
-  1, 23, :_reduce_none,
+  2, 25, :_reduce_33,
+  0, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  0, 24, :_reduce_none,
+  1, 24, :_reduce_none,
   1, 14, :_reduce_none,
   1, 14, :_reduce_none,
   1, 14, :_reduce_none,
   0, 19, :_reduce_none,
   1, 19, :_reduce_none,
-  1, 26, :_reduce_none,
-  2, 26, :_reduce_44 ]
+  1, 27, :_reduce_none,
+  2, 27, :_reduce_44,
+  0, 20, :_reduce_none,
+  1, 20, :_reduce_none,
+  1, 29, :_reduce_none,
+  2, 29, :_reduce_48 ]
 
-racc_reduce_n = 45
+racc_reduce_n = 49
 
-racc_shift_n = 67
+racc_shift_n = 75
 
 racc_token_table = {
   false => 0,
@@ -352,6 +362,7 @@ Racc_token_to_s_table = [
   "sort_order",
   "u_words",
   "opt_suffices",
+  "opt_titles",
   "last",
   "von",
   "first",
@@ -359,7 +370,8 @@ Racc_token_to_s_table = [
   "words",
   "opt_comma",
   "suffices",
-  "u_word" ]
+  "u_word",
+  "titles" ]
 
 Racc_debug_parser = false
 
@@ -369,28 +381,28 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.y', 11)
   def _reduce_1(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 12)
   def _reduce_2(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 13)
   def _reduce_3(val, _values, result)
-     result = val[0] << val[2] 
+     result = val[0] << val[2]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 15)
   def _reduce_4(val, _values, result)
-     result = Name.new(:given => val[0]) 
+     result = Name.new(:given => val[0])
     result
   end
 .,.,
@@ -399,14 +411,14 @@ module_eval(<<'.,.,', 'parser.y', 15)
 
 module_eval(<<'.,.,', 'parser.y', 17)
   def _reduce_6(val, _values, result)
-     result = val[0].merge(:family => val[1]) 
+     result = val[0].merge(:family => val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 18)
   def _reduce_7(val, _values, result)
-     result = val[1].merge(val[0]) 
+     result = val[1].merge(val[0])
     result
   end
 .,.,
@@ -415,99 +427,102 @@ module_eval(<<'.,.,', 'parser.y', 18)
 
 module_eval(<<'.,.,', 'parser.y', 21)
   def _reduce_9(val, _values, result)
-     result = Name.new(:appellation => val[0]) 
+     result = Name.new(:appellation => val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 22)
   def _reduce_10(val, _values, result)
-     result = Name.new(:title => val[0]) 
+     result = Name.new(:title => val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 26)
   def _reduce_11(val, _values, result)
-             result = Name.new(:given => val[0], :family => val[1], :suffix => val[2])
-       
+             result = Name.new(:given => val[0], :family => val[1],
+           :suffix => val[2], :title => val[3])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 30)
+module_eval(<<'.,.,', 'parser.y', 31)
   def _reduce_12(val, _values, result)
-             result = Name.new(:given => val[0], :nick => val[1], :family => val[2])
-       
+             result = Name.new(:given => val[0], :nick => val[1],
+           :family => val[2], :suffix => val[3], :title => val[4])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 34)
+module_eval(<<'.,.,', 'parser.y', 36)
   def _reduce_13(val, _values, result)
              result = Name.new(:given => val[0], :nick => val[1],
-           :particle => val[2], :family => val[3])
-       
+           :particle => val[2], :family => val[3],
+           :suffix => val[4], :title => val[5])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 39)
+module_eval(<<'.,.,', 'parser.y', 42)
   def _reduce_14(val, _values, result)
              result = Name.new(:given => val[0], :particle => val[1],
           :family => val[2])
-       
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 44)
+module_eval(<<'.,.,', 'parser.y', 47)
   def _reduce_15(val, _values, result)
              result = Name.new(:particle => val[0], :family => val[1])
-       
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 49)
+module_eval(<<'.,.,', 'parser.y', 52)
   def _reduce_16(val, _values, result)
              result = Name.new({ :family => val[0], :suffix => val[2][0],
            :given => val[2][1] }, !!val[2][0])
-       
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 54)
+module_eval(<<'.,.,', 'parser.y', 57)
   def _reduce_17(val, _values, result)
              result = Name.new({ :particle => val[0], :family => val[1],
            :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
-       
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 59)
+module_eval(<<'.,.,', 'parser.y', 62)
   def _reduce_18(val, _values, result)
              result = Name.new({ :particle => val[0,2].join(' '), :family => val[2],
            :suffix => val[4][0], :given => val[4][1] }, !!val[4][0])
-       
+
     result
   end
 .,.,
 
 # reduce 19 omitted
 
-module_eval(<<'.,.,', 'parser.y', 65)
+module_eval(<<'.,.,', 'parser.y', 68)
   def _reduce_20(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 66)
+module_eval(<<'.,.,', 'parser.y', 69)
   def _reduce_21(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
@@ -516,39 +531,39 @@ module_eval(<<'.,.,', 'parser.y', 66)
 
 # reduce 23 omitted
 
-module_eval(<<'.,.,', 'parser.y', 70)
+module_eval(<<'.,.,', 'parser.y', 73)
   def _reduce_24(val, _values, result)
-     result = [nil,val[0]] 
+     result = [nil,val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 71)
+module_eval(<<'.,.,', 'parser.y', 74)
   def _reduce_25(val, _values, result)
-     result = [val[2],val[0]] 
+     result = [val[2],val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 72)
+module_eval(<<'.,.,', 'parser.y', 75)
   def _reduce_26(val, _values, result)
-     result = [val[0],nil] 
+     result = [val[0],nil]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 73)
+module_eval(<<'.,.,', 'parser.y', 76)
   def _reduce_27(val, _values, result)
-     result = [val[0],val[2]] 
+     result = [val[0],val[2]]
     result
   end
 .,.,
 
 # reduce 28 omitted
 
-module_eval(<<'.,.,', 'parser.y', 76)
+module_eval(<<'.,.,', 'parser.y', 79)
   def _reduce_29(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
@@ -559,9 +574,9 @@ module_eval(<<'.,.,', 'parser.y', 76)
 
 # reduce 32 omitted
 
-module_eval(<<'.,.,', 'parser.y', 81)
+module_eval(<<'.,.,', 'parser.y', 84)
   def _reduce_33(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
@@ -586,9 +601,22 @@ module_eval(<<'.,.,', 'parser.y', 81)
 
 # reduce 43 omitted
 
-module_eval(<<'.,.,', 'parser.y', 91)
+module_eval(<<'.,.,', 'parser.y', 94)
   def _reduce_44(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
+    result
+  end
+.,.,
+
+# reduce 45 omitted
+
+# reduce 46 omitted
+
+# reduce 47 omitted
+
+module_eval(<<'.,.,', 'parser.y', 99)
+  def _reduce_48(val, _values, result)
+     result = val.join(' ')
     result
   end
 .,.,

data/lib/namae/parser.y

@@ -22,18 +22,21 @@ rule
   honorific : APPELLATION { result = Name.new(:appellation => val[0]) }
             | TITLE       { result = Name.new(:title => val[0]) }
 
-  display_order : u_words word opt_suffices
+  display_order : u_words word opt_suffices opt_titles
        {
-         result = Name.new(:given => val[0], :family => val[1], :suffix => val[2])
+         result = Name.new(:given => val[0], :family => val[1],
+           :suffix => val[2], :title => val[3])
        }
-       | u_words NICK last
+       | u_words NICK last opt_suffices opt_titles
        {
-         result = Name.new(:given => val[0], :nick => val[1], :family => val[2])
+         result = Name.new(:given => val[0], :nick => val[1],
+           :family => val[2], :suffix => val[3], :title => val[4])
        }
-       | u_words NICK von last
+       | u_words NICK von last opt_suffices opt_titles
        {
          result = Name.new(:given => val[0], :nick => val[1],
-           :particle => val[2], :family => val[3])
+           :particle => val[2], :family => val[3],
+           :suffix => val[4], :title => val[5])
        }
        | u_words von last
        {
@@ -91,6 +94,11 @@ rule
   suffices : SUFFIX
            | suffices SUFFIX { result = val.join(' ') }
 
+  opt_titles : /* empty */ | titles
+
+  titles : TITLE
+         | titles TITLE { result = val.join(' ') }
+
 ---- header
 require 'singleton'
 require 'strscan'

data/lib/namae/version.rb

@@ -2,7 +2,7 @@ module Namae
   module Version
     MAJOR = 0
     MINOR = 9
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/namae.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: namae 0.9.2 ruby lib
+# stub: namae 0.9.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "namae"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Sylvester Keil", "Dan Collis-Puro"]
-  s.date = "2014-07-09"
+  s.date = "2015-01-19"
   s.description = " Namae (\u{540d}\u{524d}) is a parser for human names. It recognizes personal names of various cultural backgrounds and tries to split them into their component parts (e.g., given and family names, honorifics etc.). "
   s.email = ["sylvester@keil.or.at", "dan@collispuro.com"]
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "features/step_definitions/namae_steps.rb",
     "features/suffix.feature",
     "features/support/env.rb",
+    "features/title.feature",
     "lib/namae.rb",
     "lib/namae/name.rb",
     "lib/namae/parser.rb",
@@ -51,7 +52,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/berkmancenter/namae"
   s.licenses = ["AGPL"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Namae (\u{540d}\u{524d}) parses personal names and splits them into their component parts."
 
   if s.respond_to? :specification_version then

data/spec/namae/parser_spec.rb

@@ -73,6 +73,18 @@ module Namae
           end
         end
 
+        %w{Ph.D. PhD PHD Dr. Dr Prof.}.each do |title|
+          describe "the next token is #{title.inspect}" do
+            before { parser.send(:input).string = title }
+            it 'returns a TITLE token' do
+              expect(parser.send(:next_token)).to eq([:TITLE, title])
+            end
+
+            it 'the input matches the suffix pattern' do
+              expect(parser.title).to match(title)
+            end
+          end
+        end
       end
 
       describe '#parse!' do
@@ -106,6 +118,14 @@ module Namae
             expect(parser.parse!('Yukihiro "Matz" Matsumoto')[0].values_at(:given, :family, :nick)).to eq(%w{Yukihiro Matsumoto Matz})
           end
 
+          it 'parses appellation and nick in \'Mr. Yukihiro "Matz" Matsumoto\'' do
+            expect(parser.parse!('Mr. Yukihiro "Matz" Matsumoto')[0].values_at(:appellation, :nick)).to eq(%w{Mr. Matz})
+          end
+
+          it 'parses suffix and nick in \'Yukihiro "Matz" Matsumoto Jr.\'' do
+            expect(parser.parse!('Yukihiro "Matz" Matsumoto Jr.')[0].values_at(:suffix, :nick)).to eq(%w{Jr. Matz})
+          end
+
           it 'parses given and family name in "Poe, Edgar A."' do
             expect(parser.parse!('Poe, Edgar A.')[0].values_at(:given, :family)).to eq(['Edgar A.', 'Poe'])
           end
@@ -125,6 +145,10 @@ module Namae
             expect(parser.parse!('Ken Griffey Jr.')[0].values_at(:given, :family, :suffix)).to eq(['Ken', 'Griffey', 'Jr.'])
           end
 
+          it 'parses Ph.D. title suffix in display order' do
+            expect(parser.parse!('Bernado Franecki Ph.D.')[0].values_at(:given, :family, :title)).to eq(['Bernado', 'Franecki', 'Ph.D.'])
+            #expect(parser.parse!('Bernado Franecki, Ph.D.')[0].values_at(:given, :family, :title)).to eq(['Bernado', 'Franecki', 'Ph.D.'])
+          end
         end
       end
 

data/spec/spec_helper.rb

@@ -6,8 +6,11 @@ rescue LoadError
 end unless RUBY_VERSION < '1.9'
 
 begin
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  case
+  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
+  when RUBY_VERSION > '2.0'
+    require 'byebug'
   else
     require 'debugger'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Sylvester Keil
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubinius-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -67,9 +67,9 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.9
-description: ' Namae (名前) is a parser for human names. It recognizes personal names
+description: " Namae (名前) is a parser for human names. It recognizes personal names
   of various cultural backgrounds and tries to split them into their component parts
-  (e.g., given and family names, honorifics etc.). '
+  (e.g., given and family names, honorifics etc.). "
 email:
 - sylvester@keil.or.at
 - dan@collispuro.com
@@ -78,13 +78,13 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .autotest
-- .coveralls.yml
-- .document
-- .rspec
-- .simplecov
-- .travis.yml
-- .yardopts
+- ".autotest"
+- ".coveralls.yml"
+- ".document"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
+- ".yardopts"
 - AGPL
 - BSDL
 - Gemfile
@@ -97,6 +97,7 @@ files:
 - features/step_definitions/namae_steps.rb
 - features/suffix.feature
 - features/support/env.rb
+- features/title.feature
 - lib/namae.rb
 - lib/namae/name.rb
 - lib/namae/parser.rb
@@ -118,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Namae (名前) parses personal names and splits them into their component parts.