highline 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0322744bd14cd2bc95f5c9227aa0cd43e16754b7
-  data.tar.gz: d0238fa92ad538d5ca8c6f00016fd268ebb850e9
+  metadata.gz: 43fdbf38f854f17b3b9f288592f25e655797102f
+  data.tar.gz: e48e95dea0924528f717586996c71710f7d1c32b
 SHA512:
-  metadata.gz: b7a445bf62871bb1d0bfdf6dba0ad055cd6ea4f7e612315f09bfae40c996ae84e881d73b034cd3c374c97e02201045d52b4c564c5853b475b342756837a4ae75
-  data.tar.gz: 34eef4f28c8392acb102d750d1b6df52f26f4a9fd61de9a8f5ad671abe369824a68d02319188806de7b59013224e48a2453c34d8fd24d7832a96a3d3e9364236
+  metadata.gz: ceefae17b4b0f5dc14a3f2c3962513ba7f60b2c69394521985c5f511826d5489b074bd327b51f6a04d3febfa1e7210f33562532b5e81e5623e361ab4fbe61c8a
+  data.tar.gz: 6e62ef0f4382ec92f5ebc5177ccff83aea0d3ff7935402fae11212bae95f6b30aebbed898d001ca99523bda04cfb61c452bdc552c212446e470182f6ef52c6df

data/Changelog.md

@@ -2,6 +2,9 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+### 1.7.8 / 2015-10-09
+* Fix some issues when paginating. (Nick Carboni (@carbonin) and Abinoam P. Marques Jr. (@abinoam), #168, PRs #169 #170)
+
 ### 1.7.7 / 2015-09-22
 * Make HighLine::Question coerce its question argument into a String. (@97-109-107 and Abinoam P. Marques Jr. (@abinoam), #159, PR #160)
 

data/lib/highline.rb

@@ -989,12 +989,12 @@ class HighLine
   # instead.  This is to support any special handling for the final sequence.
   #
   def page_print( output )
-    lines = output.scan(/[^\n]*\n?/)
+    lines = output.lines.to_a
     while lines.size > @page_at
       @output.puts lines.slice!(0...@page_at).join
       @output.puts
       # Return last line if user wants to abort paging
-      return (["...\n"] + lines.slice(-2,1)).join unless continue_paging?
+      return "...\n#{lines.last}" unless continue_paging?
     end
     return lines.join
   end

data/lib/highline/version.rb

@@ -1,4 +1,4 @@
 class HighLine
   # The version of the installed library.
-  VERSION = "1.7.7".freeze
+  VERSION = "1.7.8".freeze
 end

data/test/tc_highline.rb

@@ -977,6 +977,48 @@ class TestHighLine < Test::Unit::TestCase
                   (45..50).map { |n| "This is line #{n}.\n"}.join,
                   @output.string )
   end
+
+  def test_statement_lines_count_equal_to_page_at_shouldnt_paginate
+    @terminal.page_at = 6
+
+    @input << "\n"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\n"
+
+    @terminal.say(list)
+    assert_equal(list, @output.string)
+  end
+
+  def test_statement_with_one_line_bigger_than_page_at_should_paginate
+    @terminal.page_at = 6
+
+    @input << "\n"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\ng\n"
+
+    paginated =
+      "a\nb\nc\nd\ne\nf\n" \
+      "\n-- press enter/return to continue or q to stop -- \n\n" \
+      "g\n"
+
+    @terminal.say(list)
+    assert_equal(paginated, @output.string)
+  end
+
+  def test_quiting_paging_shouldnt_raise
+    # See https://github.com/JEG2/highline/issues/168
+
+    @terminal.page_at = 6
+
+    @input << "q"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\n"
+
+    assert_nothing_raised { @terminal.say(list) }
+  end
   
   def test_range_requirements
     @input << "112\n-541\n28\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_statistics