nomener 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4d3e3d0da16de4111205c7c0355bd8db5526a5
-  data.tar.gz: 314c165d421692570ebf48a64cbfdc9748f22c70
+  metadata.gz: 2c250686ec8119b88c20fe08ee5e4ecd720411b5
+  data.tar.gz: 1efeb93999ebf6d3ccc9b879c9ac0a0c84696cac
 SHA512:
-  metadata.gz: 3d1d2126b1bb6a6e6e4622a5eae671157dae540515137e2862f224a399d8e6b19c9d6f21e74796f4be2c4f47f51cf4cb7280533ce0aef79eaf121571801a9309
-  data.tar.gz: 3527b6b3e9fcbb1e3d8d317ad4d25ec1eee6ff926377722bf32581b13b47a1fff56a04cded4929955a0bc37365c88b250eced36a4a0c6558247506b0ef19f7f2
+  metadata.gz: 1e66b1549074d0ffd816aae1bc4c84cc143a324f09e94e23ddcd0c61b29d04fe497e275a508d7320dba446370e5a528ecd03ea105ab5baa978bf3c30876c300d
+  data.tar.gz: 3b2fbf3c124d97965e8836eed594276041a5135079f162ca2024f213ac08a894e7467f3fcf69101cdc9edadf4d4e124a73dc76c97a54d3f5f74433d028a3f384

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+install: bundle install --jobs=3 --retry=3
+script: bundle exec rspec
+
+sudo: false
+
+rvm:
+  - 2.2.0
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+#  - rbx-2
+notifications:
+  email: false
+matrix:
+  fast_finish: true

data/README.md

@@ -1,14 +1,15 @@
 # Nomener
 [![Gem Version](https://badge.fury.io/rb/nomener.svg)](http://badge.fury.io/rb/nomener)
+[![Build Status](https://travis-ci.org/dan-ding/nomener.svg?branch=master)](https://travis-ci.org/dan-ding/nomener)
 
-Nomener assists with parsing peoples names that they give themselves (or other people). Nomener is a fork of [People](https://github.com/dan-ding/people) as it uses some code contributed there. It's currently geared towards western style name formatting, however other cultural name formatting is (or would like to be supported).Currently it attempts to parse names through pattern matching without using dictionary/library/data files (except for name decorations and suffixes, see usage). It may not be possible to do without such in all languages.
+Nomener assists with parsing peoples names that they give themselves (or other people). Nomener ~~is~~ was a fork of [People](https://github.com/dan-ding/people) as it uses some code contributed there. It's currently geared towards western style name formatting, however other cultural name formatting is (or would like to be supported). Currently it attempts to parse names through pattern matching without using large(r) dictionary/library/data files (except for name decorations and suffixes, see usage). It may not be possible to do without such in all languages.
 
 If you didn't know, parsing names can be much more difficult than it seems it should be.
 
 ## Requirements
 
-Requires Ruby 2.1 or higher (or equivalent).
-To use with 1.9 or 2.0 you'll need to install either [https://github.com/hsbt/string-scrub](string-scrub) or [https://github.com/jrochkind/scrub_rb](scrub_rb).
+Requires Ruby 1.9.3 or higher (or equivalent).
+If using Ruby 1.9.3 or 2.0.0, it depends on [string-scrub](https://github.com/hsbt/string-scrub)
 
 ## Installation
 
@@ -33,11 +34,16 @@ name = Nomener.parse "Joe Smith" # <Nomener::Name first="Joe" last="Smith">
 
 Create a new instance:
 ```ruby
-name = Nomener::Name.new "Joe Smith" # <Nomener::Name >
-name.parse                           # <Nomener::Name first="Joe" last="Smith">
+name = Nomener::Name.new "Duke Joe (Henry) Smith Jr."
+ # name is <Nomener::Name title="Duke" first="Joe" nick="Henry" last="Smith" suffix="Jr">
+
 name.first                           # Joe
 name.name                            # Joe Smith
 "Hi #{name}!"                        # Hi Joe Smith!
+name.last                            # Smith
+name.title                           # "Duke"
+name.suffix                          # "Jr"
+name.nick                            # "Henry"
 ```
 
 ## TODO

data/Rakefile

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require "bundler/gem_tasks"
 
 begin
@@ -27,4 +28,35 @@ end
 task :rspec do
   RSpec::Core::RakeTask.new(:spec)
   Rake::Task["spec"].execute
-end
+end
+
+# from https://github.com/chiliproject/chiliproject/blob/master/lib/tasks/code.rake
+desc "Set the magic encoding comment everywhere to UTF-8"
+task :source_encoding do
+  shebang = '\s*#!.*?(\n|\r\n)'
+  magic_regex = /\A(#{shebang})?\s*(#\W*(en)?coding:.*?$)/mi
+
+  magic_comment = '#-- encoding: UTF-8'
+
+  (Dir['script/**/**'] + Dir['**/**{.rb,.rake}']).each do |file_name|
+    next unless File.file?(file_name)
+
+    # We don't skip code here, as we need ALL code files to have UTF-8
+    # source encoding
+    file_content = File.read(file_name)
+    if file_content =~ magic_regex
+      file_content.gsub!(magic_regex, "\\1#{magic_comment}")
+    else
+      if file_content.start_with?("#!")
+        # We have a shebang. Encoding comment is to put on the second line
+        file_content.sub!(/(\n|\r\n)/, "\\1#{magic_comment}\\1")
+      else
+        file_content = magic_comment + "\n" + file_content
+      end
+    end
+
+    File.open(file_name, "w") do |file|
+      file.write file_content
+    end
+  end
+end

data/lib/nomener.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require "nomener/version"
 require "nomener/name"
 require "nomener/parser"

data/lib/nomener/compounders.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 module Nomener
   module Compounders
     # Many of these are from http://en.wikipedia.org/wiki/List_of_family_name_affixes

data/lib/nomener/helper.rb

@@ -1,3 +1,11 @@
+#-- encoding: UTF-8
+
+# For Ruby 1.9.3, 2.0.0
+rv = RUBY_VERSION.split(".")[(0..1)].join("")
+if rv >= '19' && rv < '21'
+  require "string-scrub"
+end
+
 module Nomener
   module Helper
 

data/lib/nomener/name.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require "nomener/parser"
 
 module Nomener
@@ -8,10 +9,15 @@ module Nomener
 
     # Public: Create an instance!
     def initialize(nomen = '')
-      @original = Nomener::Helper.reformat(nomen.kind_of?(String) ? nomen : "")
+      @original = ""
+      if nomen.kind_of?(String)
+        @original = Nomener::Helper.reformat nomen
+        parse
+      end
     end
 
     # Public: Break down a string into parts of a persons name
+    #   As of 0.2.5 parse no longer needs to be called after initialization, it's done automatically.
     #
     # name - A string of name to parse
     #
@@ -86,6 +92,21 @@ module Nomener
       "#<Nomener::Name #{each_pair.map { |k,v| [k,v.inspect].join('=') if (!v.nil? && !v.empty?) }.compact.join(' ')}>"
     end
 
+    # Public: an alias for the last name
+    #
+    # Returns a string of the last name
+    def surname
+      last
+    end
+    alias :family :surname
+
+    # Public: Return the first name
+    #
+    # Returns a string of the first name
+    def given
+      first
+    end
+
     # Public: Make the name a string.
     #
     # format - a string using symboles specifying the format of the name to return
@@ -140,5 +161,12 @@ module Nomener
       each_pair { |k, v| self[k] = other[k] }
     end
 
+    # Public: return self as a hash. For ruby 1.9.3
+    #
+    # Returns a hash of the name parts
+    def to_h
+      Hash[self.each_pair.to_a]
+    end unless method_defined?(:to_h)
+
   end
 end

data/lib/nomener/parser.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require "nomener/name"
 require "nomener/titles"
 require "nomener/suffixes"

data/lib/nomener/suffixes.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 module Nomener
   module Suffixes
 

data/lib/nomener/titles.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 module Nomener
   module Titles
     

data/lib/nomener/version.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 module Nomener
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/nomener.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: UTF-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'nomener/version'
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Dante Piombino"]
   spec.email         = ["not@amusing.ninja"]
   spec.summary       = %q{A(nother)? human name parser in ruby.}
-  spec.description   = %q{A human name parser in ruby.}
+  spec.description   = %q{A human name parser in ruby. It attempts to determine name pieces like title, first name, surname, etc. }
   spec.homepage      = "https://github.com/dan-ding/nomener"
   spec.license       = "MIT"
 
@@ -18,7 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 1.9.3'
+
+  rv = RUBY_VERSION.split(".")[(0..1)].join("")
+  if rv >= '19' && rv < '21'
+    spec.add_runtime_dependency "string-scrub", ">= 0.0.5"
+  end
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake",  "~> 10.0"

data/spec/nomener/complex_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Complex name parsing" do

data/spec/nomener/names/guardian_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 # from http://www.theguardian.com/books/list/authorsaz
@@ -589,8 +590,13 @@ RSpec.describe "The Guardian author list" do
               expect(v).to eq(name[:to][k]), "got from #{k} - #{v} not #{name[:to][k]}"
             end
           end
+          name[:to].each_pair do |k,v|
+            unless (k == :full)
+              expect(v).to eq(parse_hash[k]), "got from #{k} - #{v} wanted #{parse_hash[k]} #{parse_hash}"
+            end
+          end
         end
       end
 
     end
-  end
+  end

data/spec/nomener/names/wikiquote_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 # lots of names from wikiquote http://simple.wikiquote.org/wiki/List_of_people_by_name
 # minimal changes

data/spec/nomener/names_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Name Parsing" do

data/spec/nomener/nomener_componders_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Compounders" do

data/spec/nomener/nomener_helper_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Helper" do

data/spec/nomener/nomener_name_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Name" do
@@ -7,7 +8,7 @@ RSpec.describe "Nomener::Name" do
       name = Nomener::Name.new("Joe Smith")
       expect(name).to be_a Nomener::Name
       expect(name.original).to eq "Joe Smith"
-      expect(name.values.delete_if {|i| i.nil? || i.empty? }).to eq []
+      expect(name.name).to eq "Joe Smith"
     end
 
     it "an empty Nomener::Name when given a non-string" do
@@ -35,7 +36,6 @@ RSpec.describe "Nomener::Name" do
   context "with parse" do
     it "it parses 'Joe Smith'" do
       name = Nomener::Name.new("Joe Smith")
-      name.parse
       expect(name.first).to eq "Joe"
       expect(name.last).to eq "Smith"
     end
@@ -44,7 +44,6 @@ RSpec.describe "Nomener::Name" do
   context "with properlike" do
     it "returns the name in a nice case" do
       name = Nomener::Name.new("joE SmItH")
-      name.parse
       expect(name.properlike).to eq "Joe Smith"
     end
   end
@@ -52,13 +51,11 @@ RSpec.describe "Nomener::Name" do
   context "with to_s" do
     it "returns the name in a original case" do
       name = Nomener::Name.new("joE SmItH")
-      name.parse
       expect(name.to_s).to eq "joE SmItH"
     end
 
     it "can be used in a string" do
       name = Nomener::Name.new("Joe Smith")
-      name.parse
       expect("Hello #{name}!").to eq "Hello Joe Smith!"
     end
   end
@@ -66,7 +63,6 @@ RSpec.describe "Nomener::Name" do
   context "with name" do
     it "follows the format and returns 'Bob Bob Bob' from 'Bob Smith'" do
       name = Nomener::Name.new("Bob Smith")
-      name.parse
       expect(name.name("%f %f %f")).to eq "Bob Bob Bob"
     end
   end
@@ -74,7 +70,6 @@ RSpec.describe "Nomener::Name" do
   context "with full" do
     it "returns the entire parsed name as a string" do
       name = Nomener::Name.new("Mr. Joe Bob Smith")
-      name.parse
       expect(name.full).to eq "Joe Bob Smith"
     end
   end
@@ -82,7 +77,6 @@ RSpec.describe "Nomener::Name" do
   context "with inspect" do
     it "details the object with only the parsed strings" do
       name = Nomener::Name.new("Mr. Joe Smith")
-      name.parse
       expect(name.inspect).to eq '#<Nomener::Name title="Mr" first="Joe" last="Smith">'
     end
   end

data/spec/nomener/nomener_parser_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Parser" do

data/spec/nomener/nomener_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener" do

data/spec/nomener/nomener_suffixes_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Suffixes" do

data/spec/nomener/nomener_titles_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Nomener::Titles" do

data/spec/nomener/titles_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe "Title" do
@@ -217,8 +218,8 @@ RSpec.describe "Title" do
     ].each do |name|
       it "parses #{name[:result]} from #{name[:name]}" do
         skip name[:skip] if name.has_key?(:skip)
-        parsed = Nomener.parse(name[:name])
-        expect(parsed.title).to eq name[:result]
+        parsed = Nomener::Parser.parse_title!(name[:name])
+        expect(parsed).to eq name[:result]
       end
     end
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nomener
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Dante Piombino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: A human name parser in ruby.
+description: 'A human name parser in ruby. It attempts to determine name pieces like
+  title, first name, surname, etc. '
 email:
 - not@amusing.ninja
 executables: []
@@ -74,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="