card 1.17.4 → 1.18.0

data/lib/card/core_ext.rb

@@ -2,31 +2,31 @@ class Object
   # FIXME: move this, mixin, don't extend Object
   def deep_clone
     case self
-    when Fixnum,Bignum,Float,NilClass,FalseClass,TrueClass,Symbol
+    when Fixnum, Bignum, Float, NilClass, FalseClass, TrueClass, Symbol
       klone = self
     when Hash
-      klone = self.clone
-      self.each{|k,v| klone[k] = v.deep_clone}
+      klone = clone
+      each { |k, v| klone[k] = v.deep_clone }
     when Array
-      klone = self.clone
+      klone = clone
       klone.clear
-      self.each{|v| klone << v.deep_clone}
+      each { |v| klone << v.deep_clone }
     else
-      klone = self.clone
+      klone = clone
     end
-    klone.instance_variables.each {|v|
+    klone.instance_variables.each do |v|
       klone.instance_variable_set(v,
-      klone.instance_variable_get(v).deep_clone)
-    }
+                                  klone.instance_variable_get(v).deep_clone)
+    end
     klone
   end
 
-  def send_unless method, *args, &block
-    ( block_given? ? yield : self ) or  send method, *args
+  def send_unless method, *args, &_block
+    (block_given? ? yield : self) || send(method, *args)
   end
 
-  def send_if     method, *args, &block
-    ( block_given? ? yield : self ) and send method, *args
+  def send_if     method, *args, &_block
+    (block_given? ? yield : self) && send(method, *args)
   end
 
   def to_name
@@ -38,29 +38,23 @@ class Object
   end
 end
 
-
-
 class Module
   RUBY_VERSION_18 = !!(RUBY_VERSION =~ /^1\.8/)
 
   def const_get_if_defined const
-    args = RUBY_VERSION_18 ? [ const ] : [ const, false ]
-    if const_defined? *args
-      const_get *args
-    end
+    args = RUBY_VERSION_18 ? [const] : [const, false]
+    const_get *args if const_defined? *args
   end
 
   def const_get_or_set const
-    const_get_if_defined const or const_set const, yield
+    const_get_if_defined(const) || const_set(const, yield)
   end
 end
 
-
-
 class Hash
   # FIXME: this is too ugly and narrow for a core extension.
   class << self
-    def new_from_semicolon_attr_list(attr_string)
+    def new_from_semicolon_attr_list attr_string
       return {} if attr_string.blank?
       attr_string.strip.split(';').inject({}) do |result, pair|
         value, key = pair.split(':').reverse
@@ -71,22 +65,20 @@ class Hash
       end
     end
   end
-
 end
 
-
 class Kaminari::Helpers::Tag
   def page_url_for page
     p = params_for(page)
     p.delete :controller
     p.delete :action
     card = Card[p.delete('id')]
-    card.format.path  p
+    card.format.path p
   end
 
   private
 
-  def params_for(page)
+  def params_for page
     page_params = Rack::Utils.parse_nested_query("#{@param_name}=#{page}")
     page_params = @params.with_indifferent_access.deep_merge(page_params)
 
@@ -99,11 +91,9 @@ class Kaminari::Helpers::Tag
       #   from: {other: "params", user: {name: "yuki", page: 1}}
       #     to: {other: "params", user: {name: "yuki", page: nil}}
       #   (when @param_name == "user[page]")
-      @param_name.to_s.scan(/\w+/)[0..-2].inject(page_params){|h, k| h[k] }[$&] = nil
+      @param_name.to_s.scan(/\w+/)[0..-2].inject(page_params) { |h, k| h[k] }[$&] = nil
     end
 
     page_params
   end
 end
-
-

data/lib/card/diff.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 module Card::Diff
-
   def self.complete a, b, opts={}
     DiffBuilder.new(a, b, opts).complete
   end
@@ -14,7 +13,7 @@ module Card::Diff
     "<ins class='diffins diff-green'>#{text}</ins>"
   end
 
-  def self.render_deleted_chunk text, count=true
+  def self.render_deleted_chunk text, _count=true
     "<del class='diffdel diff-red'>#{text}</del>"
   end
 
@@ -40,7 +39,7 @@ module Card::Diff
     #
     # summary: {length: <number> , joint: <string> }
 
-    def initialize(old_version, new_version, opts={})
+    def initialize old_version, new_version, opts={}
       @new_version = new_version
       @old_version = old_version
       @lcs_opts = lcs_opts_for_format opts[:format]
@@ -48,7 +47,7 @@ module Card::Diff
       @dels_cnt = 0
       @adds_cnt = 0
 
-      if not @new_version
+      if !@new_version
         @complete = ''
         @summary  = ''
       else
@@ -71,17 +70,11 @@ module Card::Diff
         opts[:exclude] = /^</
       when :text
         opts[:reject] =  /^</
-        opts[:postprocess] = Proc.new do |word|
-          word.gsub("\n",'<br>')
-        end
+        opts[:postprocess] = proc { |word| word.gsub("\n", '<br>') }
       when :pointer
-        opts[:preprocess] = Proc.new do |word|
-          word.gsub('[[','').gsub(']]','')
-        end
-      else #:raw
-        opts[:preprocess] = Proc.new do |word|
-          CGI::escapeHTML(word)
-        end
+        opts[:preprocess] = proc { |word| word.gsub('[[', '').gsub(']]', '') }
+      else # :raw
+        opts[:preprocess] = proc { |word| CGI.escapeHTML(word) }
       end
       opts
     end
@@ -94,14 +87,17 @@ module Card::Diff
       @adds_cnt = @lcs.adds_cnt
     end
 
-
     class LCS
       attr_reader :adds_cnt, :dels_cnt
-      def initialize old_text, new_text, opts, summary=nil
-        @reject_pattern  = opts[:reject]        # regex; remove match completely from diff
-        @exclude_pattern = opts[:exclude]       # regex; put back to the result after diff
-        @preprocess      = opts[:preprocess]    # block; called with every word
-        @postprocess     = opts[:postprocess]   # block; called with complete diff
+      def initialize old_text, new_text, opts, _summary=nil
+        # regex; remove match completely from diff
+        @reject_pattern  = opts[:reject]
+
+        # regex; put back to the result after diff
+        @exclude_pattern = opts[:exclude]
+
+        @preprocess      = opts[:preprocess]  # block; called with every word
+        @postprocess     = opts[:postprocess] # block; called with complete diff
 
         @adds_cnt = 0
         @dels_cnt = 0
@@ -109,10 +105,10 @@ module Card::Diff
         @splitters = %w( <[^>]+>  \[\[[^\]]+\]\]  \{\{[^}]+\}\}  \s+ )
         @disjunction_pattern = /^\s/
         @summary ||= Summary.new opts[:summary]
-        if not old_text
+        if !old_text
           list = split_and_preprocess(new_text)
           if @exclude_pattern
-            list = list.reject{ |word| word.match @exclude_pattern }
+            list = list.reject { |word| word.match @exclude_pattern }
           end
           text = postprocess list.join
           @result = added_chunk text
@@ -153,17 +149,18 @@ module Card::Diff
       def run_diff
         prev_action = nil
         ::Diff::LCS.traverse_balanced(@words[:old], @words[:new]) do |word|
-
           if prev_action
-            if prev_action != word.action and
-              !(prev_action == '-' and word.action == '!') and
-              !(prev_action == '!' and word.action == '+')
+            if prev_action != word.action &&
+               !(prev_action == '-' && word.action == '!') &&
+               !(prev_action == '!' && word.action == '+')
 
               # delete and/or add section stops here; write changes to result
               write_dels
               write_adds
 
-              write_excludees # new neutral section starts, we can just write excludees to result
+              # new neutral section starts
+              # we can just write excludees to result
+              write_excludees
 
             else # current word belongs to edit of previous word
               case word.action
@@ -192,7 +189,6 @@ module Card::Diff
         @result = postprocess @result
       end
 
-
       def added_chunk text, count=true
         @adds_cnt += 1 if count
         Card::Diff.render_added_chunk text
@@ -203,14 +199,13 @@ module Card::Diff
         Card::Diff.render_deleted_chunk text
       end
 
-
       def write_unchanged text
         @result << text
         @summary.omit
       end
 
       def write_dels
-        if !@dels.empty?
+        unless @dels.empty?
           @result << deleted_chunk(@dels.join)
           @summary.delete @dels.join
           @dels = []
@@ -218,7 +213,7 @@ module Card::Diff
       end
 
       def write_adds
-        if !@adds.empty?
+        unless @adds.empty?
           @result << added_chunk(@adds.join)
           @summary.add @adds.join
           @adds = []
@@ -226,13 +221,13 @@ module Card::Diff
       end
 
       def write_excludees
-        while ex = @excludees[:new].next
+        while (ex = @excludees[:new].next)
           @result << ex[:element]
         end
       end
 
       def del_old_excludees
-        while ex = @excludees[:old].next
+        while (ex = @excludees[:old].next)
           if ex[:type] == :disjunction
             @dels << ex[:element]
           else
@@ -243,7 +238,7 @@ module Card::Diff
       end
 
       def add_new_excludees
-        while ex = @excludees[:new].next
+        while (ex = @excludees[:new].next)
           if ex[:type] == :disjunction
             @adds << ex[:element]
           else
@@ -260,47 +255,59 @@ module Card::Diff
       def process_element old_element, new_element, action
         case action
         when '-'
-          @dels << old_element
-          @excludees[:old].word_step
+          minus old_element
         when '+'
-          @adds << new_element
-          @excludees[:new].word_step
+          plus new_element
         when '!'
-          @dels << old_element
-          @adds << new_element
-          @excludees[:old].word_step
-          @excludees[:new].word_step
+          minus old_element
+          plus new_element
         else
           write_unchanged new_element
           @excludees[:new].word_step
         end
       end
 
+      def plus new_element
+        @adds << new_element
+        @excludees[:new].word_step
+      end
+
+      def minus old_element
+        @dels << old_element
+        @excludees[:old].word_step
+      end
+
       def separate_comparables_from_excludees text
-        # return two arrays, one with all words, one with pairs (index in word list, html_tag)
+        # return two arrays, one with all words, one with pairs
+        # (index in word list, html_tag)
         list = split_and_preprocess text
         if @exclude_pattern
-          list.each_with_index.inject([[],[]]) do |res, pair|
-            element, index = pair
-            if element.match @disjunction_pattern
-              res[1] << {chunk_index: index, element: element, type: :disjunction}
-            elsif element.match @exclude_pattern
-              res[1] << {chunk_index: index, element: element, type: :excludee}
-            else
-              res[0] << element
-            end
-            res
-          end
+          check_exclude_and_disjunction_pattern list
         else
           [list, []]
         end
       end
 
+      def check_exclude_and_disjunction_pattern list
+        list.each_with_index.each_with_object([[], []]) do |pair, res|
+          element, index = pair
+          if element.match @disjunction_pattern
+            res[1] << { chunk_index: index, element: element,
+                        type: :disjunction }
+          elsif element.match @exclude_pattern
+            res[1] << { chunk_index: index, element: element, type:
+                        :excludee }
+          else
+            res[0] << element
+          end
+        end
+      end
+
       def split_and_preprocess text
         splitted = split_to_list_of_words(text).select do |s|
-          s.size > 0 and (!@reject_pattern or !s.match @reject_pattern)
+          !s.empty? && (!@reject_pattern || !s.match(@reject_pattern))
         end
-        @preprocess ? splitted.map {|s| @preprocess.call(s) } : splitted
+        @preprocess ? splitted.map { |s| @preprocess.call(s) } : splitted
       end
 
       def split_to_list_of_words text
@@ -324,7 +331,6 @@ module Card::Diff
         end
       end
 
-
       class Summary
         def initialize opts
           opts ||= {}
@@ -348,7 +354,7 @@ module Card::Diff
         end
 
         def omit
-           if @chunks.empty? or @chunks.last[:action] != :ellipsis
+          if @chunks.empty? || @chunks.last[:action] != :ellipsis
             add_chunk @joint, :ellipsis
           end
         end
@@ -357,7 +363,7 @@ module Card::Diff
 
         def add_chunk text, action
           if @remaining_chars > 0
-            @chunks << {action: action, text: text}
+            @chunks << { action: action, text: text }
             @remaining_chars -= text.size
           end
         end
@@ -365,7 +371,7 @@ module Card::Diff
         def render_chunks
           truncate_overlap
           @chunks.map do |chunk|
-              Card::Diff.render_chunk chunk[:action], chunk[:text]
+            Card::Diff.render_chunk chunk[:action], chunk[:text]
           end.join
         end
 
@@ -377,20 +383,12 @@ module Card::Diff
             end
 
             index = @chunks.size - 1
-            while @remaining_chars < @joint.size and index >= 0
-              if @remaining_chars + @chunks[index][:text].size == @joint.size   # d
-                @chunks.pop
-                if index-1 >= 0
-                  if @chunks[index-1][:action] == :added
-                    @chunks << {action: :ellipsis, text: @joint}
-                  elsif @chunks[index-1][:action] == :deleted
-                    @chunks << {action: :added, text: @joint}
-                  end
-                end
+            while @remaining_chars < @joint.size && index >= 0
+              if @remaining_chars + @chunks[index][:text].size == @joint.size
+                replace_with_joint index
                 break
               elsif @remaining_chars + @chunks[index][:text].size > @joint.size
-                @chunks[index][:text] =  @chunks[index][:text][0..(@remaining_chars-@joint.size-1)]
-                @chunks[index][:text] += @joint
+                cut_with_joint index
                 break
               else
                 @remaining_chars += @chunks[index][:text].size
@@ -401,6 +399,22 @@ module Card::Diff
           end
         end
 
+        def cut_with_joint index
+          @chunks[index][:text] =
+            @chunks[index][:text][0..(@remaining_chars - @joint.size - 1)]
+          @chunks[index][:text] += @joint
+        end
+
+        def replace_with_joint index
+          @chunks.pop
+          if index - 1 >= 0
+            if @chunks[index - 1][:action] == :added
+              @chunks << { action: :ellipsis, text: @joint }
+            elsif @chunks[index - 1][:action] == :deleted
+              @chunks << { action: :added, text: @joint }
+            end
+          end
+        end
       end
 
       class ExcludeeIterator
@@ -415,16 +429,14 @@ module Card::Diff
         end
 
         def next
-          if @index < @list.size and @list[@index][:chunk_index] == @chunk_index
+          if @index < @list.size && @list[@index][:chunk_index] == @chunk_index
             res = @list[@index]
             @index += 1
-            @chunk_index +=1
+            @chunk_index += 1
             res
           end
         end
       end
-
     end
   end
 end
-