terminal-layout 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283b397c0181527c2ded64f2865ebc71ede5aac9
-  data.tar.gz: adb2c56149641dcd9322173e512be240e1b6eca2
+  metadata.gz: 69a8c9c2bf542621e42aaefcd221d552b507a333
+  data.tar.gz: 029d171fa3c85d36edd1312e6a1ba45b1f77c4b6
 SHA512:
-  metadata.gz: 5b2b2c1eb88264c1084e879cdef933a5115edf521ca0288a3b3d594ce360a1155429847af7fe52a791d222c94885f89d75d3890e96477164f26f84880dbbd4f5
-  data.tar.gz: f28f73e2b8c7aa43bfab59f807103194096e621dee8e05a593ad1b99a1db9c4d2cfe24331f6f4897c960b522ea3b08e7524ccac4b77d574900a640493ff75314
+  metadata.gz: ad0a729599af474de93c42ef4b704b326514e7515e703a1377f583b6e018185de12c0bcb87fe26dd323bf1ddb70f2429c0f4f19230737d26aff56117cfd6ee73
+  data.tar.gz: 69d6c4ca7dac9d55941bf94404b780fdc07e8918363dc3b8b5b7124fcba9b82644d986ad249bffbd4d92526b56e807359da21ccf3a5f3135baa84ce530e0cbed

data/lib/ansi_string.rb

@@ -36,8 +36,14 @@ class ANSIString
     # convert numeric position to a range
     range = (range..range) if range.is_a?(Integer)
 
-    text = @without_ansi[range]
-    process_string replace_in_string(range, replacement_str)
+    range_begin = range.begin
+    range_end = range.exclude_end? ? range.end - 1 : range.end
+
+    range_begin = @without_ansi.length - range.begin.abs if range.begin < 0
+    range_end = @without_ansi.length - range.end.abs if range.end < 0
+
+    updated_string = replace_in_string(range_begin..range_end, replacement_str)
+    process_string raw_string_for(updated_string)
     self
   end
 
@@ -55,6 +61,11 @@ class ANSIString
     @without_ansi.rindex(*args)
   end
 
+  def replace(str)
+    process_string raw_string_for(str)
+    self
+  end
+
   def reverse
     str = @ansi_sequence_locations.reverse.map do |location|
       [location[:start_ansi_sequence], location[:text].reverse, location[:end_ansi_sequence]].join
@@ -88,6 +99,10 @@ class ANSIString
     raw.split(*args).map { |s| ANSIString.new(s) }
   end
 
+  def strip
+    ANSIString.new raw.strip
+  end
+
   def length
     @without_ansi.length
   end
@@ -218,7 +233,6 @@ class ANSIString
 
     range = range.begin..(range.end - 1) if range.exclude_end?
     str = ""
-
     @ansi_sequence_locations.each_with_index do |location, j|
       # If the given range encompasses part of the location, then we want to
       # include the whole location
@@ -255,9 +269,9 @@ class ANSIString
         str << [
           location[:start_ansi_sequence],
           location[:text][location[:begins_at]...(location[:begins_at]+start_index)],
-          location[:end_ansi_sequence],
-          replacement_str.to_s,
+          replacement_str,
           location[:text][end_index..-1],
+          location[:end_ansi_sequence],
         ].join
 
         if location=@ansi_sequence_locations[j+1]

data/spec/ansi_string_spec.rb

@@ -219,6 +219,20 @@ describe 'ANSIString' do
       expect(ansi_string).to eq ANSIString.new(blue("tZYXs is blue"))
     end
 
+    it "supports replacing with negative indexes at the front of the string" do
+      ansi_string[0..-1] = "abc"
+      expect(ansi_string).to eq ANSIString.new(blue("abc"))
+    end
+
+    it "supports replacing with negative indexes in the middle of the string" do
+      ansi_string = ANSIString.new(blue("abc"))
+      ansi_string[1..-2] = red("*")
+
+      # Do not preserve reset sequences (e.g. "\e[0m") when inserting/replacing.
+      # So no \e[0m before the replacement '*'
+      expect(ansi_string).to eq ANSIString.new("\e[34ma\e[31m*\e[0mc\e[0m")
+    end
+
     it "preserves coloring when part of the text with a String" do
       ansi_string[0..3] = "that"
       expect(ansi_string).to eq ANSIString.new(blue("that is blue"))
@@ -270,10 +284,43 @@ describe 'ANSIString' do
     context "replacing a substring that goes across ANSI sequence boundaries" do
       subject(:ansi_string){ ANSIString.new "this#{blue('that')}" }
 
-      it "successfully moves the boundaries" do
+      it "moves the boundaries when using positive indexes and a regular String replacement" do
         ansi_string[3..4] = yellow("SORRY")
         expect(ansi_string).to eq ANSIString.new("thi#{yellow('SORRY')}#{blue('hat')}")
       end
+
+      it "moves the boundaries when using positive indexes and an ANSIString replacement" do
+        ansi_string[3..4] = yellow("SORRY")
+        expect(ansi_string).to eq ANSIString.new("thi#{yellow('SORRY')}#{blue('hat')}")
+      end
+
+      it "moves the boundaries when using negatives indexes and a regular String replacement" do
+        ansi_string[-5..4] = "SORRY"
+        expect(ansi_string).to eq ANSIString.new("thiSORRY#{blue('hat')}")
+      end
+
+      it "moves the boundaries when using negatives indexes and an ANSIString replacement" do
+        ansi_string[-5..4] = yellow("SORRY")
+        expect(ansi_string).to eq ANSIString.new("thi#{yellow('SORRY')}#{blue('hat')}")
+      end
+    end
+
+    context "clearing the string" do
+      subject(:ansi_string){ ANSIString.new "this\nthat" }
+
+      it "clears the string" do
+        ansi_string[0..-1] = ""
+        expect(ansi_string).to eq ANSIString.new("")
+      end
+    end
+
+    context "expanding a string" do
+      subject(:ansi_string){ ANSIString.new "" }
+
+      it "expands the string" do
+        ansi_string[0..-1] = ANSIString.new(blue("HI"))
+        expect(ansi_string).to eq ANSIString.new(blue("HI"))
+      end
     end
 
     it "raises an error out of index" do
@@ -365,6 +412,15 @@ describe 'ANSIString' do
     end
   end
 
+  describe "#replace" do
+    it "replaces the contents of the current string with the new string" do
+      ansi_string = ANSIString.new("abc")
+      original_object_id = ansi_string.object_id
+      expect(ansi_string.replace("def")).to eq ANSIString.new("def")
+      expect(ansi_string.object_id).to eq(original_object_id)
+    end
+  end
+
   describe "#reverse" do
     it "reverses the string" do
       ansi_string = ANSIString.new("abc")
@@ -463,6 +519,14 @@ describe 'ANSIString' do
     end
   end
 
+  describe "#strip" do
+    it 'returns a copy of the string with leading and trailing whitespace removed' do
+      ansi_string = ANSIString.new " this is his #{blue('pig')} "
+      expect(ansi_string.strip).to eq ANSIString.new "this is his #{blue('pig')}"
+      expect(ansi_string).to eq ANSIString.new " this is his #{blue('pig')} "
+    end
+  end
+
   describe "#sub" do
     subject(:ansi_string){ ANSIString.new blue(string) }
     let(:string){ "this is blue" }

data/terminal-layout.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "terminal-layout"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Zach Dennis"]
   spec.email         = ["zach.dennis@gmail.com"]
   spec.summary       = %q{A terminal layout manager}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-layout
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo