palmister 0.0.1

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in palmister.gemspec
+gemspec

data/MIT-LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Dmitriy Kiriyenko
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# Palmister
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'palmister'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install palmister
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/lib/palmister.rb

@@ -0,0 +1,20 @@
+require 'diff/lcs'
+require 'erubis'
+require 'palmister_helper'
+require 'palmister/simple_correction_diff'
+require 'palmister/simple_html_diff'
+require 'palmister/simple_line_diff'
+require 'palmister/string_simple_correction_diff'
+require 'palmister/vc_diff'
+
+module Palmister
+  extend Erubis::XmlHelper
+  def self.diff(old, new, output = Palmister::SimpleHtmlDiff)
+    # html_escape code for display and split strings into lines array
+    a = html_escape(old).split(/\015?\012/)
+    b = html_escape(new).split(/\015?\012/)
+    out = output.new
+    Diff::LCS.traverse_balanced(a, b, out)
+    out.content
+  end
+end

data/lib/palmister/simple_correction_diff.rb

@@ -0,0 +1,31 @@
+#require 'action_view/template_handlers/erb'
+class Palmister::SimpleCorrectionDiff #:nodoc:
+  include ERB::Util
+
+  attr_accessor :content
+
+  def initialize
+    @content = ""
+  end
+
+  def change(event)
+    out = Palmister::StringSimpleCorrectionDiff.new
+    Diff::LCS.traverse_sequences(event.old_element, event.new_element, out)
+    @content << %Q|<span class="change">#{out.content}#{out.closing}</span><br/></span><br/>\n|
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @content << %Q|<span class="match">#{event.new_element}</span><br/>\n|
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    @content << %Q|<span class="only_a"><del>#{event.old_element}</del></span><br/>\n|
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    @content << %Q|<span class="only_b"><ins>#{event.new_element}</ins></span><br/>\n|
+  end
+end

data/lib/palmister/simple_html_diff.rb

@@ -0,0 +1,36 @@
+class Palmister::SimpleHtmlDiff #:nodoc:
+  attr_accessor :content
+  attr_accessor :old_line
+  attr_accessor :new_line
+
+  def initialize
+    @content = ""
+    @old_line = 1
+    @new_line = 1
+  end
+
+  def change(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td colspan="2"><pre class="match">#{event.old_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td></td><td></td></tr>\n|
+    @old_line += 1
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    @content << %Q|<tr><td></td><td></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @new_line += 1
+  end
+end

data/lib/palmister/simple_line_diff.rb

@@ -0,0 +1,26 @@
+class Palmister::SimpleLineDiff #:nodoc:
+  attr_accessor :content
+
+  def initialize
+    @content = ""
+  end
+
+  def change(event)
+    @content << %Q|<span class="only_a">#{event.old_element}</span><br/>\n<span class="only_b">#{event.new_element}</span><br/>\n|
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @content << %Q|<span class="match">#{event.old_element}</span><br/>\n|
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    @content << %Q|<span class="only_a">#{event.old_element}</span><br/>\n|
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    @content << %Q|<span class="only_b">#{event.new_element}</span><br/>\n|
+  end
+end

data/lib/palmister/string_simple_correction_diff.rb

@@ -0,0 +1,56 @@
+#require 'action_view/template_handlers/erb'
+class Palmister::StringSimpleCorrectionDiff #:nodoc:
+
+  attr_accessor :content, :last, :closing
+
+  def initialize
+    @content = ""
+  end
+
+  def change(event)
+    if @last.nil?
+      @content << %Q|<span class="change">|
+    elsif @last != :change
+      @content << %Q|#{closing}</span><span class="change">|
+    end
+    @content << %Q|<del class="only_a">#{event.old_element}</del><ins class="only_b">#{event.new_element.to_s}</ins>|
+    @last = :change
+    @closing = ""
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    if @last.nil?
+      @content << %Q|<span class="match">|
+    elsif @last != :match
+      @content << %Q|#{closing}</span><span class="match">|
+    end
+    @content << event.old_element.to_s
+    @last = :match
+    @closing = ""
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    if @last.nil?
+      @content << %Q|<span class="only_a"><del>|
+    elsif @last != :only_a
+      @content << %Q|#{closing}</span><span class="only_a"><del>|
+    end
+    @content << %Q|#{event.old_element.to_s}|
+    @last = :only_a
+    @closing = "</del>"
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    if @last.nil?
+      @content << %Q|<span class="only_b"><ins>|
+    elsif @last != :only_b
+      @content << %Q|#{closing}</span><span class="only_b"><ins>|
+    end
+    @content << %Q|#{event.new_element.to_s}|
+    @last = :only_b
+    @closing = "</ins>"
+  end
+end

data/lib/palmister/vc_diff.rb

@@ -0,0 +1,59 @@
+class Palmister::VcDiff #:nodoc:
+  attr_accessor :content
+  attr_accessor :old_line
+  attr_accessor :new_line
+  attr_accessor :last_lines
+  attr_accessor :last
+
+  def initialize
+    @content = ""
+    @last_lines = []
+    @old_line = 1
+    @new_line = 1
+  end
+
+  def change(event)
+    add_last_lines unless @last == :change
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+
+    @last = :change
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @last_lines.push %Q|<tr><td>#{old_line}. </td><td colspan="2"><pre class="match">#{event.old_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    add_last_lines unless @last == :discard_a
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td></td><td></td></tr>\n|
+
+    @last = :discard_a
+    @old_line += 1
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    add_last_lines unless @last == :discard_b
+    @content << %Q|<tr><td></td><td></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+
+    @last = :discard_b
+    @new_line += 1
+  end
+
+  def add_last_lines(n = 3)
+    @content << %Q|<tr><td colspan="4">Next Change: </td></tr>\n|
+    start = @last_lines.length - n
+    start = 0 if start < 0
+    start.upto @last_lines.length do |i|
+      @content << @last_lines[i] if @last_lines[i]
+    end
+    @last_lines = []
+  end
+
+end

data/lib/palmister/version.rb

@@ -0,0 +1,3 @@
+module Palmister
+  VERSION = "0.0.1"
+end

data/lib/palmister_helper.rb

@@ -0,0 +1,53 @@
+require 'nokogiri'
+
+module PalmisterHelper
+  protected
+
+  DIFF_DELIMITER = Nokogiri::HTML.parse("<span class='diff-delimiter'><hr></span>").css('span').first
+
+  # generates a simple line diff
+  def line_diff(old, new)
+    Palmister.diff(old,new)
+  end
+
+  def simple_line_diff(old, new)
+    Palmister.diff(old,new, Palmister::SimpleLineDiff)
+  end
+
+  def simple_chunk_diff(old, new, line = 3)
+    simplifier Palmister.diff(old,new, Palmister::SimpleLineDiff), line
+  end
+
+  # generates a simple correction diff with "inline-diffs"
+  def correction_diff(old, new)
+    Palmister.diff(old, new, Palmister::SimpleCorrectionDiff)
+  end
+
+  # generates a simple vc similar diff, where only the changes + some preceding
+  # lines are shown
+  def vc_diff(old,new)
+    Palmister.diff(old,new, Palmister::VcDiff)
+  end
+
+  def simplifier html, line = 3
+    elements = Nokogiri::HTML.parse(html).css("span").to_a
+    elements.each_with_index do |el,index|
+      start = line > index ? index : index - line
+      finish = index + line
+      if elements[start..finish].select{|span| span.nil? || span.attributes["class"].value == 'match'}.size == elements[start..finish].size
+        elements[index] = nil
+      end
+    end
+
+    elements.each_with_index do |el, index|
+      next if index == 0 || index >= elements.size - 1
+      elements[index-1] =  DIFF_DELIMITER if elements[index-1].nil? && el.present?
+    end
+
+    elements.compact!
+    elements.shift if elements.any? && elements.first.attributes['class'].value == 'diff-delimiter'
+    elements.map(&:to_html).join("<br/>")
+  end
+
+end
+

data/palmister.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'palmister/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = 'palmister'
+  gem.version       = Palmister::VERSION
+  gem.authors       = ['Dmitriy Kiriyenko']
+  gem.email         = ['dmitriy.kiriyenko@anahoret.com']
+  gem.description   = %q{Modern supportable rails diff}
+  gem.summary       = %q{Modern supportable rails diff. Works on my machine.}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
+
+  gem.add_dependency 'diff-lcs', '~> 1.1.3'
+  gem.add_dependency 'erubis', '~> 2.7.0'
+  gem.add_dependency 'nokogiri', '~> 1.5.5'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+end

metadata

@@ -0,0 +1,140 @@
+--- !ruby/object:Gem::Specification
+name: palmister
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Dmitriy Kiriyenko
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Modern supportable rails diff
+email:
+- dmitriy.kiriyenko@anahoret.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/palmister.rb
+- lib/palmister/simple_correction_diff.rb
+- lib/palmister/simple_html_diff.rb
+- lib/palmister/simple_line_diff.rb
+- lib/palmister/string_simple_correction_diff.rb
+- lib/palmister/vc_diff.rb
+- lib/palmister/version.rb
+- lib/palmister_helper.rb
+- palmister.gemspec
+homepage: ''
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
+summary: Modern supportable rails diff. Works on my machine.
+test_files: []
+has_rdoc: