acts_as_human 2.0.2 → 2.0.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 [name of plugin creator]
+Copyright (c) 2009 [Brent Greeff]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/acts_as_human/instance_methods.rb

@@ -15,13 +15,21 @@ module ActsAs
         self.first_name = names_array.first
         return if names_array.size < 2
         
-        self.last_name = names_array.last
+        self.last_name = get_last_name(names_array)
         
         assign_middle_names(names_array)
       end
       
       private
       
+      def get_last_name(names_array)
+        if names_array.size > 2 and names_array[-2].eql? 'Mc'
+          surname = names_array.pop
+          names_array << "#{names_array.pop} #{surname}"
+        end
+        names_array.last
+      end
+      
       def assign_middle_names(names_array)
         if names_array.size > 2
           self.middle_names = get_middle_names(names_array)

data/test/acts_as_human_test.rb

@@ -10,7 +10,7 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     acts_as_human :require_last_name => false
   end
   
-  def test_should_require_a_first_name
+  test "should require a first name" do
     user = create_user
     user.first_name = ''
     
@@ -18,26 +18,26 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     assert_equal 'first name is required', user.errors[:first_name]
   end
   
-  def test_should_have_first_name_that_is_less_than_40_characters
+  test "should have a first name that is less than 40 characters" do
     user = User.new(:first_name => 'aaaaabbbbbcccccdddddeeeeefffffggggghhhhhi')
     
     deny user.valid?
     assert_equal 'first name is too long (max 40 characters)', user.errors[:first_name]
   end
   
-  def test_should_require_a_last_name
+  test "should require a last name" do
     user = User.new(:first_name => 'Brent')
     
     deny user.valid?
     assert_equal 'last name is required', user.errors[:last_name]
   end
   
-  def test_should_not_require_a_last_name_if_not_required
+  test "should not require a last name if it is not required" do
     someone_else = Customer.new(:first_name => 'Brent')
     assert someone_else.valid?
   end
   
-  def test_should_have_last_name_that_is_less_than_40_characters
+  test "should have a last name that is less than 40 characters" do
     user = create_user
     user.last_name = 'aaaaabbbbbcccccdddddeeeeefffffggggghhhhhi'
     
@@ -45,31 +45,35 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     assert_equal 'last name is too long (max 40 characters)', user.errors[:last_name]
   end
   
-  def test_should_have_a_last_name_when_assigned_through_full_name
+  test "should have a last name when assigned through full name" do
     user = User.new(:full_name => 'Brent')
     
     deny user.valid?
     assert_equal 'last name is required', user.errors[:last_name]
   end
   
-  def test_should_have_full_name_composed_of_first_and_last_name
+  test "should have a full name composed of first and last names" do
     user = User.new(:first_name => 'Brent', :last_name => 'Greeff')
     assert_equal 'Brent Greeff', user.full_name
   end
   
-  def test_should_have_full_name_composed_of_first_middle_and_last_name
-    user = User.new(:first_name => 'Brent', :middle_names => 'Middle Names', :last_name => 'Greeff')
+  test "should have a full name composed of first middle and last names" do
+    user = User.new(
+      :first_name => 'Brent',
+      :middle_names => 'Middle Names',
+      :last_name => 'Greeff'
+    )
     assert_equal 'Brent Middle Names Greeff', user.full_name
   end
   
-  def test_should_assign_first_and_last_name_when_assigning_to_full_name
+  test "should assign first and last name when assigning to full name" do
     user = User.new(:full_name => 'Brent Greeff')
     
     assert_equal 'Brent', user.first_name
     assert_equal 'Greeff', user.last_name
   end
   
-  def test_should_assign_first_last_and_middle_names_when_assigning_to_full_name
+  test "should assign first last and middle names when assigning to full name" do
     user = User.new(:full_name => 'Brent Middle Names Greeff')
     
     assert_equal 'Brent', user.first_name
@@ -77,7 +81,7 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     assert_equal 'Greeff', user.last_name
   end
   
-  def test_should_have_middle_names_that_are_less_than_40_characters
+  test "should have middle names that are less than 40 characters" do
     user = create_user
     user.middle_names = 'aaaaabbbbbcccccdddddeeeeefffffggggghhhhhi'
     
@@ -85,12 +89,12 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     assert_equal 'middle names are too long (max 40 characters)', user.errors[:middle_names]
   end
   
-  def test_should_have_a_empty_full_name_when_user_is_new
+  test "should have an empty full name when user is new" do
     user = User.new
     assert_equal '', user.full_name
   end
   
-  def test_should_not_allow_non_name_like_characters
+  test "should not allow non name like characters" do
     user = User.new(:full_name => "<Brent> Middle >< Names Gre&eff")
     
     deny user.valid?
@@ -99,6 +103,22 @@ class ActsAsHumanTest < ActiveSupport::TestCase
     assert_equal 'some characters in your name are not allowed', user.errors[:middle_names]
   end
   
+  test "should split up scottish names correctly" do
+    user = User.new(:full_name => "Ewan Mc Greggor")
+    
+    assert_equal 'Ewan', user.first_name
+    assert_equal 'Mc Greggor', user.last_name
+    assert_nil user.middle_names
+  end
+  
+  test "should split up scottish names with middle names correctly" do
+    user = User.new(:full_name => "Jade Frances Roseanne Mc Cracken")
+    
+    assert_equal 'Jade', user.first_name
+    assert_equal 'Mc Cracken', user.last_name
+    assert_equal 'Frances Roseanne', user.middle_names
+  end
+  
   private
   
   def create_user(options={})
@@ -122,5 +142,4 @@ class ActsAsHumanTest < ActiveSupport::TestCase
   def deny(expected_to_be_false, message = '')
     assert ! expected_to_be_false, message
   end
-  
 end

data/test/schema.rb

@@ -11,5 +11,4 @@ ActiveRecord::Schema.define(:version => 20090628014113) do
     t.string   "middle_names"
     t.string   "last_name"
   end
-  
 end

data/test/test_helper.rb

@@ -3,15 +3,27 @@ require 'active_support'
 require 'active_support/test_case'
 require 'test/unit'
 
-ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
+require 'active_record'
 
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
+CurrentDir = File.expand_path(File.dirname(__FILE__))
 
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection(config['test'])
+# log_path = File.join(CurrentDir, "debug.log")
+# ActiveRecord::Base.logger = Logger.new(log_path)
 
-load(File.dirname(__FILE__) + "/schema.rb")
+def load_db_config
+  database_yml = File.join(CurrentDir, 'database.yml')
+  config = YAML::load(IO.read(database_yml))
+  config['test']
+end
 
-require File.dirname(__FILE__) + '/../rails/init.rb'
+ActiveRecord::Base.establish_connection(load_db_config)
+load(File.join(CurrentDir, "schema.rb"))
+
+$: << (File.join(CurrentDir, "..", "lib"))
+
+begin
+  require 'redgreen' unless ENV['TM_MODE']
+rescue LoadError
+end
+
+require 'acts_as_human.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_human
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Brent Greeff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +01:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: []