lovely_rufus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c92b0710902ad7b5974120c3259511bca506b9
-  data.tar.gz: bacdd2b6ed4093103944c30e464defca9c88fd67
+  metadata.gz: c850fd5f62d6480194b4a54e2bb82c5a8916935b
+  data.tar.gz: fdcbe2f05741001b4e8aafba0daa5f6c8fc77ed7
 SHA512:
-  metadata.gz: 23d1be28b58049eb916bb07390880e487e81c960ad3315212de2fe396e225f695ed9f2489c3254d55efac807f88d73521d791c800b9b4211754b8d5f29978f86
-  data.tar.gz: 4258e4a7562d74568f4c1fa2a26df4cddf9d2b93691f8582418e931ccd8904be057ba7721e5a6992fefb7f994cb897ea5091df89f655b3b60b82b965efa3cd49
+  metadata.gz: 3f3807f7c18e4c21d3cf0754f5655fd653bb0ff86d30e85aa749a051d9ac67e38de5377f0ebc37bf54f5fd0effe3b32fbbb6d85391cd0be8edb3f5a19f2c7e4e
+  data.tar.gz: 23eb91f197f1f8e78951d973a8bbd73739c92abeb01da409a096496585fbb3889061375dfcc3146d3c736cf8df8a1b2cd128312192ad4f0f69e34fa4b9924150

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lovely_rufus (0.1.2)
+    lovely_rufus (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -14,16 +14,16 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     dependor (1.0.1)
-    ffi (1.9.3)
+    ffi (1.9.6)
     hitimes (1.2.2)
-    listen (2.7.9)
+    listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    minitest (5.4.1)
+    minitest (5.4.3)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    parser (2.2.0.pre.4)
+    parser (2.2.0.pre.7)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -32,24 +32,24 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.3.8)
+    reek (1.4.0)
       rainbow (>= 1.99, < 3.0)
       ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (~> 3.3)
-      sexp_processor
+      ruby_parser (>= 3.5.0, < 4.0)
+      sexp_processor (~> 4.4)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.26.0)
+    rubocop (0.27.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.4, < 3.0)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
-    ruby2ruby (2.1.2)
+    ruby-progressbar (1.7.0)
+    ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.6.2)
+    ruby_parser (3.6.3)
       sexp_processor (~> 4.1)
     sexp_processor (4.4.4)
     slop (3.6.0)
@@ -67,4 +67,4 @@ DEPENDENCIES
   rake (~> 10.1)
   reek (~> 1.3)
   rerun (~> 0.10.0)
-  rubocop (~> 0.26.0)
+  rubocop (~> 0.27.0)

data/config/reek.yml

@@ -1,22 +1,23 @@
 DuplicateMethodCall:
   exclude:
     - LovelyRufus::BasicWrapper#call
-    - LovelyRufus::HangoutWrapper#rewrapped
 
 FeatureEnvy:
   exclude:
     - LovelyRufus::BasicWrapper#call
-    - LovelyRufus::HangoutWrapper#hangout_line
     - LovelyRufus::OneLetterGluer#call
     - LovelyRufus::QuoteStripper#quote
+    # https://github.com/troessner/reek/issues/53
+    - LovelyRufus::HangoutWrapper::HangoutFinder
 
 IrresponsibleModule:
   enabled: false
 
-NestedIterators:
-  exclude:
-    - LovelyRufus#initialize
-
 UncommunicativeVariableName:
   exclude:
     - LovelyRufus::HangoutWrapper#hangout_line
+
+UtilityFunction:
+  exclude:
+    # https://github.com/troessner/reek/issues/27
+    - LovelyRufus::HangoutWrapper::HangoutFinder

data/lib/lovely_rufus.rb

@@ -2,8 +2,8 @@ module LovelyRufus
   NBSP   = "\u00A0"
   QUOTES = /^([>\/#])(\1| )*/
 
-  def self.wrap(text, width: 72)
-    TextWrapper.wrap(text, width: width)
+  def self.wrap(text, text_wrapper: TextWrapper, width: 72)
+    text_wrapper.wrap(text, width: width)
   end
 end
 

data/lib/lovely_rufus/hangout_wrapper.rb

@@ -5,9 +5,9 @@ require_relative 'wrap'
 module LovelyRufus
   class HangoutWrapper < Layer
     def call(wrap)
-      @wrap  = wrap
-      final  = hangout_line ? rewrapped : wrap.text
-      next_layer.call(Wrap[final, width: wrap.width])
+      @wrap = wrap
+      final = hangout_line ? rewrapped : wrap
+      next_layer.call(final)
     end
 
     attr_reader :wrap
@@ -15,24 +15,42 @@ module LovelyRufus
 
     private
 
+    module HangoutFinder
+      module_function
+
+      def between?(line_a, line_b)
+        last_space = line_a.chomp.rindex(/\p{space}/)
+        last_space and last_space >= line_b.chomp.size
+      end
+
+      def reverse?(line_a, line_b)
+        cut = line_a.chomp.rindex(/\p{space}/)
+        a_after = line_a[0...cut] + "\n"
+        b_after = line_a[(cut + 1)..-1] + line_b
+        b_after.chomp.rindex(/\p{space}/) > a_after.size
+      end
+    end
+
     def hangout_line
-      lines.each_cons(2) do |a, b|
-        return a if a[/\p{space}/] and a.rindex(/\p{space}/) >= b.size
-        unless b == lines.last
-          return b if b[/\p{space}/] and b.rindex(/\p{space}/) >= a.size
+      lines.each_cons(2).with_index do |(a, b), i|
+        if HangoutFinder.between?(a, b)
+          return a unless i == lines.size - 2 and HangoutFinder.reverse?(a, b)
         end
       end
     end
 
     def lines
-      @lines ||= wrap.text.lines.map(&:chomp)
+      @lines ||= wrap.lines
     end
 
     def rewrapped
-      hangout_line << NBSP
-      unfolded = lines.join(' ').gsub("#{NBSP} ", NBSP)
-      wrapped  = BasicWrapper.new.call(Wrap[unfolded, width: wrap.width]).text
-      HangoutWrapper.new.call(Wrap[wrapped, width: wrap.width]).text
+      hangout_line[-1] = NBSP
+      HangoutWrapper.new.call(wrapped)
+    end
+
+    def wrapped
+      unfolded = Wrap[lines.join, width: wrap.width]
+      BasicWrapper.new.call(unfolded)
     end
   end
 end

data/lib/lovely_rufus/quote_stripper.rb

@@ -6,7 +6,7 @@ module LovelyRufus
     def call(wrap)
       @wrap   = wrap
       wrapped = next_layer.call(stripped_wrap)
-      quoted  = wrapped.text.lines.map { |line| fixed_quote + line }.join
+      quoted  = wrapped.lines.map { |line| fixed_quote + line }.join
       Wrap[quoted, width: wrapped.width + fixed_quote.size]
     end
 
@@ -20,12 +20,12 @@ module LovelyRufus
     end
 
     def quote
-      starts = wrap.text.lines.map { |line| line[QUOTES] }.uniq
+      starts = wrap.lines.map { |line| line[QUOTES] }.uniq
       starts.size == 1 ? starts.first || '' : ''
     end
 
     def stripped_wrap
-      stripped_text = wrap.text.lines.map { |line| line[quote.size..-1] }.join
+      stripped_text = wrap.lines.map { |line| line[quote.size..-1] }.join
       Wrap[stripped_text, width: wrap.width - fixed_quote.size]
     end
   end

data/lib/lovely_rufus/settings.rb

@@ -4,11 +4,15 @@ module LovelyRufus
   Settings = Struct.new(:width) do
     def initialize(args)
       self.width = 72
-      OptionParser.new do |opts|
-        opts.on('-w', '--width=WIDTH', Integer, 'Wrapping width') do |width|
-          self.width = width
-        end
-      end.parse! args
+      OptionParser.new(&method(:parse)).parse! args
+    end
+
+    private
+
+    def parse(opts)
+      opts.on('-w', '--width=WIDTH', Integer, 'Wrapping width') do |width|
+        self.width = width
+      end
     end
   end
 end

data/lib/lovely_rufus/wrap.rb

@@ -1,7 +1,13 @@
+require 'forwardable'
+
 module LovelyRufus
   Wrap = Struct.new(:text, :width) do
+    extend Forwardable
+
     def initialize(text = '', width: 72)
       super text, width
     end
+
+    delegate lines: :text
   end
 end

data/lovely_rufus.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = 'AGPL-3.0'
   gem.name        = 'lovely_rufus'
   gem.summary     = 'lovely_rufus: text wrapper'
-  gem.version     = '0.2.0'
+  gem.version     = '0.2.1'
 
   gem.files       = `git ls-files -z`.split("\0")
   gem.executables = gem.files.grep(/^bin\//).map { |path| File.basename(path) }
@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake',           '~> 10.1'
   gem.add_development_dependency 'reek',           '~> 1.3'
   gem.add_development_dependency 'rerun',          '~> 0.10.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.26.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.27.0'
 end

data/spec/lovely_rufus/cli_wrapper_spec.rb

@@ -16,15 +16,11 @@ module LovelyRufus
       end
 
       it 'accepts the desired width and passes it to TextWrapper' do
-        wrap = <<-end.dedent
-          all right: stop,
-          collaborate and listen
-        end
-        stub(text_wrapper).wrap(text, width: 22) { wrap }
-        lambda do
+        capture_io do
           stream = StringIO.new(text)
           CLIWrapper.new(%w(--width=22), text_wrapper: text_wrapper).run stream
-        end.must_output wrap
+        end
+        text_wrapper.must_have_received :wrap, [text, { width: 22 }]
       end
     end
   end

data/spec/lovely_rufus/hangout_wrapper_spec.rb

@@ -25,6 +25,14 @@ module LovelyRufus
         wrapped = HangoutWrapper.new(layer).call(Wrap["I O\nU", width: 4])
         wrapped.must_equal final
       end
+
+      it 'doesn’t let the last line to hang out' do
+        text = <<-end.dedent
+          Just found out the Finnish term for grammar Nazi is pilkunnussija.
+          Direct translation: comma fucker. You’re welcome.
+        end
+        HangoutWrapper.new.call(Wrap[text, width: 76]).text.must_equal text
+      end
     end
   end
 end

data/spec/lovely_rufus/wrap_spec.rb

@@ -15,6 +15,14 @@ module LovelyRufus
       end
     end
 
+    describe '#lines' do
+      it 'accesses the lines of the text' do
+        Wrap["all right: stop,\ncollaborate and listen\n"].lines.must_equal [
+          "all right: stop,\n", "collaborate and listen\n"
+        ]
+      end
+    end
+
     describe '#text' do
       it 'accesses the text of the Wrap' do
         Wrap['Ice Ice Baby', width: 7].text.must_equal 'Ice Ice Baby'

data/spec/lovely_rufus_spec.rb

@@ -1,51 +1,19 @@
-require 'yaml'
 require_relative 'spec_helper'
 require_relative '../lib/lovely_rufus'
 
 describe LovelyRufus do
   describe '.wrap' do
-    it 'wraps the passed String to 72 characters by default' do
-      short = 'all right: stop, collaborate and listen'
-      long  = short + ' – Ice is back with a brand new invention'
-      wrap  = <<-end.dedent
-        all right: stop, collaborate and listen
-        – Ice is back with a brand new invention
-      end
-      LovelyRufus.wrap(short).must_equal "#{short}\n"
-      LovelyRufus.wrap(long).must_equal wrap
-    end
+    let(:text_wrapper) { fake(:text_wrapper, as: :class) }
 
-    it 'wraps the passed String to the given number of characters' do
-      input = 'something grabs a hold of me tightly; ' \
-        'flow like a harpoon – daily and nightly'
-      LovelyRufus.wrap(input, width: 40).must_equal <<-end.dedent
-        something grabs a hold of me tightly;
-        flow like a harpoon – daily and nightly
-      end
-      LovelyRufus.wrap(input, width: 21).must_equal <<-end.dedent
-        something grabs
-        a hold of me tightly;
-        flow like a harpoon
-        – daily and nightly
-      end
+    it 'offloads the wrapping to TextWrapper' do
+      stub(text_wrapper).wrap('Ice Ice Baby', width: 7) { "Ice Ice\nBaby\n" }
+      LovelyRufus.wrap('Ice Ice Baby', text_wrapper: text_wrapper, width: 7)
+        .must_equal "Ice Ice\nBaby\n"
     end
 
-    it 'rewraps a String from zero' do
-      broken = <<-end.dedent
-        turn off
-        the lights and I’ll glow
-      end
-      wrapped = LovelyRufus.wrap(broken)
-      wrapped.must_equal "turn off the lights and I’ll glow\n"
-    end
-
-    it 'supports all the example use-cases' do
-      path = File.expand_path('lovely_rufus/text_wrapper_spec.yml', __dir__)
-      YAML.load_file(path).each do |spec|
-        width = spec.fetch('width') { 72 }
-        wrap  = "#{spec['output']}\n"
-        LovelyRufus.wrap(spec['input'], width: width).must_equal wrap
-      end
+    it 'wraps the passed String to 72 characters by default' do
+      LovelyRufus.wrap 'Ice Ice Baby', text_wrapper: text_wrapper
+      text_wrapper.must_have_received :wrap, ['Ice Ice Baby', { width: 72 }]
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,6 @@ Bogus.configure { |config| config.search_modules << LovelyRufus }
 
 class String
   def dedent
-    gsub(/^#{self[/\A\s*/]}/, '')
+    gsub(/^#{scan(/^ +/).min}/, '')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lovely_rufus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogus
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
 description: An executable and a Ruby library for wrapping paragraphs of text.
 email: chastell@chastell.net
 executables: