ladyboy 0.0.3 → 0.0.4

data/lib/ladyboy.rb

@@ -44,11 +44,11 @@ module Ladyboy
   def sexes_es
     @sexes_es ||= begin
       s = {}
-      fn = File.join(root, "data", "name2sex_es.csv")
+      fn = File.join(root, "data", "name2sex_es2.csv")
       File.read(fn).each_line.with_index do |line, priority|
         name, sex = line.chomp.split(",")
         sex = sex.to_i
-        s[name] = [sex, priority] if SEX.has_key?(sex)
+        s[name] = [sex, priority] if SEX.has_key?(sex) && !s[name]
       end
       s
     end

data/lib/ladyboy/parser.rb

@@ -19,18 +19,22 @@ module Ladyboy
       major = major_name_and_sex_for_full_name(@full_name)
       return unless major
 
-      @first_name = Unicode.capitalize(major[0])
+      @first_name = major[0].split(" ").map{|m| Unicode.capitalize(m) } * " " if major[0]
       @gender = SEX[major[1]]
     end
 
     def major_name_and_sex_for_full_name(full_name)
-      full_name.to_s.scan(/[[:word:]]+/).map do |token|
-        name = normalize_name(token)
-        if name
-          sex = Ladyboy.sexes[name] || Ladyboy.sexes_es[name] || [nil, Float::INFINITY]
-          [name, *sex]
+      tokens = full_name.to_s.scan(/[[:word:]]+/)
+      [2, 1].map do |size|
+        tokens.each_cons(size).map do |slice|
+          token = slice * " "
+          name = normalize_name(token)
+          if name
+            sex = Ladyboy.sexes[name] || Ladyboy.sexes_es[name] || [nil, Float::INFINITY]
+            [name, *sex, -size]
+          end
         end
-      end.compact.sort_by(&:last).first
+      end.flatten(1).compact.sort_by{ |n| [n[3], n[2]] }.first
     end
   end
 end

data/lib/ladyboy/version.rb

@@ -1,3 +1,3 @@
 module Ladyboy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/ladyboy/parser_spec.rb

@@ -59,6 +59,14 @@ describe Ladyboy::Parser do
     example.first_name.must_equal 'Jesus'
     example.gender.must_equal     :male
 
+    example = Ladyboy::Parser.new 'Buendia Francisco Javier'
+    example.first_name.must_equal 'Francisco Javier'
+    example.gender.must_equal     :male
+
+    example = Ladyboy::Parser.new 'Kilian Byszio'
+    example.first_name.must_equal 'Килиан'
+    example.gender.must_equal     :male
+
     example = Ladyboy::Parser.new nil
     example.first_name.must_equal nil
     example.gender.must_equal     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladyboy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Peter Yanovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - data/name2name.csv
 - data/name2sex.csv
 - data/name2sex_es.csv
+- data/name2sex_es2.csv
 - ladyboy.gemspec
 - lib/ladyboy.rb
 - lib/ladyboy/parser.rb