full_name 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d922e261990297dd4fb0d185e0ff433cafb2898
-  data.tar.gz: 047931817f810b2619966608d669cb3a2c1b6f9b
+  metadata.gz: 380c6dcbcf7db77499747dd133ce3b8b3a8d34b1
+  data.tar.gz: 472518bf2649bae7e3bfb26d6a44ecd403a14fce
 SHA512:
-  metadata.gz: f3a6821683a2b84766169e7cf2622b8bcfb7885d65c7e1195ce7c7bf43c8ec7b19507a207292725d2b98f67580be0a354110c4de5b55e5465206d6af9279c025
-  data.tar.gz: 7d6e510e0dd9d69c46844a1ad7b9b89839b36f7296170f6a4c7fc58a8cd1ffea0cbbe0891f53806641b3ddf6ce5d2f98c2e92453d9c059e29a37b6923a155d0d
+  metadata.gz: 89ad8f9a5f3d88ddffed8318675e16a97594c3ab33787d5270a202d191f31e041195d1261e5dff0cd06dabadeef2e313e769115cd2d83a02792232b34f103929
+  data.tar.gz: f6ad1ab5c4b08e0fd133fa4430b3c0a52fda2e967859f16cbdaddda719b7dd6e72a5261ccac50455c09a061f5a1363e6ad1a331a8f2dee71cdef2739f984b9ae

data/lib/full_name.rb

@@ -1,29 +1,46 @@
 module FullName
+  LOCALES = [:en, :fr]
+
   def full_name locale = :en
-    if locale != :en and locale != :fr
-      return full_name(:en)
-    end
+    return full_name unless LOCALES.include? locale
 
-    if first_name and first_name.size > 0
-      if last_name and last_name.size > 0
-        case locale  
-          when :en then
-            full_name = [first_name.capitalize, last_name.capitalize].join(' ')
-          when :fr then
-            full_name = "#{last_name.upcase}, #{first_name.capitalize}"
-        end
-      
+    unless first_name.nil? or first_name.empty?
+      unless last_name.nil? or last_name.empty?
+        build_with_both locale     
       else
-        full_name = first_name.capitalize
+        build_with_firstname      
       end
     else
+      unless last_name.nil? or last_name.empty?
+        build_with_lastname locale       
+      else
+        ''     
+      end        
+    end
+  end
+
+  private 
+    def build_with_both locale
       case locale  
         when :en then
-          full_name = last_name.capitalize
+          [first_name.capitalize, last_name.capitalize].join(' ')
         when :fr then
-          full_name = last_name.upcase           
+          "#{last_name.upcase}, #{first_name.capitalize}"
       end
     end
-  end
+    
+    def build_with_firstname 
+      first_name.capitalize
+    end
+
+    def build_with_lastname locale
+      case locale  
+        when :en then
+          last_name.capitalize
+        when :fr then
+          last_name.upcase           
+      end
+    end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_name
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Benoit Gantaume