lovely_rufus 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c850fd5f62d6480194b4a54e2bb82c5a8916935b
-  data.tar.gz: fdcbe2f05741001b4e8aafba0daa5f6c8fc77ed7
+  metadata.gz: 1b3be99e51553764b5a5005a42751f9e635f6a12
+  data.tar.gz: e047b3674363d4c3a1a0b9bf3a879958bae57c8b
 SHA512:
-  metadata.gz: 3f3807f7c18e4c21d3cf0754f5655fd653bb0ff86d30e85aa749a051d9ac67e38de5377f0ebc37bf54f5fd0effe3b32fbbb6d85391cd0be8edb3f5a19f2c7e4e
-  data.tar.gz: 23eb91f197f1f8e78951d973a8bbd73739c92abeb01da409a096496585fbb3889061375dfcc3146d3c736cf8df8a1b2cd128312192ad4f0f69e34fa4b9924150
+  metadata.gz: 6247aac218976d4fba0dd11bdc85d22d33c746fed1ee7b11d8bf5556817d895992507d56e281503a376d1d8acf24ab0ab2d5bbabdf2a14a675b74a3aa9df71c6
+  data.tar.gz: 4ab4714a2b7a0a074792399234a4161552ddb2ee3036d44f7f2d83c5d00810809ff003d8920bdf7fe328a9647af7dbb1cd6c0fe3f8b4fa57355ca36cf9230d53

data/.rubocop.yml

@@ -1,15 +1,12 @@
-AndOr:
+Style/AndOr:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-FileName:
+Style/FileName:
   Exclude:
     - bin/lovely-rufus
 
-SingleLineBlockParams:
-  Enabled: false
-
-SingleSpaceBeforeFirstArg:
+Style/SingleLineBlockParams:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.1
+2.2

data/Gemfile.lock

@@ -1,60 +1,75 @@
 PATH
   remote: .
   specs:
-    lovely_rufus (0.2.1)
+    lovely_rufus (0.3.0)
+      private_attr (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    bogus (0.1.5)
+    bogus (0.1.6)
       dependor (>= 0.0.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     dependor (1.0.1)
+    diff-lcs (1.2.5)
+    equalizer (0.0.9)
     ffi (1.9.6)
     hitimes (1.2.2)
-    listen (2.8.0)
+    ice_nine (0.11.1)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    minitest (5.4.3)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    minitest (5.5.1)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    parser (2.2.0.pre.7)
+    parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    powerpack (0.1.0)
+    private_attr (1.0.0)
+    procto (0.0.2)
     rainbow (2.0.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.4.0)
-      rainbow (>= 1.99, < 3.0)
-      ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (>= 3.5.0, < 4.0)
-      sexp_processor (~> 4.4)
+    reek (2.0.0)
+      parser (~> 2.2)
+      rainbow (~> 2.0)
+      unparser (~> 0.2.2)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rubocop (0.27.1)
+    rubocop (0.29.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
-    ruby2ruby (2.1.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.6.3)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.4.4)
-    slop (3.6.0)
+    ruby-progressbar (1.7.1)
+    thread_safe (0.3.4)
     timers (4.0.1)
       hitimes
+    unparser (0.2.2)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
+      equalizer (~> 0.0.9)
+      parser (~> 2.2.0.2)
+      procto (~> 0.0.2)
 
 PLATFORMS
   ruby
@@ -65,6 +80,6 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-focus (~> 1.1)
   rake (~> 10.1)
-  reek (~> 1.3)
+  reek (~> 2.0)
   rerun (~> 0.10.0)
-  rubocop (~> 0.27.0)
+  rubocop (~> 0.29.0)

data/README.md

@@ -58,10 +58,10 @@ Currently, Lovely Rufus sports the following features:
 Name and history
 ----------------
 
-Lovely Rufus was created as a [Ruby Mendicant University](http://blog.majesticseacreature.com/tag/rubymendicant) project and is named after [a certain _Love Actually_ character](http://en.wikipedia.org/wiki/Love_Actually#Rufus) who’s [exceptionally good at wrapping](http://www.youtube.com/watch?v=W6E1wPwOaE4).
+Lovely Rufus was created as a [Ruby Mendicant University](http://blog.majesticseacreature.com/tag/rubymendicant) project and is named after [a certain _Love Actually_ character](http://en.wikipedia.org/wiki/Love_Actually#Rufus) who’s [exceptionally good at wrapping](https://www.youtube.com/watch?v=E3rB_qx0wRM).
 
 
 
 ---
 
-© MMX-MMXIV Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)
+© MMX-MMXV Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)

data/Rakefile

@@ -2,17 +2,16 @@ require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i(spec rubocop reek)
+task default: %i(test rubocop reek)
 
-Rake::TestTask.new(:spec) do |task|
-  task.test_files = FileList['spec/**/*_spec.rb']
-  task.warning    = true
+Rake::TestTask.new do |task|
+  task.pattern = 'test/**/*_test.rb'
+  task.warning = true
 end
 
 Reek::Rake::Task.new do |task|
-  task.config_files  = 'config/reek.yml'
+  task.config_file   = 'config/reek.yml'
   task.fail_on_error = false
-  task.reek_opts     = '--quiet'
 end
 
 RuboCop::RakeTask.new do |task|

data/bin/lovely-rufus

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/lovely_rufus'
+require_relative '../lib/lovely_rufus/cli_wrapper'
 
 LovelyRufus::CLIWrapper.new.run

data/config/reek.yml

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

data/lib/lovely_rufus.rb

@@ -1,11 +1,14 @@
+require 'private_attr'
+Class.include PrivateAttr
+
+require_relative 'lovely_rufus/text_wrapper'
+
 module LovelyRufus
-  NBSP   = "\u00A0"
-  QUOTES = /^([>\/#])(\1| )*/
+  NBSP = "\u00A0"
 
-  def self.wrap(text, text_wrapper: TextWrapper, width: 72)
+  module_function
+
+  def wrap(text, text_wrapper: TextWrapper, width: 72)
     text_wrapper.wrap(text, width: width)
   end
 end
-
-require_relative 'lovely_rufus/cli_wrapper'
-require_relative 'lovely_rufus/text_wrapper'

data/lib/lovely_rufus/cli_wrapper.rb

@@ -12,7 +12,6 @@ module LovelyRufus
       puts text_wrapper.wrap(stream.read, width: settings.width)
     end
 
-    attr_reader :settings, :text_wrapper
-    private     :settings, :text_wrapper
+    private_attr_reader :settings, :text_wrapper
   end
 end

data/lib/lovely_rufus/layers/basic_wrapper.rb

@@ -0,0 +1,14 @@
+require_relative '../wrap'
+require_relative 'layer'
+
+module LovelyRufus
+  module Layers
+    class BasicWrapper < Layer
+      def call(wrap)
+        unwrapped = wrap.text.tr("\n", ' ').strip
+        wrapped   = unwrapped.gsub(/(.{1,#{wrap.width}})( |$\n?)/, "\\1\n")
+        next_layer.call(Wrap[wrapped, width: wrap.width])
+      end
+    end
+  end
+end

data/lib/lovely_rufus/layers/code_comment_stripper.rb

@@ -0,0 +1,13 @@
+require_relative 'quote_stripper'
+
+module LovelyRufus
+  module Layers
+    class CodeCommentStripper < QuoteStripper
+      QUOTES = %r{^\s*(//|#) }
+
+      private
+
+      alias_method :fixed_quote, :quote
+    end
+  end
+end

data/lib/lovely_rufus/layers/email_quote_stripper.rb

@@ -0,0 +1,15 @@
+require_relative 'quote_stripper'
+
+module LovelyRufus
+  module Layers
+    class EmailQuoteStripper < QuoteStripper
+      QUOTES = /^>[> ]*/
+
+      private
+
+      def fixed_quote
+        quote.size > 0 ? quote.delete(' ') + ' ' : ''
+      end
+    end
+  end
+end

data/lib/lovely_rufus/layers/hangout_wrapper.rb

@@ -0,0 +1,57 @@
+require_relative '../wrap'
+require_relative 'basic_wrapper'
+require_relative 'layer'
+
+module LovelyRufus
+  module Layers
+    class HangoutWrapper < Layer
+      def call(wrap)
+        @wrap = wrap
+        final = hangout_line ? rewrapped : wrap
+        next_layer.call(final)
+      end
+
+      private_attr_reader :wrap
+
+      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).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.lines
+      end
+
+      def rewrapped
+        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
+end

data/lib/lovely_rufus/layers/layer.rb

@@ -0,0 +1,15 @@
+module LovelyRufus
+  module Layers
+    class Layer
+      def initialize(next_layer = -> (wrap) { wrap })
+        @next_layer = next_layer
+      end
+
+      def call(_wrap)
+        fail 'Layer subclasses must define #call that takes a Wrap'
+      end
+
+      private_attr_reader :next_layer
+    end
+  end
+end

data/lib/lovely_rufus/layers/one_letter_gluer.rb

@@ -0,0 +1,14 @@
+require_relative '../wrap'
+require_relative 'layer'
+
+module LovelyRufus
+  module Layers
+    class OneLetterGluer < Layer
+      def call(wrap)
+        pattern = /(?<=\p{space})(&|\p{letter})\p{space}/
+        text    = wrap.text.gsub(pattern, "\\1\\2#{NBSP}")
+        next_layer.call(Wrap[text, width: wrap.width])
+      end
+    end
+  end
+end

data/lib/lovely_rufus/layers/quote_stripper.rb

@@ -0,0 +1,29 @@
+require_relative '../wrap'
+require_relative 'layer'
+
+module LovelyRufus
+  module Layers
+    class QuoteStripper < Layer
+      def call(wrap)
+        @wrap   = wrap
+        wrapped = next_layer.call(stripped_wrap)
+        quoted  = wrapped.lines.map { |line| fixed_quote + line }.join
+        Wrap[quoted, width: wrapped.width + fixed_quote.size]
+      end
+
+      private_attr_reader :wrap
+
+      private
+
+      def quote
+        starts = wrap.lines.map { |line| line[self.class::QUOTES] }.uniq
+        starts.size == 1 ? starts.first || '' : ''
+      end
+
+      def stripped_wrap
+        stripped_text = wrap.lines.map { |line| line[quote.size..-1] }.join
+        Wrap[stripped_text, width: wrap.width - fixed_quote.size]
+      end
+    end
+  end
+end

data/lib/lovely_rufus/text_wrapper.rb

@@ -1,11 +1,14 @@
-require_relative 'basic_wrapper'
-require_relative 'hangout_wrapper'
-require_relative 'one_letter_gluer'
-require_relative 'quote_stripper'
+require_relative 'layers/basic_wrapper'
+require_relative 'layers/code_comment_stripper'
+require_relative 'layers/email_quote_stripper'
+require_relative 'layers/hangout_wrapper'
+require_relative 'layers/one_letter_gluer'
 require_relative 'wrap'
 
 module LovelyRufus
   class TextWrapper
+    QUOTES = /^([>\/#])(\1| )*/
+
     def self.wrap(text, width: 72)
       new(Wrap[text, width: width]).call
     end
@@ -20,13 +23,14 @@ module LovelyRufus
       end.join("\n")
     end
 
-    attr_reader :wrap
-    private     :wrap
+    private_attr_reader :wrap
 
     private
 
     def chain
-      layers = [QuoteStripper, OneLetterGluer, BasicWrapper, HangoutWrapper]
+      layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
+                Layers::OneLetterGluer, Layers::BasicWrapper,
+                Layers::HangoutWrapper]
       identity = -> (wrap) { wrap }
       layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
     end