lib/whirled_peas/settings/border.rb in whirled_peas-0.6.0 vs lib/whirled_peas/settings/border.rb in whirled_peas-0.7.0

@@ -32,24 +32,24 @@
           '║', '╬', '═',
           '║', '╣',
           '╚', '═', '╩', '╝'
         )
 
+        DEFAULT = BOLD
+
         def self.validate!(style)
-          return unless style
+          return if style.nil?
+          return style if style.is_a?(Border::Style)
           if style.is_a?(Symbol)
-            error_message = "Unsupported border style: #{style}"
-            begin
-              style = self.const_get(style.upcase)
-              raise ArgumentError, error_message unless style.is_a?(Style)
-              style
-            rescue NameError
-              raise ArgumentError, error_message
-            end
-          else
-            style
+            style_class = self.const_get(style.upcase)
+            return style_class if style_class.is_a?(Border::Style)
           end
+          error_message = "Unsupported border style: #{style.inspect}"
+          raise ArgumentError, error_message
+        rescue NameError
+          error_message = "Unsupported border style: #{style.inspect}"
+          raise ArgumentError, error_message
         end
       end
 
       attr_writer :left, :top, :right, :bottom, :inner_horiz, :inner_vert
 
@@ -80,22 +80,22 @@
       def outer?
         left? || top? || right? || bottom?
       end
 
       def style
-        @style || Styles::BOLD
+        @style || Styles::DEFAULT
       end
 
       def style=(val)
         @style = Styles.validate!(val)
       end
 
-      def color
-        @color || TextColor::WHITE
-      end
-
       def color=(val)
         @color = TextColor.validate!(val)
+      end
+
+      def color
+        @color || TextColor::DEFAULT
       end
     end
   end
 end