namae 0.4.0 → 0.5.0

data/Gemfile

@@ -9,7 +9,6 @@ end
 
 group :development do
   gem 'racc', '~> 1.4.8', :platform => [:mri_19, :mri_18, :rbx]
-  gem 'rdoc', '~> 3.12'
   gem 'bundler', '~> 1.1'
   gem 'simplecov', :require => false
   gem 'ZenTest', '~> 4.8.0'

data/Rakefile

@@ -56,7 +56,7 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features)
 
-task :default => :spec
+task :default => [:spec, :features]
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/features/lists.feature

@@ -21,6 +21,15 @@ 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     |
+
 
   @list
   Scenario: A list of sort-order names with initials separated by commas
@@ -41,3 +50,14 @@ Feature: Parse a list of names
       | 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/step_definitions/namae_steps.rb

@@ -1,3 +1,7 @@
+Given /^a parser that prefers commas as separators$/ do
+  Namae::Parser.instance.options[:prefer_comma_as_separator] = true
+end
+
 When /^I parse the name "(.*)"$/ do |string|
   @name = Namae.parse!(string)[0]
 end

data/lib/namae/parser.rb

@@ -21,10 +21,11 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
   def initialize
     @input, @options = StringScanner.new(''), {
       :debug => false,
+      :prefer_comma_as_separator => false,
       :comma => ',',
       :separator => /\s*(\band\b|\&)\s*/i,
       :title => /\s*\b(sir|lord|(prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
-			:suffix => /\s*\b(jr|sr|[ivx]+)\.?\s*/i,
+      :suffix => /\s*\b(jr|sr|[ivx]+)\.?\s*/i,
       :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
     }
   end
@@ -53,6 +54,10 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
     options[:appellation]
   end
   
+  def prefer_comma_as_separator?
+    options[:prefer_comma_as_separator]
+  end
+
   def parse(input)
     parse!(input)
   rescue => e
@@ -62,37 +67,58 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
   
   def parse!(string)
     input.string = normalize(string)
-		reset
+    reset
     do_parse
   end
   
-	def normalize(string)
-		string = string.strip
-		string
-	end
-	
-	def reset
-    @commas, @yydebug = 0, debug?		
-		self
-	end
+  def normalize(string)
+    string = string.strip
+    string
+  end
+  
+  def reset
+    @commas, @words, @yydebug = 0, 0, debug?   
+    self
+  end
 
   private
-  	
-	def consume_separator
-		@commas = 0
-		[:AND, nil]
-	end
-	
-	def consume_comma
-		@commas += 1
-		[:COMMA, nil]
-	end
-	
-	def seen_suffix?
-		return false unless @vstack
-		return true if @vstack[-1].nil?
-		@vstack[-1] =~ suffix
-	end
+  
+  def stack
+    @vstack || @racc_vstack || []
+  end
+  
+  def last_token
+    stack[-1]
+  end
+  
+  def consume_separator
+    # return next_token if seen_separator?
+    @commas, @words = 0, 0
+    [:AND, nil]
+  end
+  
+  def consume_comma
+    @commas += 1
+    [:COMMA, comma]
+  end
+
+  def consume_word(type, word)
+    @words += 1
+    [type, word]
+  end
+
+  def seen_separator?
+    !stack.empty? && last_token.nil?
+  end
+
+  def seen_suffix?
+    return false unless stack.length > 1
+    last_token == comma || last_token =~ suffix
+  end
+  
+  def seen_full_name?
+    prefer_comma_as_separator? && @words > 1
+  end
 
   def next_token
     case
@@ -101,25 +127,25 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 90)
     when input.scan(separator)
       consume_separator
     when input.scan(/\s*,\s*/)
-			if @commas.zero? || @commas == 1 && seen_suffix?
-				consume_comma
-			else
-				consume_separator
-			end
+      if @commas.zero? && !seen_full_name? || @commas == 1 && seen_suffix?
+        consume_comma
+      else
+        consume_separator
+      end
     when input.scan(/\s+/)
       next_token
     when input.scan(title)
-      [:TITLE, input.matched.strip]
+      consume_word(:TITLE, input.matched.strip)
     when input.scan(appellation)
       [:APPELLATION, input.matched.strip]
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{comma}]*/)
-      [:UWORD, input.matched]
+      consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{comma}]*/)
-      [:LWORD, input.matched]
+      consume_word(:LWORD, input.matched)
     when input.scan(/(\\\w+)?\{[^\}]*\}[^\s#{comma}]*/)
-      [:PWORD, input.matched]
+      consume_word(:PWORD, input.matched)
     when input.scan(/('[^'\n]+')|("[^"\n]+")/)
-      [:NICK, input.matched[1...-1]]
+      consume_word(:NICK, input.matched[1...-1])
     else
       raise ArgumentError,
         "Failed to parse name #{input.string.inspect}: unmatched data at offset #{input.pos}"

data/lib/namae/parser.y

@@ -95,6 +95,7 @@ require 'strscan'
   def initialize
     @input, @options = StringScanner.new(''), {
       :debug => false,
+      :prefer_comma_as_separator => false,
       :comma => ',',
       :separator => /\s*(\band\b|\&)\s*/i,
       :title => /\s*\b(sir|lord|(prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
@@ -127,6 +128,10 @@ require 'strscan'
     options[:appellation]
   end
   
+  def prefer_comma_as_separator?
+    options[:prefer_comma_as_separator]
+  end
+
   def parse(input)
     parse!(input)
   rescue => e
@@ -146,26 +151,47 @@ require 'strscan'
   end
   
   def reset
-    @commas, @yydebug = 0, debug?   
+    @commas, @words, @yydebug = 0, 0, debug?   
     self
   end
 
   private
-    
+  
+  def stack
+    @vstack || @racc_vstack || []
+  end
+  
+  def last_token
+    stack[-1]
+  end
+  
   def consume_separator
-    @commas = 0
+    # return next_token if seen_separator?
+    @commas, @words = 0, 0
     [:AND, nil]
   end
   
   def consume_comma
     @commas += 1
-    [:COMMA, nil]
+    [:COMMA, comma]
   end
-  
+
+  def consume_word(type, word)
+    @words += 1
+    [type, word]
+  end
+
+  def seen_separator?
+    !stack.empty? && last_token.nil?
+  end
+
   def seen_suffix?
-    return false unless @vstack
-    return true if @vstack[-1].nil?
-    @vstack[-1] =~ suffix
+    return false unless stack.length > 1
+    last_token == comma || last_token =~ suffix
+  end
+  
+  def seen_full_name?
+    prefer_comma_as_separator? && @words > 1
   end
 
   def next_token
@@ -175,7 +201,7 @@ require 'strscan'
     when input.scan(separator)
       consume_separator
     when input.scan(/\s*,\s*/)
-      if @commas.zero? || @commas == 1 && seen_suffix?
+      if @commas.zero? && !seen_full_name? || @commas == 1 && seen_suffix?
         consume_comma
       else
         consume_separator
@@ -183,17 +209,17 @@ require 'strscan'
     when input.scan(/\s+/)
       next_token
     when input.scan(title)
-      [:TITLE, input.matched.strip]
+      consume_word(:TITLE, input.matched.strip)
     when input.scan(appellation)
       [:APPELLATION, input.matched.strip]
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{comma}]*/)
-      [:UWORD, input.matched]
+      consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{comma}]*/)
-      [:LWORD, input.matched]
+      consume_word(:LWORD, input.matched)
     when input.scan(/(\\\w+)?\{[^\}]*\}[^\s#{comma}]*/)
-      [:PWORD, input.matched]
+      consume_word(:PWORD, input.matched)
     when input.scan(/('[^'\n]+')|("[^"\n]+")/)
-      [:NICK, input.matched[1...-1]]
+      consume_word(:NICK, input.matched[1...-1])
     else
       raise ArgumentError,
         "Failed to parse name #{input.string.inspect}: unmatched data at offset #{input.pos}"

data/lib/namae/version.rb

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

data/namae.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "namae"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sylvester Keil", "Dan Collis-Puro"]
@@ -56,14 +56,12 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<racc>, ["~> 1.4.8"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<ZenTest>, ["~> 4.8.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<racc>, ["~> 1.4.8"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<ZenTest>, ["~> 4.8.0"])
@@ -71,7 +69,6 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<racc>, ["~> 1.4.8"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<ZenTest>, ["~> 4.8.0"])

data/spec/namae/parser_spec.rb

@@ -36,7 +36,7 @@ module Namae
         describe 'when the next input is " , "' do
           before { parser.send(:input).string = ' , ' }
           it 'returns a COMMA token' do
-            parser.send(:next_token).should == [:COMMA, nil]
+            parser.send(:next_token).should == [:COMMA, ',']
           end
         end
         

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 begin
   require 'simplecov'
+rescue LoadError
+  # ignore
+end
+
+begin
   require 'debugger'
 rescue LoadError
   # ignore

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -28,22 +28,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.8
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4370560385267353354
+      hash: -4098302690694526777
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: