person-name 0.2.4 → 0.2.5

data/Gemfile

@@ -1,8 +1,8 @@
 source :gemcutter
 
 # Rails 3.0
-gem 'rails',        '3.0.0'
-gem 'rspec',        '2.0.0.beta.22'
+gem 'rails',        '3.0.1'
+gem 'rspec',        '2.0.1'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'mysql'
 gem 'pg'

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -15,19 +15,19 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
@@ -42,7 +42,7 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -53,37 +53,37 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.5)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
-    thor (0.14.1)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -95,7 +95,7 @@ DEPENDENCIES
   jeweler
   mysql
   pg
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rcov
-  rspec (= 2.0.0.beta.22)
+  rspec (= 2.0.1)
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/person_name/has_person_name.rb

@@ -40,22 +40,46 @@ module PersonName
         base.send :include, PersonName::ActiveRecord::Core::InstanceMethods
         base.extend PersonName::ActiveRecord::Core::ClassMethods
         base.initialize_person_names
+        #base.define_scopes
       end
 
       module ClassMethods
+
         def initialize_person_names
           name_types.map(&:to_s).each do |name_type|
-            class_eval %(
-							def #{name_type}
-								person_name_for('#{name_type}')
-							end
-
-							def #{name_type}= new_name
-								set_person_name_for('#{name_type}', new_name)
-							end
-						)
+            script = %(
+              def #{name_type}
+                person_name_for('#{name_type}')
+              end
+            )
+            script += %(
+              def #{name_type}= new_name
+                set_person_name_for('#{name_type}', new_name)
+              end
+            )
+            class_eval script
           end
         end
+
+#        def define_scopes
+#          name_types.map(&:to_s).each do |field_name|
+#            concat_construct = [%(IFNULL(`#{field_name}_prefix`, ""))]
+#            [:first_name, :middle_name, :intercalation, :last_name, :suffix].each { |element|
+#              concat_construct << %(IF(ISNULL(`#{field_name}_#{element}`), "", CONCAT(" ", `#{field_name}_#{element}`)))
+#            }
+#            script = %(
+#              scope :with_#{field_name}, lambda { |name|
+#                where('TRIM(CONCAT(#{concat_construct.join(", ")})) = ?', name)
+#              }
+#              def find_by_#{field_name}(name)
+#                self.with_#{field_name}(name).first
+#              end
+#            )
+#            puts script
+#            instance_eval script
+#          end
+#        end
+
       end
 
       module InstanceMethods
@@ -66,6 +90,7 @@ module PersonName
         end
 
         def set_person_name_for field, new_name
+          write_attribute(field, new_name)
           person_name_for(field).full_name = new_name
         end
 

data/lib/person_name/migration_support.rb

@@ -10,6 +10,7 @@ module ActiveRecord
         name_parts.each do |part|
           column("#{name}_#{part}".to_sym, :string, :null => true)
         end
+        column("#{name}".to_sym, :string, :null => true)
       end
 
     end

data/lib/person_name/name_splitter.rb

@@ -3,67 +3,101 @@ module PersonName
 
     NAME_PARTS = %w(prefix first_name middle_name intercalation last_name suffix)
 
+    DEFAULT_PREFIXES = %w(Mr. Dhr. Drs. Prof. Mevr. Mej. Mrs.)
+    DEFAULT_SUFFIXES = %w(jr. Phd.)
+
+    # Splits the given name in individual name parts in form of a hash.
+    # You can supply a hash with existing values for editing purposes.
     def self.split(new_name_str, existing_values = {})
       parts = new_name_str.split " "
       names = []
       stage = :prefix
+
+      # value to remember for merging
       remember = nil
       parts.each_with_index do |part, index|
+
+        # some helper variables
         is_upcase = (part[0,1] == part[0,1].upcase)
         has_dash = part.include? "-"
         is_last = (parts.length - 1) == index
 
-        fp = [remember, part].compact.join(" ")
+        # add the remember part to the current part but make a note if we used a remembered value
+        full_part = [remember, part].compact.join(" ")
+        did_remember = (full_part != part)
+        suffix_remember = remember
         remember = nil
-        did_remember = (fp != part)
-        if valid_prefix?(part) and stage == :prefix # if the part is a valid prefix, mark it as such
-          names = add_to_last_if :prefix, fp, names
-        elsif valid_suffix?(part) and stage == :name # if the part is a valid suffix, mark it as such
-          names = add_to_last_if :suffix, fp, names
-        elsif part == "-" # if the part is a dash
-          if last_stored = names.pop # retrieve the previous name part (if any) and store it with the dash
-            # for the part to come (remember)
-            remember = [last_stored[0], fp].compact.join(" ")
-          else
-            # if there is no previous part, just store the current part for later
-            remember = fp
-          end
-        elsif !is_upcase and !did_remember # intercalation words are never with a capital
-          names = add_to_last_if :intercalation, fp, names
-          stage = :name
-        elsif !is_upcase and did_remember
-          remember = fp
-        elsif is_upcase and !has_dash
-          names << [fp, :name]
-          stage = :name
-        elsif is_upcase and has_dash
-          if fp.ends_with? "-"
-            if is_last
-              names << [fp, :name]
-              stage = :name
+
+        # Mr. Mrs. Mevr. Mej.
+        if valid_prefix?(part) and stage == :prefix and not did_remember # if the part is a valid prefix, mark it as such
+          names = add_to_last_if :prefix, part, names
+
+        # Jr. Phd.
+        elsif valid_suffix?(part) # if the part is a valid suffix, mark it as such
+          names << [suffix_remember, :name] if did_remember
+          names = add_to_last_if :suffix, part, names
+        else
+          remember = nil
+
+          # Damen - van Valkenburg
+          if part == "-" # if the part is a dash
+            if last_stored = names.pop # retrieve the previous name part (if any) and store it with the dash
+              # for the part to come (remember)
+              remember = [last_stored[0], full_part].compact.join(" ")
             else
-              remember = fp
-            end
-          else
-            if fp.starts_with?("-") and last_stored = names.pop
-              fp = [last_stored[0], fp].compact.join(" ")
+              # if there is no previous part, just store the current part for later
+              remember = full_part
             end
-            dash_parts = fp.split "-"
-            if dash_parts.last.first == dash_parts.last.first.upcase
-              names << [fp, :name]
-              stage = :name
-            elsif is_last
-              names << [fp, :name]
-              stage = :name
+
+          # van de Sloot
+          elsif !is_upcase and !did_remember # intercalation words are never with a capital
+            names = add_to_last_if :intercalation, full_part, names
+            stage = :name
+
+          # Groen in het Woud
+          elsif !is_upcase and did_remember
+            remember = full_part
+
+          # Groen
+          elsif is_upcase and !has_dash
+            names << [full_part, :name]
+            stage = :name
+
+          # Groen-teboer
+          elsif is_upcase and has_dash
+            if full_part.ends_with? "-"
+              if is_last
+                names << [full_part, :name]
+                stage = :name
+              else
+                remember = full_part
+              end
             else
-              remember = fp
+              if full_part.starts_with?("-") and last_stored = names.pop
+                last_stored_name = last_stored[0].split(" ")
+                last_part = last_stored_name.pop
+                names << [last_stored_name.join(" "), last_stored[1]] unless last_stored_name.empty?
+                full_part = [last_part, full_part].compact.join(" ")
+              end
+              dash_parts = full_part.split "-"
+              if dash_parts.last[0,1] == dash_parts.last[0,1].upcase
+                names << [full_part, :name]
+                stage = :name
+              elsif is_last
+                names << [full_part, :name]
+                stage = :name
+              else
+                remember = full_part
+              end
             end
           end
         end
       end
+      names << [remember, :name] if remember
 
       new_name = {}
       stage = O[:prefix]
+      #puts names.inspect
 
       names.each_with_index do |value, index|
         name, name_type = *value
@@ -139,11 +173,11 @@ module PersonName
     end
 
     def self.valid_prefix? name_part
-      false
+      DEFAULT_PREFIXES.include? name_part
     end
 
     def self.valid_suffix? name_part
-      false
+      DEFAULT_SUFFIXES.include? name_part
     end
 
   end

data/spec/database.yml

@@ -6,7 +6,7 @@ mysql:
   adapter: mysql
   hostname: localhost
   username: root
-  password:
+  password: msdb3181
   database: has_person_name
 
 postgresql:

data/spec/person_name/has_person_name_spec.rb

@@ -61,11 +61,18 @@ describe "Has Person Name" do
       test_cases = [
         [nil, "Matthijs", nil, nil, "Groen", nil],
         [nil, "Matthijs", "Jacobus", nil, "Groen", nil],
-        [nil, "Frans", nil, "van der", "Sluis", nil],
+        [nil, "Frans", nil, "van der", "Sluis", "Phd."],
         [nil, "Maria", "Cornelia Hendrina", nil, "Damen-van Valenberg", nil],
-        [nil, "Maria", "Cornelia Hendrina", nil, "Damen - van Valenberg", nil],
+        ["Mevr.", "Maria", "Cornelia Hendrina", nil, "Damen - van Valenberg", nil],
         [nil, "Maria", "Cornelia Hendrina", nil, "Damen- van Valenberg", nil],
         [nil, "Maria", "Cornelia Hendrina", nil, "Damen -van Valenberg", nil],
+        [nil, "Maria", "Cornelia Hendrina", "van", nil, nil],
+        [nil, "- Maria", "Cornelia Hendrina", "van", "Dingen-", nil],
+        ["Mevr.", "Maria", "Mej. Cornelia Hendrina", "van", "Dingen -", nil],
+        [nil, "Maria", "Cornelia Hendrina", "van", "Dingen-van", nil],
+        [nil, "Maria", "Cornelia Hendrina", "van", "Groen-Teboer", nil],
+        [nil, "Maria", "Cornelia Hendrina", "van", "Groen-van Phd. Lala", "jr."],
+        [nil, "Maria", "Cornelia Hendrina", "van", "Groen-van", "Phd. jr."],
         [nil, "Dirk", "Jan", "van de", "Abeele", nil],
         [nil, "Yolanthe", "Cabau", "van", "Kasbergen", nil],
       ]
@@ -75,6 +82,7 @@ describe "Has Person Name" do
         @person = Person.new
         @person.name = string
 
+        #puts "in #{fields.inspect}"
         test_fields.each_with_index do |field, index|
           @person.name.send(field).should == fields[index]
         end
@@ -92,4 +100,17 @@ describe "Has Person Name" do
 
   end
 
+  describe "dynamic scopes" do
+    before(:each) do
+      clean_database!
+      @person = Person.new :name => "Matthijs Jacobus Groen"
+      @person.save
+    end
+
+    it "should have a working with_name scope" do
+      Person.find_by_name("Matthijs Jacobus Groen").should == @person
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: person-name
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Matthijs Groen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +02:00
+date: 2010-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: []