namae 0.5.0 → 0.6.0

data/README.md

@@ -109,7 +109,6 @@ ambiguous. For example, multiple family names are always possible in sort-order:
 Whilst in display-order, multiple family names are only supported when the
 name contains a particle or a nickname.
 
-
 Rationale
 ---------
 Parsing human names is at once too easy and too hard. When working in the

data/features/bibtex.feature

@@ -61,7 +61,7 @@ Feature: Parse BibTeX-style names
     | Dominique {G}alouzeau de Villepin  | Dominique            | {G}alouzeau de | Villepin                |    |
     | Galouzeau {de} Villepin, Dominique | Dominique            |                | Galouzeau {de} Villepin |    |
 
-   @names 
+  @names 
   Scenarios: Some actual names
     | name                              | first                   | von            | last                           | jr  |
     | John Paul Jones                   | John Paul               |                | Jones                          |     |

data/features/lists.feature

@@ -21,14 +21,14 @@ Feature: Parse a list of names
       | Brian  | Kernighan |
       | Dennis | Ritchie   |
       | Donald | Knuth     |
-    # Given a parser that prefers commas as separators
-    # When I parse the names "Kernighan, Brian, Ritchie, Dennis, Knuth, Donald"
-    # Then there should be 3 names
-    # And the names should be:
-    #   | given  | family    |
-    #   | Brian  | Kernighan |
-    #   | Dennis | Ritchie   |
-    #   | Donald | Knuth     |
+    Given a parser that prefers commas as separators
+    When I parse the names "Kernighan, Brian, Ritchie, Dennis, Knuth, Donald"
+    Then there should be 3 names
+    And the names should be:
+      | given  | family    |
+      | Brian  | Kernighan |
+      | Dennis | Ritchie   |
+      | Donald | Knuth     |
 
 
   @list
@@ -51,13 +51,13 @@ Feature: Parse a list of names
       | Dennis | Ritchie   |
       | Donald | Knuth     |
 
-  # @list
-  # Scenario: A list of display-order names separated by commas and 'and'
-  #   Given a parser that prefers commas as separators
-  #   When I parse the names "Brian Kernighan, Dennis Ritchie, and Donald Knuth"
-  #   Then there should be 3 names
-  #   And the names should be:
-  #     | given  | family    |
-  #     | Brian  | Kernighan |
-  #     | Dennis | Ritchie   |
-  #     | Donald | Knuth     |
+  @list
+  Scenario: A list of display-order names separated by commas and 'and'
+    Given a parser that prefers commas as separators
+    When I parse the names "Brian Kernighan, Dennis Ritchie, and Donald Knuth"
+    Then there should be 3 names
+    And the names should be:
+      | given  | family    |
+      | Brian  | Kernighan |
+      | Dennis | Ritchie   |
+      | Donald | Knuth     |

data/features/suffix.feature

@@ -0,0 +1,42 @@
+Feature: Parse names with a suffix
+  As a hacker who works with Namae
+  I want to be able to parse names with a suffix
+
+  @names @suffix
+  Scenario: Names with a suffix BibTeX style
+    When I parse the names "Griffey, Jr., Ken"
+    Then the names should be:
+      | given      | family  | suffix  |
+      | Ken        | Griffey | Jr.     |
+
+  # @names @suffix
+  # Scenario: Names with a suffix in display-order
+  #   When I parse the names "Ken Griffey, Jr."
+  #   Then the names should be:
+  #     | given      | family  | suffix  |
+  #     | Ken        | Griffey | Jr.     |
+  # 
+  # @names @suffix
+  # Scenario: Names with a suffix in sort-order chicago style
+  #   When I parse the names "Griffey, Ken, Jr."
+  #   Then the names should be:
+  #     | given      | family  | suffix  |
+  #     | Ken        | Griffey | Jr.     |
+  # 
+  # @names @suffix
+  # Scenario: Names with a suffix in display-order no comma
+  #   When I parse the names "Ken Griffey Jr."
+  #   Then the names should be:
+  #     | given      | family  | suffix  |
+  #     | Ken        | Griffey | Jr.     |
+  # 
+  # 
+  # @names @suffix @list
+  # Scenario: Names with a suffix
+  #   When I parse the names "Griffey, Jr., Ken and Ken Griffey, Jr. and Griffey, Ken, Jr. and Ken Griffey Jr."
+  #   Then the names should be:
+  #     | given      | family  | suffix  |
+  #     | Ken        | Griffey | Jr.     |
+  #     | Ken        | Griffey | Jr.     |
+  #     | Ken        | Griffey | Jr.     |
+  #     | Ken        | Griffey | Jr.     |

data/lib/namae/parser.rb

@@ -92,14 +92,14 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
   end
   
   def consume_separator
-    # return next_token if seen_separator?
+    return next_token if seen_separator?
     @commas, @words = 0, 0
-    [:AND, nil]
+    [:AND, :AND]
   end
   
   def consume_comma
     @commas += 1
-    [:COMMA, comma]
+    [:COMMA, :COMMA]
   end
 
   def consume_word(type, word)
@@ -108,12 +108,20 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
   end
 
   def seen_separator?
-    !stack.empty? && last_token.nil?
+    !stack.empty? && last_token == :AND
   end
 
+  def suffix?
+    seen_suffix? || will_see_suffix?
+  end
+  
   def seen_suffix?
     return false unless stack.length > 1
-    last_token == comma || last_token =~ suffix
+    last_token == :COMMA || last_token =~ suffix
+  end
+  
+  def will_see_suffix?
+    input.peek(8).to_s.split(/\s+/)[0] =~ suffix
   end
   
   def seen_full_name?
@@ -127,7 +135,7 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
     when input.scan(separator)
       consume_separator
     when input.scan(/\s*,\s*/)
-      if @commas.zero? && !seen_full_name? || @commas == 1 && seen_suffix?
+      if @commas.zero? && !seen_full_name? || @commas == 1 && suffix?
         consume_comma
       else
         consume_separator

data/lib/namae/parser.y

@@ -166,14 +166,14 @@ require 'strscan'
   end
   
   def consume_separator
-    # return next_token if seen_separator?
+    return next_token if seen_separator?
     @commas, @words = 0, 0
-    [:AND, nil]
+    [:AND, :AND]
   end
   
   def consume_comma
     @commas += 1
-    [:COMMA, comma]
+    [:COMMA, :COMMA]
   end
 
   def consume_word(type, word)
@@ -182,12 +182,20 @@ require 'strscan'
   end
 
   def seen_separator?
-    !stack.empty? && last_token.nil?
+    !stack.empty? && last_token == :AND
   end
 
+  def suffix?
+    seen_suffix? || will_see_suffix?
+  end
+  
   def seen_suffix?
     return false unless stack.length > 1
-    last_token == comma || last_token =~ suffix
+    last_token == :COMMA || last_token =~ suffix
+  end
+  
+  def will_see_suffix?
+    input.peek(8).to_s.split(/\s+/)[0] =~ suffix
   end
   
   def seen_full_name?
@@ -201,7 +209,7 @@ require 'strscan'
     when input.scan(separator)
       consume_separator
     when input.scan(/\s*,\s*/)
-      if @commas.zero? && !seen_full_name? || @commas == 1 && seen_suffix?
+      if @commas.zero? && !seen_full_name? || @commas == 1 && suffix?
         consume_comma
       else
         consume_separator

data/lib/namae/version.rb

@@ -1,7 +1,7 @@
 module Namae
   module Version
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     PATCH = 0
     BUILD = nil
 

data/namae.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "namae"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sylvester Keil", "Dan Collis-Puro"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "features/examples.feature",
     "features/lists.feature",
     "features/step_definitions/namae_steps.rb",
+    "features/suffix.feature",
     "features/support/env.rb",
     "lib/namae.rb",
     "lib/namae/name.rb",

data/spec/namae/parser_spec.rb

@@ -1,52 +1,56 @@
 module Namae
   describe 'Parser' do
-    
+
     it 'does not respond to .new' do
       Parser.should_not respond_to(:new)
     end
-    
+
     describe '.instance' do
       let(:parser) { Parser.instance }
-      
+
       it 'returns the parser' do
         parser.should be_a(Parser)
       end
-      
+
       describe '#next_token' do
+				before(:each) do
+					Parser.instance.reset
+				end
+
         describe 'when the input is empty' do
           it 'returns nil' do
             parser.send(:next_token).should be_nil
           end
         end
-        
+
         describe 'when the next input is " and "' do
           before { parser.send(:input).string = ' and ' }
           it 'returns an AND token' do
-            parser.send(:next_token).should == [:AND, nil]
+            parser.send(:next_token).should == [:AND, :AND]
           end
         end
 
         describe 'when the next input is " & "' do
           before { parser.send(:input).string = ' & ' }
           it 'returns an AND token' do
-            parser.send(:next_token).should == [:AND, nil]
+            parser.send(:next_token).should == [:AND, :AND]
           end
         end
 
         describe 'when the next input is " , "' do
           before { parser.send(:input).string = ' , ' }
           it 'returns a COMMA token' do
-            parser.send(:next_token).should == [:COMMA, ',']
+            parser.send(:next_token).should == [:COMMA, :COMMA]
           end
         end
-        
+
         describe 'when the next input is " \'foo bar\' "' do
           before { parser.send(:input).string = " 'foo bar' " }
           it 'returns a NICK token' do
             parser.send(:next_token).should == [:NICK, 'foo bar']
           end
         end
-        
+
         %w{Mr. Mr Mrs. Ms Herr Frau Miss}.each do |appellation|
           describe "the next token is #{appellation.inspect}" do
             before { parser.send(:input).string = appellation }
@@ -55,20 +59,20 @@ module Namae
             end
           end
         end
-        
+
       end
-      
+
       describe '#parse!' do
         it 'returns an empty list by default' do
           parser.parse!('').should be_empty
         end
-        
+
         it 'returns a list of names' do
           parser.parse!('foo')[0].should be_a(Name)
         end
-        
+
         describe 'when parsing a single name' do
-          
+
           it 'treats "Ichiro" as a given name' do
             parser.parse!('Ichiro')[0].given.should == 'Ichiro'
           end
@@ -76,11 +80,11 @@ module Namae
           it 'treats "Lord Byron" as a title and family name' do
             parser.parse!('Lord Byron')[0].values_at(:family, :title).should == ['Byron', 'Lord']
           end
-          
+
           it 'parses given and family part name in "Ichiro Suzuki"' do
             parser.parse!('Ichiro Suzuki')[0].values_at(:given, :family).should == %w{Ichiro Suzuki}
           end
-          
+
           it 'parses given, nick and family part name in "Yukihiro \'Matz\' Matsumoto"' do
             parser.parse!("Yukihiro 'Matz' Matsumoto")[0].values_at(:given, :family, :nick).should == %w{Yukihiro Matsumoto Matz}
           end
@@ -88,20 +92,20 @@ module Namae
           it 'parses given, nick and family part name in \'Yukihiro "Matz" Matsumoto\'' do
             parser.parse!('Yukihiro "Matz" Matsumoto')[0].values_at(:given, :family, :nick).should == %w{Yukihiro Matsumoto Matz}
           end
-          
+
           it 'parses given and family name in "Poe, Edgar A."' do
             parser.parse!('Poe, Edgar A.')[0].values_at(:given, :family).should == ['Edgar A.', 'Poe']
           end
-          
+
           %w{Mr. Mr Mrs. Ms Herr Frau Miss}.each do |appellation|
             it "recognizes #{appellation.inspect} as an appellation" do
               parser.parse!([appellation, 'Edgar A. Poe'].join(' '))[0].appellation.should == appellation
             end
           end
-          
+
         end
       end
-      
-    end  
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -119,6 +119,7 @@ files:
 - features/examples.feature
 - features/lists.feature
 - features/step_definitions/namae_steps.rb
+- features/suffix.feature
 - features/support/env.rb
 - lib/namae.rb
 - lib/namae/name.rb
@@ -146,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4098302690694526777
+      hash: -2694601471904958389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: