namae 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e852d37c24eaf8552f35d07a3882e04855834f05
-  data.tar.gz: 7ead688127771320b8bd696c5c84c84a1f0a1c3b
+  metadata.gz: b2f817b8e6424d7ca383930ce0e7972067a6739b
+  data.tar.gz: 70dabec7ddfa545b6bcda9c3d7dc00bc8c0879c3
 SHA512:
-  metadata.gz: 0ae8f55144a59c87632f88dd7eb5b0264193bdfd0c81372a9312d2decadf41315086b6bd228222e8bba4aaf5d9528eb8b70e7e5286ba594a8e82ddf104410680
-  data.tar.gz: eb500ebdf1c8cac24fa5c2322e90fb3e0868af054747a4b7bd33ecc6618d3886339b1a6a23c084a3cf8f6cee7e1efa05a4b0c3659b3740683cc261c1e72c985e
+  metadata.gz: 768ae4032f5da7b9212e0fb3c4e3830209a7fb95d0b8ac7f5a4cf0c233fd47d3eb9c5bc1ba5d2e58b5d1f6ab81c7a19220a046808265bbfc9c505f42eda2b94a
+  data.tar.gz: 5fcca10db251ec01f7f9f1d1e73794eedad46fc5684b5c90535518f262270e77207bf9a705cbe424cdcce4d05ff11f0f08efc643c09c57097055e73a9c2f42ac

data/.simplecov

@@ -1,2 +1,4 @@
 SimpleCov.start do
+  add_filter 'spec/'
+  add_filter 'features/'
 end

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
-bundler_args: --without debug osx development
+bundler_args: --without debug osx optional
+script: bundle exec rake test_with_coveralls
 rvm:
   - 2.1.0
   - 2.0.0

data/Gemfile

@@ -6,10 +6,15 @@ group :test do
   gem 'cucumber', '~>1.3'
 end
 
+
 group :development do
-  gem 'racc', '1.4.9', :platform => [:ruby]
   gem 'simplecov', '~>0.8', :require => false, :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'rubinius-coverage', '~>2.0', :platform => :rbx
+  gem 'coveralls', :require => false
+  gem 'racc', '1.4.9', :platform => [:ruby]
+end
+
+group :optional do
   gem 'ZenTest', '~>4.9'
   gem 'jeweler', '~> 2.0'
   gem 'yard', '~>0.8'
@@ -25,9 +30,6 @@ group :osx do
   gem 'autotest-fsevent'
 end
 
-group :travis do
-  platform :rbx do
-    gem 'rubysl', '~>2.0'
-    gem 'racc', '1.4.9'
-  end
+platform :rbx do
+  gem 'rubysl', '~>2.0'
 end

data/Rakefile

@@ -58,6 +58,10 @@ Cucumber::Rake::Task.new(:features)
 
 task :default => [:spec, :features]
 
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+task :test_with_coveralls => [:spec, :features, 'coveralls:push']
+
 begin
   require 'yard'
   YARD::Rake::YardocTask.new

data/features/support/env.rb

@@ -9,12 +9,17 @@ end
 
 begin
   require 'simplecov'
+  require 'coveralls' if ENV['CI']
 rescue LoadError
   # ignore
-end
+end unless RUBY_VERSION < '1.9'
 
 begin
-  require 'debugger'
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    require 'rubinius/debugger'
+  else
+    require 'debugger'
+  end
 rescue LoadError
   # ignore
 end

data/lib/namae/parser.rb

@@ -15,9 +15,9 @@ module Namae
 module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
 
   include Singleton
-    
-  attr_reader :options
-  
+
+  attr_reader :options, :input
+
   def initialize
     @input, @options = StringScanner.new(''), {
       :debug => false,
@@ -29,15 +29,15 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
       :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
     }
   end
-  
+
   def debug?
     options[:debug] || ENV['DEBUG']
   end
-  
+
   def separator
     options[:separator]
   end
-  
+
   def comma
     options[:comma]
   end
@@ -53,7 +53,7 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
   def appellation
     options[:appellation]
   end
-  
+
   def prefer_comma_as_separator?
     options[:prefer_comma_as_separator]
   end
@@ -64,39 +64,39 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
     warn e.message if debug?
     []
   end
-  
+
   def parse!(string)
     input.string = normalize(string)
     reset
     do_parse
   end
-  
+
   def normalize(string)
     string = string.strip
     string
   end
-  
+
   def reset
-    @commas, @words, @initials, @suffices, @yydebug = 0, 0, 0, 0, debug?   
+    @commas, @words, @initials, @suffices, @yydebug = 0, 0, 0, 0, debug?
     self
   end
 
   private
-  
+
   def stack
     @vstack || @racc_vstack || []
   end
-  
+
   def last_token
     stack[-1]
   end
-  
+
   def consume_separator
     return next_token if seen_separator?
     @commas, @words, @initials, @suffices = 0, 0, 0, 0
     [:AND, :AND]
   end
-  
+
   def consume_comma
     @commas += 1
     [:COMMA, :COMMA]
@@ -122,11 +122,11 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
   def suffix?
     !@suffices.zero? || will_see_suffix?
   end
-  
+
   def will_see_suffix?
     input.peek(8).to_s.strip.split(/\s+/)[0] =~ suffix
   end
-    
+
   def will_see_initial?
     input.peek(6).to_s.strip.split(/\s+/)[0] =~ /[[:alpha:]]\./
   end
@@ -169,13 +169,11 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 97)
         "Failed to parse name #{input.string.inspect}: unmatched data at offset #{input.pos}"
     end
   end
-    
+
   def on_error(tid, value, stack)
     raise ArgumentError,
       "Failed to parse name: unexpected '#{value}' at #{stack.inspect}"
   end
-    
-  attr_reader :input
 
 # -*- racc -*-
 ...end parser.y/module_eval...
@@ -593,4 +591,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module Namae
+end   # module Namae

data/lib/namae/parser.y

@@ -17,10 +17,10 @@ rule
        | honorific word          { result = val[0].merge(:family => val[1]) }
        | honorific display_order { result = val[1].merge(val[0]) }
        | sort_order
-  
+
   honorific : APPELLATION { result = Name.new(:appellation => val[0]) }
             | TITLE       { result = Name.new(:title => val[0]) }
-            
+
   display_order : u_words word opt_suffices
        {
          result = Name.new(:given => val[0], :family => val[1], :suffix => val[2])
@@ -43,7 +43,7 @@ rule
        {
          result = Name.new(:particle => val[0], :family => val[1])
        }
-       
+
   sort_order : last COMMA first
        {
          result = Name.new({ :family => val[0], :suffix => val[2][0],
@@ -79,7 +79,7 @@ rule
 
   words : word
         | words word { result = val.join(' ') }
-  
+
   opt_words : /* empty */ | words
 
   word : LWORD | UWORD | PWORD
@@ -96,9 +96,9 @@ require 'strscan'
 ---- inner
 
   include Singleton
-    
-  attr_reader :options
-  
+
+  attr_reader :options, :input
+
   def initialize
     @input, @options = StringScanner.new(''), {
       :debug => false,
@@ -110,15 +110,15 @@ require 'strscan'
       :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
     }
   end
-  
+
   def debug?
     options[:debug] || ENV['DEBUG']
   end
-  
+
   def separator
     options[:separator]
   end
-  
+
   def comma
     options[:comma]
   end
@@ -134,7 +134,7 @@ require 'strscan'
   def appellation
     options[:appellation]
   end
-  
+
   def prefer_comma_as_separator?
     options[:prefer_comma_as_separator]
   end
@@ -145,39 +145,39 @@ require 'strscan'
     warn e.message if debug?
     []
   end
-  
+
   def parse!(string)
     input.string = normalize(string)
     reset
     do_parse
   end
-  
+
   def normalize(string)
     string = string.strip
     string
   end
-  
+
   def reset
-    @commas, @words, @initials, @suffices, @yydebug = 0, 0, 0, 0, debug?   
+    @commas, @words, @initials, @suffices, @yydebug = 0, 0, 0, 0, debug?
     self
   end
 
   private
-  
+
   def stack
     @vstack || @racc_vstack || []
   end
-  
+
   def last_token
     stack[-1]
   end
-  
+
   def consume_separator
     return next_token if seen_separator?
     @commas, @words, @initials, @suffices = 0, 0, 0, 0
     [:AND, :AND]
   end
-  
+
   def consume_comma
     @commas += 1
     [:COMMA, :COMMA]
@@ -203,11 +203,11 @@ require 'strscan'
   def suffix?
     !@suffices.zero? || will_see_suffix?
   end
-  
+
   def will_see_suffix?
     input.peek(8).to_s.strip.split(/\s+/)[0] =~ suffix
   end
-    
+
   def will_see_initial?
     input.peek(6).to_s.strip.split(/\s+/)[0] =~ /[[:alpha:]]\./
   end
@@ -250,12 +250,10 @@ require 'strscan'
         "Failed to parse name #{input.string.inspect}: unmatched data at offset #{input.pos}"
     end
   end
-    
+
   def on_error(tid, value, stack)
     raise ArgumentError,
       "Failed to parse name: unexpected '#{value}' at #{stack.inspect}"
   end
-    
-  attr_reader :input
 
 # -*- racc -*-

data/lib/namae/version.rb

@@ -2,7 +2,7 @@ module Namae
   module Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 1
+    PATCH = 2
     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.8.1 ruby lib
+# stub: namae 0.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "namae"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   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-01-07"
+  s.date = "2014-01-28"
   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 = [
@@ -57,27 +57,24 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<racc>, ["= 1.4.9"])
+      s.add_runtime_dependency(%q<rubysl>, ["~> 2.0"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.8"])
       s.add_development_dependency(%q<rubinius-coverage>, ["~> 2.0"])
-      s.add_development_dependency(%q<ZenTest>, ["~> 4.9"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.8"])
+      s.add_development_dependency(%q<coveralls>, [">= 0"])
+      s.add_development_dependency(%q<racc>, ["= 1.4.9"])
     else
-      s.add_dependency(%q<racc>, ["= 1.4.9"])
+      s.add_dependency(%q<rubysl>, ["~> 2.0"])
       s.add_dependency(%q<simplecov>, ["~> 0.8"])
       s.add_dependency(%q<rubinius-coverage>, ["~> 2.0"])
-      s.add_dependency(%q<ZenTest>, ["~> 4.9"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<yard>, ["~> 0.8"])
+      s.add_dependency(%q<coveralls>, [">= 0"])
+      s.add_dependency(%q<racc>, ["= 1.4.9"])
     end
   else
-    s.add_dependency(%q<racc>, ["= 1.4.9"])
+    s.add_dependency(%q<rubysl>, ["~> 2.0"])
     s.add_dependency(%q<simplecov>, ["~> 0.8"])
     s.add_dependency(%q<rubinius-coverage>, ["~> 2.0"])
-    s.add_dependency(%q<ZenTest>, ["~> 4.9"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<yard>, ["~> 0.8"])
+    s.add_dependency(%q<coveralls>, [">= 0"])
+    s.add_dependency(%q<racc>, ["= 1.4.9"])
   end
 end
 

data/spec/spec_helper.rb

@@ -1,16 +1,17 @@
 begin
-  require 'simplecov' 
+  require 'simplecov'
+  require 'coveralls' if ENV['CI']
 rescue LoadError
   # ignore
 end unless RUBY_VERSION < '1.9'
 
 begin
-  if RUBY_ENGINE == 'rbx'
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
   else
     require 'debugger'
   end
-rescue LoadError, NameError
+rescue LoadError
   # ignore
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sylvester Keil
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: rubysl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.9
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -54,47 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.9'
-- !ruby/object:Gem::Dependency
-  name: jeweler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.4.9
 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.). "
@@ -160,4 +146,3 @@ signing_key:
 specification_version: 4
 summary: Namae (名前) parses personal names and splits them into their component parts.
 test_files: []
-has_rdoc: