person-name 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/person_name/has_person_name.rb

@@ -111,11 +111,13 @@ module PersonName
 
               existing_part_fields = []
               part_values = []
+              part_hash = {}
               PersonName::NameSplitter::NAME_PARTS.each do |name_part|
                 test_field = "#{name_base}_#{name_part}"
                 if attributes.has_key? test_field
                   existing_part_fields << test_field
                   part_values << attributes[test_field]
+                  part_hash[name_part.to_sym] = attributes[test_field]
                 else
                   part_values << send(test_field.to_sym)
                 end
@@ -123,8 +125,27 @@ module PersonName
               if part_values.compact.join(" ") == full
                 attributes.delete name_base
               else
-                existing_part_fields.each do |part_field|
-                  attributes.delete part_field
+                # try to use existing fields as editing values of full name
+                new_part_values = PersonName::NameSplitter.split(attributes[name_base], part_hash)
+                assignments_valid = nil
+
+                # test if there is no conflict
+                PersonName::NameSplitter::NAME_PARTS.each do |name_part|
+                  test_field = "#{name_base}_#{name_part}"
+                  if attributes.has_key? test_field
+                    attributes[test_field] = new_part_values[name_part.to_sym]
+                    assignments_valid = true if assignments_valid.nil?
+                  else
+                    assignments_valid = false unless new_part_values[name_part.to_sym].nil?
+                  end
+                end
+
+                if assignments_valid
+                  attributes.delete name_base
+                else
+                  existing_part_fields.each do |part_field|
+                    attributes.delete part_field
+                  end
                 end
               end
             end

data/spec/person_name/has_person_name_spec.rb

@@ -148,6 +148,30 @@ describe "Has Person Name" do
 
     end
 
+    it "should use the individual fields as edit post attributes match almost" do
+      @person = NamePerson.new
+      @person.attributes = {
+              :name => "Yolanthe Truuske Cabau van Kasbergen",
+              :name_first_name => "Yolanthe",
+              :name_middle_name => nil,
+              :name_last_name => "Cabau van Kasbergen"
+      }
+      @person.name.to_s.should == "Yolanthe Truuske Cabau van Kasbergen"
+      @person.name.last_name.should == "Cabau van Kasbergen"
+
+    end
+
+    it "should use the aggregated field if the posted attributes are not all available" do
+      @person = NamePerson.new
+      @person.attributes = {
+              :name => "Henk de Slager",
+              :name_first_name => "Henk",
+              :name_last_name => "Zanger"
+      }
+      @person.name.to_s.should == "Henk de Slager"
+      @person.name.full_last_name.should == "de Slager"
+
+    end
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: person-name
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Matthijs Groen