fun_with_string_colors 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZhNjlhZDM0MmFkYTg1NjhmOGU3MmI0NjcyMDVlNTY0ZjlmZWRjMg==
+    MjE1MjhiZTZlNDg2MGNmOWQxNGIzYTA2ZTcwOWM2ODZkM2Q0NGZjNw==
   data.tar.gz: !binary |-
-    OWNjZDhiZWQ2MWFjYmY1MDk2YmJjOGVkMmYxOWEzNDE2ZmRkOTIyZQ==
+    YWRiMDU5MzI1OWYzZjNlOTJlODI2NjcwNGNkYWI5YmY0NjY1NTk4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZDI5NzJiNmU2M2E2ZTgyMWU2NGY4ZTFhMzE4YzY1OWZkNTk2OGU1ZDkzOTc5
-    MmJjZmQyNjg0NzljYjNkNWZhZGQzMDJhMWI2NGE1ZWQ0OGM5ZDIzM2M0NzE2
-    M2JmNTMzMTFiNmYwMmJkMjE1OWJkMTk4MDFmZjhhNjc0MGRlNWQ=
+    YmNlNTQyYjA1ZDc2NTAxODZlN2EzNWMzMDI2NTUwN2MyODVkNTk2ZTFiM2Ix
+    YTc2ZjA2MzY5YWRkNzM4MjRlYTNmNzg3ODBiOTYyZTU4ZGE1MGRlODc4MTAz
+    MmExYjg4ZDdmZGMwYTg2ZmZiZjgxMGRlMDM5Y2I1MzRlMGUxNTY=
   data.tar.gz: !binary |-
-    Njg3OGM2ZmZlZmRiOGI3Nzc5OTU1ZDc4ZTI4MDhlZTYwMDExYzVjNWI5MjQ3
-    OTFhYmQxODJmY2Y1NmQ2MTQxMGQ2YzE0M2FhY2Y5MWU1YmIwNDQ4MDE4MzUz
-    ZDI1NzZmN2Y2M2Y2MjcwMTJiYmZhMTAwNjBlOWMwZmJkMjNiNDU=
+    NTAzNTQ2MjBiZWQ3MzU2ODcyNDFlOGM0YWE3ZDM3MDgzOTQyMzE0MGY5MWIz
+    ZTc1M2RmYWZmZTU3Y2M4ZTZjNGIzYzEwMWUwNWMzMDlhNzI1MWNkNDk1ZTdi
+    ODU2NjA4MGUxOGJhMTJlYmRkNDkzNzkxN2QwMWZhYjc3ZWI1NTY=

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/fun_with/string_colors/string_paint_inclusions.rb

@@ -50,33 +50,15 @@ module FunWith
           highlight_regex = colors.first.is_a?(Regexp) ? colors.shift : nil
         
           rval = self.dup
-          prependers   = []
-          terminations = []
-          
-          for color in colors
-            case color
-            when :reset, :unpaint
-              regex = /\e\[\d+m/
-              rval = rval.gsub( regex, '' )
-              prependers = []
-              terminations = []
-            when Symbol
-              if ANSI_COLORS[color]
-                prependers << "\e[#{ANSI_COLORS[color]}m"
-                terminations << (ANSI_COLOR_TERMINATORS[color] || ANSI_COLOR_TERMINATORS[:color])
-              end
-            when /^\d+$/, Integer # you can give numbers/number strings directly
-              prependers << "\e[#{ANSI_COLORS[color] || color}m"
-              terminations << (ANSI_COLOR_TERMINATORS[color.to_i] || ANSI_COLOR_TERMINATORS[:color])
-            end
-          end
+          prependers, terminations, reset = self.fwsc_map_color_args_to_prepend_and_terminate( colors )
+          rval = rval.gsub( /\e\[\d+m/, '' ) if reset
           
           if highlight_regex.nil?
             #puts "prependers #{prependers.inspect}"
             #puts "terminations #{terminations.inspect}"
-            prependers.join + rval + terminations.join
+            prependers.uniq.join + rval + terminations.uniq.join
           else
-            rval.gsub( /(#{highlight_regex})/, prependers.join + "\\1" + terminations.join )
+            rval.gsub( /(#{highlight_regex})/, prependers.uniq.join + "\\1" + terminations.uniq.join )
           end
         else
           self.dup   # Since it returns a duplicate of the original when in paint mode, this is more consistent behavior
@@ -86,6 +68,32 @@ module FunWith
       def paint?
         self.class.colorize?
       end
+      
+      protected
+      def fwsc_map_color_args_to_prepend_and_terminate( colors )
+        prependers = []
+        terminations = []
+        reset = false
+        
+        for color in colors
+          case color
+          when :reset, :unpaint
+            prependers = []
+            terminations = []
+            reset = true
+          when Symbol
+            if ANSI_COLORS[color]
+              prependers << "\e[#{ANSI_COLORS[color]}m"
+              terminations << (ANSI_COLOR_TERMINATORS[color] || ANSI_COLOR_TERMINATORS[:color])
+            end
+          when /^\d+$/, Integer # you can give numbers/number strings directly
+            prependers << "\e[#{ANSI_COLORS[color] || color}m"
+            terminations << (ANSI_COLOR_TERMINATORS[color.to_i] || ANSI_COLOR_TERMINATORS[:color])
+          end
+        end
+        
+        [prependers, terminations, reset]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fun_with_string_colors
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Bryce Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fun_with_testing