namae 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e1ee8f637224f405bedf0613836a4b59f6b1f0e
-  data.tar.gz: 499724d0f9325bd3da3647536a9490c1880cec41
+  metadata.gz: 24ebdab9dcba1587795fd5a50f17f76024e7260e
+  data.tar.gz: e9782ac717a00aa60aa4d752413fa1aecfbd9c49
 SHA512:
-  metadata.gz: 314e4c74757ee48a6ee5bc4067b6299faa7636a221a6e98d18fecb91ca6bf74cb95524db3379e6424834c72f181e61c7af125e641681d01b8ca3ebb988866830
-  data.tar.gz: ba8db13e21484ffc445ef7a8baa650f64145e722a9616b50f4c7a1cc75b5bff283e1bce910fc4259c8d507ddcce71dc7f35cd8fe9a0eb6a4dfc605a98b0ccb1b
+  metadata.gz: 10711cdb7d8a966ef4ee07d048ff8243947942ca8b7c9e7d763ab6d6a8fcd5580f25b89b3ec0275d2387a36664d13028779afd83630c571d91bf35f54338a3cf
+  data.tar.gz: e9723eaf26f61219868c8f28ea155d8f036fb68fb017cf0d454e69af82dba96a99d3886365f6b342f67133263415451bafcdd555051514e43353b0f8fb860592

data/lib/namae/name.rb

@@ -1,5 +1,56 @@
 module Namae
 
+  # NameFormatting can be mixed in by an object providing individual
+  # name parts (family, given, suffix, particle, etc.) to add support
+  # for name formatting.
+  module NameFormatting
+
+    # @return [String] the name in sort order
+    def sort_order(delimiter = ', ')
+      [family_part, given_part].reject(&:empty?).join(delimiter)
+    end
+
+    # @return [String] the name in display order
+    def display_order
+      [given_part, family_part].reject(&:empty?).join(' ')
+    end
+
+    # @param options [Hash] the options to create the initials
+    #
+    # @option options [true,false] :expand (false) whether or not to expand the family name
+    # @option options [true,false] :dots (true) whether or not to print dots between the initials
+    # @option options [true,false] :spaces (false) whether or not to print spaces between the initals
+    #
+    # @return [String] the name's initials.
+    def initials(options = {})
+      options = Name.defaults[:initials].merge(options)
+
+      if options[:expand]
+        [initials_of(given_part, options), family].compact.join(' ')
+      else
+        initials_of([given_part, family_part].join(' '), options)
+      end
+    end
+
+    private
+
+    def family_part
+      [particle, family].compact.join(' ')
+    end
+
+    def given_part
+      [given, dropping_particle].compact.join(' ')
+    end
+
+    # @param name [String] a name or part of a name
+    # @return [String] the initials of the passed-in name
+    def initials_of(name, options = {})
+      i = name.gsub(/([[:upper:]])[[:lower:]]+/, options[:dots] ? '\1.' : '\1')
+      i.gsub!(/\s+/, '') unless options[:spaces]
+      i
+    end
+  end
+
   # A Name represents a single personal name, exposing its constituent
   # parts (e.g., family name, given name etc.). Name instances are typically
   # created and returned from {Namae.parse Namae.parse}.
@@ -13,7 +64,9 @@ module Namae
   class Name < Struct.new :family, :given, :suffix, :particle,
     :dropping_particle, :nick, :appellation, :title
 
-    # rbx compatibility
+    include NameFormatting
+
+    # RBX compatibility
     @parts = members.map(&:to_sym).freeze
 
     @defaults = {
@@ -64,16 +117,6 @@ module Namae
       end
     end
 
-    # @return [String] the name in sort order
-    def sort_order(delimiter = ', ')
-      [family_part, given_part].reject(&:empty?).join(delimiter)
-    end
-
-    # @return [String] the name in display order
-    def display_order
-      [given_part, family_part].reject(&:empty?).join(' ')
-    end
-
     # @return [Boolean] whether or not all the name components are nil.
     def empty?
       values.compact.empty?
@@ -95,22 +138,6 @@ module Namae
       self
     end
 
-    # @param options [Hash] the options to create the initials
-    #
-    # @option options [true,false] :expand (false) whether or not to expand the family name
-    # @option options [true,false] :dots (true) whether or not to print dots between the initials
-    # @option options [true,false] :spaces (false) whether or not to print spaces between the initals
-    #
-    # @return [String] the name's initials.
-    def initials(options = {})
-      options = Name.defaults[:initials].merge(options)
-
-      if options[:expand]
-        [initials_of(given_part, options), family].compact.join(' ')
-      else
-        initials_of([given_part, family_part].join(' '), options)
-      end
-    end
 
     # @overload values_at(selector, ... )
     #   Returns an array containing the elements in self corresponding to
@@ -135,23 +162,5 @@ module Namae
 
     alias to_s display_order
 
-    private
-
-    def family_part
-      [particle, family].compact.join(' ')
-    end
-
-    def given_part
-      [given, dropping_particle].compact.join(' ')
-    end
-
-    # @param name [String] a name or part of a name
-    # @return [String] the initials of the passed-in name
-    def initials_of(name, options = {})
-      i = name.gsub(/([[:upper:]])[[:lower:]]+/, options[:dots] ? '\1.' : '\1')
-      i.gsub!(/\s+/, '') unless options[:spaces]
-      i
-    end
-
   end
 end

data/lib/namae/version.rb

@@ -2,7 +2,7 @@ module Namae
   module Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 3
+    PATCH = 4
     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.3 ruby lib
+# stub: namae 0.8.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "namae"
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   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-28"
+  s.date = "2014-03-17"
   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 = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/berkmancenter/namae"
   s.licenses = ["AGPL"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "Namae (\u{540d}\u{524d}) parses personal names and splits them into their component parts."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namae
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Sylvester Keil
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubinius-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -67,9 +67,9 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.9
-description: " Namae (名前) is a parser for human names. It recognizes personal names
+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.). "
+  (e.g., given and family names, honorifics etc.). '
 email:
 - sylvester@keil.or.at
 - dan@collispuro.com
@@ -78,13 +78,13 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".autotest"
-- ".coveralls.yml"
-- ".document"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
-- ".yardopts"
+- .autotest
+- .coveralls.yml
+- .document
+- .rspec
+- .simplecov
+- .travis.yml
+- .yardopts
 - AGPL
 - BSDL
 - Gemfile
@@ -118,17 +118,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Namae (名前) parses personal names and splits them into their component parts.