inkjet 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e023659caec2f6d13e4ccac3a5d9e4f43ad44dac
-  data.tar.gz: d60ea9025dc3235ab98070c75db4100e3d0c9945
+  metadata.gz: a4af8afe6467c85adc6846dad80f5358ae21af5a
+  data.tar.gz: c85db1efd92d913881477a74f08bea7e4afaca06
 SHA512:
-  metadata.gz: b30fb2d6a9da6fe1d8a6e0e0792ab7dcca1023db54b7b39de68519183b8451d17a8e20068fa9f6e6f1677902f8b4f6fecb5ac4330d0e5d4af350d9362954d46b
-  data.tar.gz: 19f0086725fafe39236dd71caa6257574fc809c9cac33e5ef0d6cc9cf9447be63be62dc26b6329be2e6145a9e462f1ad41871c3f9b8525f636d8803586227fd1
+  metadata.gz: 2e04395528ab2ac80135d801afb883c9d2df2d950d8dd99716bce72c816bc17b4cdc412fc1157dc75c20521695a4bcaa79a60179b127cda9cdaf80e2ee45a234
+  data.tar.gz: 3e65522f8da9e88f79cad5d568ea9ba061d6b36e01e9b8cddab01f739717b16c0751fbaacc7d35e314c4962bc967f8fd9a664f55f14cf7cbd68e028ebc126745

data/lib/inkjet/colors.rb

@@ -40,37 +40,37 @@ module Inkjet
         base.send :extend, self
       end
 
-      def colorize(color, str)
-        colorize!(color, str.clone)
+      def colorize(color, str, wrap=false)
+        colorize!(color, str.clone, wrap)
       end
       
-      def colorize!(color, str)
-        str.apply_inkjet_code!(Inkjet::Colors.foreground(color))
+      def colorize!(color, str, wrap=false)
+        str.apply_inkjet_code!(Inkjet::Colors.foreground(color), wrap)
       end
 
-      def colorize_background(color, str)
-        colorize_background!(color, str.clone)
+      def colorize_background(color, str, wrap=false)
+        colorize_background!(color, str.clone, wrap)
       end
       
-      def colorize_background!(color, str)
-        str.apply_inkjet_code!(Inkjet::Colors.background(color))
+      def colorize_background!(color, str, wrap=false)
+        str.apply_inkjet_code!(Inkjet::Colors.background(color), wrap)
       end
 
-      def colorize_with_background(fg_color, bg_color, str)
-        colorize_with_background!(fg_color, bg_color, str.clone)
+      def colorize_with_background(fg_color, bg_color, str, wrap=false)
+        colorize_with_background!(fg_color, bg_color, str.clone, wrap)
       end
       
-      def colorize_with_background!(fg_color, bg_color, str)
-        str.apply_inkjet_codes!(Inkjet::Colors.foreground(fg_color), Inkjet::Colors.background(bg_color))
+      def colorize_with_background!(fg_color, bg_color, str, wrap=false)
+        str.apply_inkjet_codes!([Inkjet::Colors.foreground(fg_color), Inkjet::Colors.background(bg_color)], wrap)
       end
 
       def method_missing(meth, *args)
         if meth.match(/\A(#{Inkjet::Colors::Colors.push("default").join("|")})_text(!?)\Z/)
-          colorize($1, args.map(&:to_s).join(" "))
+          colorize($1, *args)#.map(&:to_s).join(" "))
         elsif meth.match(/\A(#{Inkjet::Colors::Colors.push("default").join("|")})_(background|bg)(!?)\Z/)
-          colorize_background($1, args.map(&:to_s).join(" "))
+          colorize_background($1, *args)#.map(&:to_s).join(" "))
         elsif meth.match(/\A(#{Inkjet::Colors::Colors.push("default").join("|")})_(#{Inkjet::Colors::Colors.push("default").join("|")})(!?)\Z/)
-          colorize_with_background($1, $2, args.map(&:to_s).join(" "))
+          colorize_with_background($1, $2, *args)#.map(&:to_s).join(" "))
         else
           super
         end
@@ -80,11 +80,11 @@ module Inkjet
     module String
       def method_missing(meth, *args)
         if meth.match(/\A(#{Inkjet::Colors::Colors.join("|")})(!?)\Z/)
-          Inkjet.send("colorize#{$2}", $1, self)
+          Inkjet.send("colorize#{$2}", $1, self, *args)
         elsif meth.match(/\A(#{Inkjet::Colors::Colors.join("|")})_(background|bg)(!?)\Z/)
-          Inkjet.send("colorize_background#{$3}", $1, self)
+          Inkjet.send("colorize_background#{$3}", $1, self, *args)
         elsif meth.match(/\A(#{Inkjet::Colors::Colors.join("|")})_(#{Inkjet::Colors::Colors.join("|")})(!?)\Z/)
-          Inkjet.send("colorize_with_background#{$3}", $1, $2, self)
+          Inkjet.send("colorize_with_background#{$3}", $1, $2, self, *args)
         else
           super
         end

data/lib/inkjet/string.rb

@@ -1,85 +1,80 @@
 module Inkjet
   module String
-    def bold
-      clone.bold!
-    end
-
-    def bold!
-      apply_inkjet_code!(Inkjet::Bold)
+    
+    def method_missing(meth, *args)
+      if meth.match(/(#{%w(bold dim underline blink invert hidden).join('|')})(!?)/)
+        send "apply_inkjet_code#{$2}", "Inkjet::#{meth.capitalize}".constantize, *args
+      else
+        super
+      end
     end
-
-    def dim
-      clone.dim!
+    
+    def clean
+      clone.clean!
     end
 
-    def dim!
-      apply_inkjet_code!(Inkjet::Dim)
+    def clean!
+      gsub!(/\e\[[\d;]+m/, '')
     end
 
-    def underline
-      clone.underline!
+    def apply_inkjet_code(code, wrap=false)
+      clone.apply_inkjet_code!(code, wrap)
     end
 
-    def underline!
-      apply_inkjet_code!(Inkjet::Underline)
-    end
-    
-    def blink
-      clone.blink!
+    def apply_inkjet_code!(code, wrap=false)
+      if inkjet_strings.length > 0
+        replace(inkjet_strings.map do |istr|
+          if wrap # apply the code to every chunk within the string, formatted or unformatted
+            
+            (istr[0].empty? ? "" : apply_inkjet_codes_to_substring([code], istr[0])) +
+            apply_inkjet_codes_to_substring(istr[1].push(code), istr[2]) +
+            (istr[3].empty? ? "" : apply_inkjet_codes_to_substring([code], istr[3]))
+          
+          elsif !inkjet_codes.empty? && istr[1] == inkjet_codes # apply the code only to the formatted chunks of the 'primary string'
+            
+            istr[0] + apply_inkjet_codes_to_substring(istr[1].push(code), istr[2]) + istr[3]
+          
+          else # apply the code only to the unformatted chunks of the 'primary string' leaving any formatted substrings untouched
+            
+            (istr[0].empty? ? "" : apply_inkjet_codes_to_substring([code], istr[0])) +
+            apply_inkjet_codes_to_substring(istr[1], istr[2]) +
+            (istr[3].empty? ? "" : apply_inkjet_codes_to_substring([code], istr[3]))
+          
+          end
+        end.join(""))
+      else # wrap the entire unformatted string w/ the code
+        replace("\e[#{code}m#{self}\e[#{Inkjet::Close}m")
+      end
     end
 
-    def blink!
-      apply_inkjet_code!(Inkjet::Blink)
+    def apply_inkjet_codes(codes, wrap=false)
+      cloned = clone
+      codes.each { |code| cloned.apply_inkjet_code!(code, wrap) }
+      cloned
     end
     
-    def invert
-      clone.invert!
-    end
-
-    def invert!
-      apply_inkjet_code!(Inkjet::Invert)
+    def apply_inkjet_codes!(codes, wrap=false)
+      codes.each { |code| apply_inkjet_code!(code, wrap) }
+      self
     end
     
-    def hidden
-      clone.hidden!
-    end
+    protected
 
-    def hidden!
-      apply_inkjet_code!(Inkjet::Hidden)
-    end
-    
+    # return the first set of escape codes found in the string if no pre-string
     def inkjet_codes
-      match(/\e\[([\d;]+)m/)[1].split(";")
+      inkjet_strings.first[0].empty? ? inkjet_strings.first[1] : []
     rescue
-      Array.new
-    end
-
-    def apply_inkjet_code(code)
-      clone.apply_inkjet_code!(c)
+      []
     end
 
-    def apply_inkjet_code!(code)
-      inkjet_codes.length > 0 ? sub!(/\e\[([\d;]+)m/, "\e[#{inkjet_codes.push(code).join(";")}m") : replace("\e[#{code}m#{self}\e[0m")
-    end
-
-    def apply_inkjet_codes(*codes)
-      sclone = clone
-      codes.each { |code| sclone.apply_inkjet_code!(code) }
-      sclone
-    end
-    
-    def apply_inkjet_codes!(*codes)
-      codes.each { |code| apply_inkjet_code!(code) }
-      self
+    def inkjet_strings
+      scan(/([^\e]*)\e\[([\d;]+)m([^\e]*)\e\[#{Inkjet::Close}m([^\e]*)/).map { |pre,codes,str,post| [pre, codes.split(";"), str, post] } # TODO make a class for these
     end
 
-    def clean
-      clone.clean!
+    def apply_inkjet_codes_to_substring(codes, substr)
+      "\e[#{codes.join(";")}m#{substr}\e[#{Inkjet::Close}m"
     end
 
-    def clean!
-      gsub!(/\e\[[\d;]+m/, '')
-    end
   end
 end
 

data/lib/inkjet/version.rb

@@ -1,3 +1,3 @@
 module Inkjet
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkjet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport