namae 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971aa03b31c2c4b0c853f777fbb103a8e15eb7c39a5be6c3e8c2bfbeb1825946
-  data.tar.gz: ffc6a59e69d7654f346c3b5e568b48bcb1bd537a83d1ee543eefc0f32db65119
+  metadata.gz: 82fa8955c4f650ccbcb6bf67db18f005eafd2f1f09252b8d98203a6f04949ed2
+  data.tar.gz: c96965c52193db381f8fceb0e8bfc34453f62127c846b6cb593e804c25394908
 SHA512:
-  metadata.gz: 31e652932c388fc6c80429a9206682d1478b4470f5d338cd0564a19c31e785ce57bf9c4b333386d8803cb8f9e0235b624e9dca71aa3260b1f55444f25911b9af
-  data.tar.gz: c03466d1e028fa84e07ae994fe53a6c7c3ea66ea8344018e4ae5795f1cc9206a54f7df67b73e3cf8ae67043eece2929a7c27be7d194966f93cac86fd73867ada
+  metadata.gz: 14644528eb8d587a2fd0064fbddfa6cfe8925d7a1b9b3f6a75b33c599f3bbb9a43b53e951e4ec8fab9506c5edc2ef62abff77fc1f43cca1ce3489c5ab4c36f8f
+  data.tar.gz: 921b0c60e964b8e5f6154008ab8923d59a2df5523484e38618f3ddddbd89eb2d0ad99ffdbbc9d90629cced3051e38fffb05617657338018afd8913cefc6e891c

data/features/lists.feature

@@ -115,7 +115,8 @@ Feature: Parse a list of names
       | B     | Malcom  |
 
   Scenario: A list of names with particles separated by commas
-    Given a parser that prefers commas as separators
+    Given I want to include particles in the family name
+    And a parser that prefers commas as separators
     When I parse the names "Di Proctor, M., von Cooper, P."
     Then the names should be:
       | given | family     |
@@ -128,7 +129,8 @@ Feature: Parse a list of names
       | P     | Cooper     |
 
   Scenario: A list of names with two consecutive accented characters
-    Given a parser that prefers commas as separators
+    Given I want to include particles in the family name
+    And a parser that prefers commas as separators
     When I parse the names "Çakıroğlu, Ü., Başıbüyük, B."
     Then the names should be:
       | given | family     |

data/features/step_definitions/namae_steps.rb

@@ -2,6 +2,11 @@ Given /^a parser that prefers commas as separators$/ do
   Namae::Parser.instance.options[:prefer_comma_as_separator] = true
 end
 
+Given /^I want to include particles in the family name$/ do
+  Namae::Parser.instance.options[:include_particle_in_family] = true
+end
+
+
 When /^I parse the name "(.*)"$/ do |string|
   @name = Namae.parse!(string)[0]
 end

data/lib/namae/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.16
+# This file is automatically generated by Racc 1.5.2
 # from Racc grammar file "".
 #
 
@@ -11,17 +11,19 @@ require 'strscan'
 module Namae
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 106)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 122)
 
   @defaults = {
     :debug => false,
     :prefer_comma_as_separator => false,
+    :include_particle_in_family => false,
     :comma => ',',
     :stops => ',;',
     :separator => /\s*(\band\b|\&|;)\s*/i,
     :title => /\s*\b(sir|lord|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|pastor|pr|reverend|rev|elder|deacon|deaconess|father|fr|rabbi|cantor|vicar|prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
     :suffix => /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/,
-    :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
+    :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i,
+    :uppercase_particle => /\s*\b((Da|De|Di|De\sLa|Du|Der|Des|Da|St|Saint|Les|Van)\.?)(\s+|$)/
   }
 
   class << self
@@ -50,6 +52,10 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 106)
     options[:comma]
   end
 
+  def include_particle_in_family?
+    options[:include_particle_in_family]
+  end
+
   def stops
     options[:stops]
   end
@@ -66,6 +72,10 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 106)
     options[:appellation]
   end
 
+  def uppercase_particle
+    options[:uppercase_particle]
+  end
+
   def prefer_comma_as_separator?
     options[:prefer_comma_as_separator]
   end
@@ -171,6 +181,8 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 106)
       else
         consume_word(:UWORD, input.matched)
       end
+    when input.scan(uppercase_particle)
+      consume_word(:UPARTICLE, input.matched.strip)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{stops}]*/)
       consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{stops}]*/)
@@ -195,133 +207,143 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 106)
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -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 ]
+   -41,    18,    25,    34,   -42,    35,    36,   -41,    19,   -41,
+   -41,   -42,    40,   -42,   -42,    15,    13,    16,    46,    52,
+     7,    17,    62,    12,    15,    24,    16,    27,    15,    13,
+    16,    17,    29,     7,    17,    66,    12,    15,    24,    16,
+    27,    73,    60,    59,    61,    29,    74,    46,   -40,   -36,
+   -24,    60,    59,    61,    66,   -40,    69,    25,    46,    60,
+    59,    61,    60,    59,    61,    17,    46,    46,    46,    46,
+    60,    59,    61,    15,    24,    16,    17,    46,    34,    32,
+    35,    34,    38,    35,    34,    32,    35,   -21,   -21,   -21,
+    34,    49,    35,    34,    32,    35,    34,    38,    35,   -22,
+   -22,   -22,    34,    53,    35,    34,    32,    35,    34,    32,
+    35,   -21,   -21,   -21,    60,    59,    61,    60,    59,    61,
+    66 ]
 
 racc_action_check = [
-    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 ]
+    15,     1,     8,    39,    16,    39,    11,    15,     1,    15,
+    15,    16,    18,    16,    16,     0,     0,     0,    26,    31,
+     0,     0,    37,     0,     9,     9,     9,     9,    19,    19,
+    19,    44,     9,    19,    19,    45,    19,    22,    22,    22,
+    22,    56,    56,    56,    56,    22,    57,    47,    13,    56,
+    13,    36,    36,    36,    57,    13,    50,    65,    36,    52,
+    52,    52,    62,    62,    62,    67,    52,    68,    71,    62,
+    69,    69,    69,     5,     5,     5,    77,    69,    10,    10,
+    10,    12,    12,    12,    23,    23,    23,    24,    24,    24,
+    27,    27,    27,    28,    28,    28,    29,    29,    29,    32,
+    32,    32,    33,    33,    33,    42,    42,    42,    48,    48,
+    48,    49,    49,    49,    74,    74,    74,    80,    80,    80,
+    79 ]
 
 racc_action_pointer = [
-    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 ]
+    12,     1,   nil,   nil,   nil,    70,   nil,   nil,    -7,    21,
+    75,     4,    78,    48,   nil,     0,     4,   nil,    12,    25,
+   nil,   nil,    34,    81,    84,   nil,     8,    87,    90,    93,
+   nil,    17,    96,    99,   nil,   nil,    48,    20,   nil,     0,
+   nil,   nil,   102,   nil,    22,    25,   nil,    37,   105,   108,
+    54,   nil,    56,   nil,   nil,   nil,    39,    44,   nil,   nil,
+   nil,   nil,    59,   nil,   nil,    48,   nil,    56,    57,    67,
+   nil,    58,   nil,   nil,   111,   nil,   nil,    67,   nil,   110,
+   114,   nil ]
 
 racc_action_default = [
-    -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 ]
+    -1,   -51,    -2,    -4,    -5,   -51,    -8,    -9,   -10,   -25,
+   -51,   -51,   -51,   -21,   -30,   -32,   -33,   -49,   -51,   -51,
+    -6,    -7,   -51,   -51,   -40,   -50,   -43,   -51,   -51,   -51,
+   -31,   -16,   -24,   -25,   -32,   -33,   -38,   -51,   -24,   -25,
+    82,    -3,   -51,   -16,   -47,   -44,   -45,   -43,   -51,   -24,
+   -14,   -15,   -38,   -23,   -17,   -26,   -39,   -28,   -34,   -40,
+   -41,   -42,   -38,   -14,   -11,   -48,   -46,   -47,   -43,   -38,
+   -19,   -51,   -35,   -37,   -51,   -18,   -12,   -47,   -20,   -27,
+   -29,   -13 ]
 
 racc_goto_table = [
-     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,
+     3,     1,    45,    44,    54,    20,    64,    21,    31,    26,
+    37,    23,    80,     2,    71,    28,     8,   nil,    30,     3,
+    70,    43,    26,    45,    67,    47,    50,    51,    42,    76,
+    75,    30,    41,    48,   nil,     8,   nil,    78,     9,    81,
+    63,   nil,    30,    22,    45,    77,    68,    79,    30,   nil,
+    39,   nil,   nil,   nil,   nil,   nil,    72,     9,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    39,   nil,    39,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    65 ]
+    72 ]
 
 racc_goto_check = [
-     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,
+     3,     1,    17,     9,    13,     3,    10,     4,    11,     3,
+    11,    12,    15,     2,    16,    12,     7,   nil,    18,     3,
+    13,    11,     3,    17,     9,    11,    11,    11,    12,    10,
+    13,    18,     2,    12,   nil,     7,   nil,    13,     8,    10,
+    11,   nil,    18,     8,    17,     9,    11,    17,    18,   nil,
+     8,   nil,   nil,   nil,   nil,   nil,     3,     8,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     8,   nil,     8,   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 ]
+     3 ]
 
 racc_goto_pointer = [
-   nil,    10,     6,     0,     6,   nil,   nil,     7,   -22,   -33,
-     5,    23,   -24,   nil,   -53,   -30,   -29,    -7,   nil ]
+   nil,     1,    13,     0,     2,   nil,   nil,    16,    38,   -23,
+   -38,    -2,     6,   -32,   nil,   -62,   -42,   -24,     9 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    51,     4,     5,     6,    29,   nil,   nil,
-    11,    10,   nil,    48,    49,   nil,    38,    13,    57 ]
+   nil,   nil,   nil,    58,     4,     5,     6,    65,    33,   nil,
+   nil,    11,    10,   nil,    55,    56,   nil,    57,    14 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 12, :_reduce_1,
-  1, 12, :_reduce_2,
-  3, 12, :_reduce_3,
-  1, 13, :_reduce_4,
-  1, 13, :_reduce_none,
-  2, 13, :_reduce_6,
-  2, 13, :_reduce_7,
-  1, 13, :_reduce_none,
-  1, 16, :_reduce_9,
-  1, 16, :_reduce_10,
-  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,
-  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, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 25, :_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,
+  0, 13, :_reduce_1,
+  1, 13, :_reduce_2,
+  3, 13, :_reduce_3,
+  1, 14, :_reduce_4,
   1, 14, :_reduce_none,
+  2, 14, :_reduce_6,
+  2, 14, :_reduce_7,
   1, 14, :_reduce_none,
-  0, 19, :_reduce_none,
-  1, 19, :_reduce_none,
-  1, 27, :_reduce_none,
-  2, 27, :_reduce_44,
-  0, 20, :_reduce_none,
+  1, 17, :_reduce_9,
+  1, 17, :_reduce_10,
+  4, 16, :_reduce_11,
+  5, 16, :_reduce_12,
+  6, 16, :_reduce_13,
+  3, 16, :_reduce_14,
+  3, 16, :_reduce_15,
+  2, 16, :_reduce_16,
+  3, 18, :_reduce_17,
+  4, 18, :_reduce_18,
+  4, 18, :_reduce_19,
+  5, 18, :_reduce_20,
+  1, 24, :_reduce_none,
+  2, 24, :_reduce_22,
+  3, 24, :_reduce_23,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 25, :_reduce_26,
+  3, 25, :_reduce_27,
+  1, 25, :_reduce_28,
+  3, 25, :_reduce_29,
   1, 20, :_reduce_none,
+  2, 20, :_reduce_31,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 27, :_reduce_none,
+  2, 27, :_reduce_35,
+  0, 28, :_reduce_none,
+  1, 28, :_reduce_none,
+  0, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  0, 21, :_reduce_none,
+  1, 21, :_reduce_none,
   1, 29, :_reduce_none,
-  2, 29, :_reduce_48 ]
+  2, 29, :_reduce_46,
+  0, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 19, :_reduce_none,
+  2, 19, :_reduce_50 ]
 
-racc_reduce_n = 49
+racc_reduce_n = 51
 
-racc_shift_n = 75
+racc_shift_n = 82
 
 racc_token_table = {
   false => 0,
@@ -334,9 +356,10 @@ racc_token_table = {
   :AND => 7,
   :APPELLATION => 8,
   :TITLE => 9,
-  :SUFFIX => 10 }
+  :SUFFIX => 10,
+  :UPARTICLE => 11 }
 
-racc_nt_base = 11
+racc_nt_base = 12
 
 racc_use_result_var = true
 
@@ -368,6 +391,7 @@ Racc_token_to_s_table = [
   "APPELLATION",
   "TITLE",
   "SUFFIX",
+  "UPARTICLE",
   "$start",
   "names",
   "name",
@@ -375,6 +399,7 @@ Racc_token_to_s_table = [
   "display_order",
   "honorific",
   "sort_order",
+  "titles",
   "u_words",
   "opt_suffices",
   "opt_titles",
@@ -385,8 +410,7 @@ Racc_token_to_s_table = [
   "words",
   "opt_comma",
   "suffices",
-  "u_word",
-  "titles" ]
+  "u_word" ]
 
 Racc_debug_parser = false
 
@@ -493,14 +517,26 @@ module_eval(<<'.,.,', 'parser.y', 42)
 
 module_eval(<<'.,.,', 'parser.y', 47)
   def _reduce_15(val, _values, result)
-             result = Name.new(:particle => val[0], :family => val[1])
+              result = if include_particle_in_family?
+                    Name.new(:given => val[0], :family => val[1,2].join(' '))
+                   else
+                     Name.new(:given => val[0], :particle => val[1], :family => val[2])
+                   end
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 52)
+module_eval(<<'.,.,', 'parser.y', 55)
   def _reduce_16(val, _values, result)
+             result = Name.new(:particle => val[0], :family => val[1])
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 60)
+  def _reduce_17(val, _values, result)
              result = Name.new({ :family => val[0], :suffix => val[2][0],
            :given => val[2][1] }, !!val[2][0])
 
@@ -508,8 +544,20 @@ module_eval(<<'.,.,', 'parser.y', 52)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 57)
-  def _reduce_17(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 65)
+  def _reduce_18(val, _values, result)
+             result = if include_particle_in_family?
+                    Name.new({ :family => val[0,2].join(' '), :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  else
+                    Name.new({ :particle => val[0], :family => val[1], :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  end
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 73)
+  def _reduce_19(val, _values, result)
              result = Name.new({ :particle => val[0], :family => val[1],
            :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
 
@@ -517,8 +565,8 @@ module_eval(<<'.,.,', 'parser.y', 57)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 62)
-  def _reduce_18(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 78)
+  def _reduce_20(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])
 
@@ -526,80 +574,76 @@ module_eval(<<'.,.,', 'parser.y', 62)
   end
 .,.,
 
-# reduce 19 omitted
+# reduce 21 omitted
 
-module_eval(<<'.,.,', 'parser.y', 68)
-  def _reduce_20(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 84)
+  def _reduce_22(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 69)
-  def _reduce_21(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_23(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 22 omitted
+# reduce 24 omitted
 
-# reduce 23 omitted
+# reduce 25 omitted
 
-module_eval(<<'.,.,', 'parser.y', 73)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 89)
+  def _reduce_26(val, _values, result)
      result = [nil,val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 74)
-  def _reduce_25(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 90)
+  def _reduce_27(val, _values, result)
      result = [val[2],val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 75)
-  def _reduce_26(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 91)
+  def _reduce_28(val, _values, result)
      result = [val[0],nil]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 76)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 92)
+  def _reduce_29(val, _values, result)
      result = [val[0],val[2]]
     result
   end
 .,.,
 
-# reduce 28 omitted
+# reduce 30 omitted
 
-module_eval(<<'.,.,', 'parser.y', 79)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 95)
+  def _reduce_31(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 30 omitted
+# reduce 32 omitted
 
-# reduce 31 omitted
+# reduce 33 omitted
 
-# reduce 32 omitted
+# reduce 34 omitted
 
-module_eval(<<'.,.,', 'parser.y', 84)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 100)
+  def _reduce_35(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 34 omitted
-
-# reduce 35 omitted
-
 # reduce 36 omitted
 
 # reduce 37 omitted
@@ -616,21 +660,25 @@ module_eval(<<'.,.,', 'parser.y', 84)
 
 # reduce 43 omitted
 
-module_eval(<<'.,.,', 'parser.y', 94)
-  def _reduce_44(val, _values, result)
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+module_eval(<<'.,.,', 'parser.y', 110)
+  def _reduce_46(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 45 omitted
+# reduce 47 omitted
 
-# reduce 46 omitted
+# reduce 48 omitted
 
-# reduce 47 omitted
+# reduce 49 omitted
 
-module_eval(<<'.,.,', 'parser.y', 99)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 115)
+  def _reduce_50(val, _values, result)
      result = val.join(' ')
     result
   end

data/lib/namae/parser.y

@@ -3,7 +3,7 @@
 
 class Namae::Parser
 
-token COMMA UWORD LWORD PWORD NICK AND APPELLATION TITLE SUFFIX
+token COMMA UWORD LWORD PWORD NICK AND APPELLATION TITLE SUFFIX UPARTICLE
 
 expect 0
 
@@ -20,7 +20,7 @@ rule
        | sort_order
 
   honorific : APPELLATION { result = Name.new(:appellation => val[0]) }
-            | TITLE       { result = Name.new(:title => val[0]) }
+            | titles      { result = Name.new(:title => val[0]) }
 
   display_order : u_words word opt_suffices opt_titles
        {
@@ -43,6 +43,14 @@ rule
          result = Name.new(:given => val[0], :particle => val[1],
           :family => val[2])
        }
+       | u_words UPARTICLE last
+       {
+          result = if include_particle_in_family?
+                    Name.new(:given => val[0], :family => val[1,2].join(' '))
+                   else
+                     Name.new(:given => val[0], :particle => val[1], :family => val[2])
+                   end
+       }
        | von last
        {
          result = Name.new(:particle => val[0], :family => val[1])
@@ -53,6 +61,14 @@ rule
          result = Name.new({ :family => val[0], :suffix => val[2][0],
            :given => val[2][1] }, !!val[2][0])
        }
+       | UPARTICLE last COMMA first
+       {
+         result = if include_particle_in_family?
+                    Name.new({ :family => val[0,2].join(' '), :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  else
+                    Name.new({ :particle => val[0], :family => val[1], :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  end
+       }
        | von last COMMA first
        {
          result = Name.new({ :particle => val[0], :family => val[1],
@@ -107,12 +123,14 @@ require 'strscan'
   @defaults = {
     :debug => false,
     :prefer_comma_as_separator => false,
+    :include_particle_in_family => false,
     :comma => ',',
     :stops => ',;',
     :separator => /\s*(\band\b|\&|;)\s*/i,
     :title => /\s*\b(sir|lord|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|pastor|pr|reverend|rev|elder|deacon|deaconess|father|fr|rabbi|cantor|vicar|prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
     :suffix => /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/,
-    :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
+    :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i,
+    :uppercase_particle => /\s*\b((Da|De|Di|De\sLa|Du|Der|Des|Da|St|Saint|Les|Van)\.?)(\s+|$)/
   }
 
   class << self
@@ -141,6 +159,10 @@ require 'strscan'
     options[:comma]
   end
 
+  def include_particle_in_family?
+    options[:include_particle_in_family]
+  end
+
   def stops
     options[:stops]
   end
@@ -157,6 +179,10 @@ require 'strscan'
     options[:appellation]
   end
 
+  def uppercase_particle
+    options[:uppercase_particle]
+  end
+
   def prefer_comma_as_separator?
     options[:prefer_comma_as_separator]
   end
@@ -262,6 +288,8 @@ require 'strscan'
       else
         consume_word(:UWORD, input.matched)
       end
+    when input.scan(uppercase_particle)
+      consume_word(:UPARTICLE, input.matched.strip)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{stops}]*/)
       consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{stops}]*/)

data/lib/namae/version.rb

@@ -1,8 +1,8 @@
 module Namae
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 2
+    MINOR = 1
+    PATCH = 0
     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 1.0.2 ruby lib
+# stub: namae 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "namae".freeze
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sylvester Keil".freeze, "Dan Collis-Puro".freeze]
-  s.date = "2021-01-07"
+  s.date = "2021-03-12"
   s.description = " Namae (\u540D\u524D) 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.). ".freeze
   s.email = ["sylvester@keil.or.at".freeze, "dan@collispuro.com".freeze]
   s.extra_rdoc_files = [

data/spec/namae/parser_spec.rb

@@ -191,6 +191,66 @@ module Namae
             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
+
+          it 'parses consecutive titles in display order' do
+            expect(parser.parse!('Lt. Col. Bernado Franecki')[0].values_at(:given, :family, :title)).to eq(['Bernado', 'Franecki', 'Lt. Col.'])
+          end
+
+          context 'when include_particle_in_family is false' do
+            let(:parser) { Parser.new(include_particle_in_family: false) }
+
+            it 'parses common capitalized particles as the family name in display order' do
+              expect(parser.parse!('Carlos De Silva')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'De'])
+            end
+
+            it 'parses common capitalized particles with punctuation as the family name in display order' do
+              expect(parser.parse!('Matt St. Hilaire')[0].values_at(:given, :family, :particle)).to eq(['Matt', 'Hilaire', 'St.'])
+            end
+
+            it 'parses common lowercase particles as a particle, not family name in display order' do
+              expect(parser.parse!('Carlos de Silva')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'de'])
+            end
+
+            it 'parses common capitalized particles as the family name in sort order' do
+              expect(parser.parse!('De Silva, Carlos')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'De'])
+            end
+
+            it 'parses common lowercase particles as a particle, not family name in sort order' do
+              expect(parser.parse!('de Silva, Carlos')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'de'])
+            end
+
+            it 'parses common capitalized particles with punctuation as the family name in display order' do
+              expect(parser.parse!('St. Hilaire, Matt')[0].values_at(:given, :family, :particle)).to eq(['Matt', 'Hilaire', 'St.'])
+            end
+          end
+
+          context 'when include_particle_in_family is true' do
+            let(:parser) { Parser.new(include_particle_in_family: true) }
+
+            it 'parses common capitalized particles as the family name in display order' do
+              expect(parser.parse!('Carlos De Silva')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'De Silva', nil])
+            end
+
+            it 'parses common capitalized particles with punctuation as the family name in display order' do
+              expect(parser.parse!('Matt St. Hilaire')[0].values_at(:given, :family, :particle)).to eq(['Matt', 'St. Hilaire', nil])
+            end
+
+            it 'parses common lowercase particles as a particle, not family name in display order' do
+              expect(parser.parse!('Carlos de Silva')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'de'])
+            end
+
+            it 'parses common capitalized particles as the family name in sort order' do
+              expect(parser.parse!('De Silva, Carlos')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'De Silva', nil])
+            end
+
+            it 'parses common lowercase particles as a particle, not family name in sort order' do
+              expect(parser.parse!('de Silva, Carlos')[0].values_at(:given, :family, :particle)).to eq(['Carlos', 'Silva', 'de'])
+            end
+
+            it 'parses common capitalized particles with punctuation as the family name in display order' do
+              expect(parser.parse!('St. Hilaire, Matt')[0].values_at(:given, :family, :particle)).to eq(['Matt', 'St. Hilaire', nil])
+            end
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Sylvester Keil
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc