namae 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcec4ebe2e5cb74313b9160f78d28424be234fe4
-  data.tar.gz: c594fa39e465008d9007b58f61e5e5cb7c2feb4f
+  metadata.gz: 4d9f2056c44415634fdd0b968119872820548867
+  data.tar.gz: 25b9ca58158c63a0e12b0dca520f709ca5f97e4f
 SHA512:
-  metadata.gz: 835ea3e85eeb662665079a7ff6de9dd91e962675317e41cb52fc6e54da9825062abcbe2229ec91edccafc849088027975c03ba5b8c53bb824eabf35d50bbebb8
-  data.tar.gz: ed0ae1629aa9939dbfafacf6b344741b6a433ab786faf7d5a9409d8ba3e9170b1257eec492f8d481946d1c8f55de6783668b7a9a5dc4bc279a6b357b45384de4
+  metadata.gz: d0f4bf53e0aebb1371ffd850e75ff108eb69c293f64bd6aaafd39533c53fb0902d60467bf201740f715109eb6230923fcbe91814c9bc8da2898e13f739231d6b
+  data.tar.gz: 8a8181d58ae478bbe2a9ea4fac39720f25a3721b058ace4ce4f1e159bc8b2528d0723759e7ce66b263048ed0c28001dea172af2c8fb3bc90117352a6d24f657f

data/.travis.yml

@@ -11,7 +11,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - jruby
-  - rbx-2
+#  - rbx-2
 notifications:
   email: false
 matrix:

data/features/examples.feature

@@ -20,6 +20,8 @@ Feature: Parse the names in the Readme file
       | Ms. Sofia Kovalevskaya       | Sofia        |          | Kovalevskaya |        |           | Ms.         |      |
       | Countess Ada Lovelace        | Ada          |          | Lovelace     |        | Countess  |             |      |
       | Augusta Ada King             | Augusta Ada  |          | King         |        |           |             |      |
+      | Julia Herr                   | Julia        |          | Herr         |        |           |             |      |
+      | Herr, Julia                  | Julia        |          | Herr         |        |           |             |      |
 
     @readme @sort
     Scenarios: Readme examples (sort-order)

data/lib/namae/parser.rb

@@ -160,7 +160,11 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
     when input.scan(suffix)
       consume_word(:SUFFIX, input.matched.strip)
     when input.scan(appellation)
-      [:APPELLATION, input.matched.strip]
+      if @words.zero?
+        [:APPELLATION, input.matched.strip]
+      else
+        consume_word(:UWORD, input.matched)
+      end
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{stops}]*/)
       consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{stops}]*/)

data/lib/namae/parser.y

@@ -251,7 +251,11 @@ require 'strscan'
     when input.scan(suffix)
       consume_word(:SUFFIX, input.matched.strip)
     when input.scan(appellation)
-      [:APPELLATION, input.matched.strip]
+      if @words.zero?
+        [:APPELLATION, input.matched.strip]
+      else
+        consume_word(:UWORD, input.matched)
+      end
     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 = 0
-    MINOR = 10
-    PATCH = 2
+    MINOR = 11
+    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 0.10.2 ruby lib
+# stub: namae 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "namae".freeze
-  s.version = "0.10.2"
+  s.version = "0.11.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 = "2016-05-11"
+  s.date = "2016-06-20"
   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.). ".freeze
   s.email = ["sylvester@keil.or.at".freeze, "dan@collispuro.com".freeze]
   s.extra_rdoc_files = [

data/spec/namae/parser_spec.rb

@@ -74,7 +74,7 @@ module Namae
 
         %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 }
+            before { parser.reset.send(:input).string = appellation }
             it 'returns an APPELLATION token' do
               expect(parser.send(:next_token)).to eq([:APPELLATION, appellation])
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Sylvester Keil
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov