lorax 0.2.0 → 0.3.0.rc1

data/CHANGELOG.rdoc

@@ -1,5 +1,14 @@
 = Changelog
 
+== 0.3.0 (unreleased)
+
+* Human-readable diffs.
+
+== 0.2.0 (2010-10-14)
+
+* Better handling of whitespace: blank text nodes are ignored, as is
+  leading and trailing whitespace in text nodes. GH#2.
+
 == 0.1.0 (2010-03-09)
 
 * Happy Birthday!

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Mike Dalessio
+Copyright (c) 2009-2012 Mike Dalessio
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -50,7 +50,7 @@ and apply the delta set as a patch to the original document:
 
 (The MIT License)
 
-Copyright (c) 2010 Mike Dalessio
+Copyright (c) 2009-2012 Mike Dalessio
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,22 +1,23 @@
-# -*- ruby -*-
-
-require 'rubygems'
-gem 'hoe', '>= 2.5.0'
-require 'hoe'
+require "rubygems"
+require "hoe"
 
 Hoe.plugin :git
 Hoe.plugin :gemspec
+Hoe.plugin :bundler
 
-Hoe.spec 'lorax' do
+Hoe.spec "lorax" do
   developer "Mike Dalessio", "mike.dalessio@gmail.com"
 
   self.extra_rdoc_files = FileList["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
 
-  extra_deps << ["nokogiri", ">= 1.4.0"]
-  extra_dev_deps << ["rspec", ">= 1.2.9"]
-  extra_dev_deps << ["rr", ">= 0.10.4"]
+  extra_deps     << ["nokogiri",    ">= 1.4"]
+  extra_dev_deps << ["rspec",       "~> 2.11"]
+  extra_dev_deps << ["rr",          ">= 1.0"]
+  extra_dev_deps << ["hoe-git",     "> 0"]
+  extra_dev_deps << ["hoe-gemspec", "> 0"]
+  extra_dev_deps << ["hoe-bundler", "> 0"]
 end
 
 task :redocs => :fix_css

data/lib/lorax.rb

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
 module Lorax
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.rc1"
   REQUIRED_NOKOGIRI_VERSION = "1.4.0"
   raise LoadError, "lorax requires Nokogiri version #{REQUIRED_NOKOGIRI_VERSION} or higher" unless Nokogiri::VERSION >= REQUIRED_NOKOGIRI_VERSION
 end

data/lib/lorax/delta.rb

@@ -20,6 +20,22 @@ module Lorax
         children[position].add_previous_sibling(node.dup)
       end
     end
+
+    def context_before node
+      if node.previous_sibling
+        node.previous_sibling.to_xml.gsub(/^/,'  ').rstrip
+      else
+        "  <#{node.parent.name}>"
+      end
+    end
+
+    def context_after node
+      if node.next_sibling
+        node.next_sibling.to_xml.gsub(/^/,'  ').rstrip
+      else
+        "  </#{node.parent.name}>"
+      end
+    end
   end
 end
 

data/lib/lorax/delta/delete_delta.rb

@@ -15,5 +15,15 @@ module Lorax
     def descriptor
       [:delete, {:xpath => node.path, :content => node.to_s}]
     end
+
+    def to_s
+      response = []
+      response << "--- #{node.path}"
+      response << "+++"
+      response << context_before(node)
+      response << node.to_html.gsub(/^/,'- ').strip
+      response << context_after(node)
+      response.join("\n")
+    end
   end
 end

data/lib/lorax/delta/insert_delta.rb

@@ -18,5 +18,15 @@ module Lorax
     def descriptor
       [:insert, {:xpath => xpath, :position => position, :content => node.to_s}]
     end
+
+    def to_s
+      response = []
+      response << "---"
+      response << "+++ #{node.path}"
+      response << context_before(node)
+      response << node.to_html.gsub(/^/,'+ ').strip
+      response << context_after(node)
+      response.join("\n")
+    end
   end
 end

data/lib/lorax/delta/modify_delta.rb

@@ -41,6 +41,19 @@ module Lorax
       end
     end
 
+    def to_s
+      response = []
+      response << "--- #{node1.path}"
+      response << "+++ #{node2.path}"
+      response << context_before(node2)
+
+      response << node1.to_html.gsub(/^/,'- ').strip
+      response << node2.to_html.gsub(/^/,'+ ').strip
+
+      response << context_after(node2)
+      response.join("\n")
+    end
+
     private
 
     def attributes_hash(node)

data/lib/lorax/delta_set.rb

@@ -20,5 +20,11 @@ module Lorax
       end
       document
     end
+
+    def to_s
+      deltas.collect do |delta|
+        delta.to_s
+      end.join("\n\n")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
-require 'rubygems'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'lorax'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'rr'
 require 'pp'
 
@@ -36,7 +31,7 @@ module XmlBuilderHelper
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :rr
   config.include XmlBuilderHelper
 end

data/spec/unit/delta/delete_delta_spec.rb

@@ -47,4 +47,8 @@ describe Lorax::DeleteDelta do
   describe "#descriptor" do
     it "needs a spec"
   end
+
+  describe "#to_s" do
+    it "needs a spec"
+  end
 end

data/spec/unit/delta/insert_delta_spec.rb

@@ -106,4 +106,8 @@ describe Lorax::InsertDelta do
   describe "#descriptor" do
     it "needs a spec"
   end
+
+  describe "#to_s" do
+    it "needs a spec"
+  end
 end

data/spec/unit/delta/modify_delta_spec.rb

@@ -91,4 +91,8 @@ describe Lorax::ModifyDelta do
   describe "#descriptor" do
     it "needs a spec"
   end
+
+  describe "#to_s" do
+    it "needs a spec"
+  end
 end

data/spec/unit/signature_spec.rb

@@ -441,9 +441,9 @@ describe Lorax::Signature do
             a3("x" * 50_000)
           } }
         sig = Lorax::Signature.new(doc.root)
-        sig.weight(doc.at_css("a1")).should be_close(2, 0.0005)
-        sig.weight(doc.at_css("a2")).should be_close(2 + Math.log(500), 0.0005)
-        sig.weight(doc.at_css("a3")).should be_close(2 + Math.log(50_000), 0.0005)
+        sig.weight(doc.at_css("a1")).should be_within(0.0005).of(2)
+        sig.weight(doc.at_css("a2")).should be_within(0.0005).of(2 + Math.log(500))
+        sig.weight(doc.at_css("a3")).should be_within(0.0005).of(2 + Math.log(50_000))
       end
     end
   end

metadata

@@ -1,148 +1,175 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lorax
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Mike Dalessio
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBEMRYwFAYDVQQDDA1taWtl
-  LmRhbGVzc2lvMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wHhcNMTAwOTMwMDYyNjQ3WhcNMTEwOTMwMDYyNjQ3WjBEMRYwFAYDVQQD
-  DA1taWtlLmRhbGVzc2lvMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJ
-  k/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLv4nl
-  BGRtliYy5s5MhlFO88UvkkETFcS79OCaGFKorxPTmcfDrR2/2x0mAySXJ6I1uPEU
-  WSAWaPb1at61NEOvp5kRNzUNdwGakBA/fd1vZ1N2rwHRtjk/8t6DX8yiflr6T761
-  9ZMYPE+t85NvlPt0/WpT778imNZXwGQNcQJwNESDiBTgyjN8bOWpvRrVADVdOCme
-  DW3AfJnF/kdMYuSiUuFMZpyOlULEbOsrvOfUoEKjoFaVNv7FJ28/kLH1UgmtucOD
-  m5bZ/qy5b2+CWzzsmUfysaGnLQ4LjvAFpmgZGAjIE9TnyjU0jw+2e7dq8uRjdnFJ
-  gfWQlnJuwAlZXR1nAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRbc4XnK6it228clp2DjyqaVjKW+DANBgkqhkiG9w0BAQUFAAOCAQEA
-  xPtSPtMl9qsgNGcnSDLSTjwGouwsjOB19IbtdODFTabUpRPCk7OFHeYGdJik4iiZ
-  fk10t3vzr6uWMAyOfwpWWFRnEYAvy9ZaMGDIZPKD8xWxaRTLwmi+pQsS8Lo2IpDC
-  Lb+l0lUiRiYS3/Ez7tA6pS122cvuQroWfuqh5Mi3pNAi1nuBTlhCNJuR5XUaOjqs
-  DAoZLfYEEW+4bmkAb6ky2TPUslaln56PO3/JG+IfWZwCvTFFVdKRBKXqLaAxO9rv
-  7nflCv7xpUSUGGZ6hoPG8dil+Mp/kKV8cb1kxZz+C8660hC93dJ3FQ3adX30ylvZ
-  C4THW+6HEQDCdOkiArif8A==
-  -----END CERTIFICATE-----
-
-date: 2010-10-14 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2012-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
   name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 10
-        - 4
-        version: 0.10.4
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  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: hoe-gemspec
+  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: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id005
-description: |-
-  The Lorax is a full diff and patch library for XML/HTML documents, based on Nokogiri.
-  
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+description: ! 'The Lorax is a full diff and patch library for XML/HTML documents,
+  based on Nokogiri.
+
+
   It can tell you whether two XML/HTML documents are identical, or if
-  they're not, tell you what's different. In trivial cases, it can even
+
+  they''re not, tell you what''s different. In trivial cases, it can even
+
   apply the patch.
-  
-  It's based loosely on Gregory Cobena's master's thesis paper, which
+
+
+  It''s based loosely on Gregory Cobena''s master''s thesis paper, which
+
   generates deltas in less than O(n * log n) time, accepting some
+
   tradeoffs in the size of the delta set. You can find his paper at
+
   http://gregory.cobena.free.fr/www/Publications/thesis.html.
-  
-  "I am the Lorax, I speak for the trees."
-email: 
+
+
+  "I am the Lorax, I speak for the trees."'
+email:
 - mike.dalessio@gmail.com
-executables: 
+executables:
 - lorax
 extensions: []
-
-extra_rdoc_files: 
-- Manifest.txt
+extra_rdoc_files:
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
-files: 
+files:
 - CHANGELOG.rdoc
 - LICENSE
 - Manifest.txt
@@ -180,40 +207,35 @@ files:
 - spec/unit/lorax_spec.rb
 - spec/unit/match_set_spec.rb
 - spec/unit/signature_spec.rb
-has_rdoc: true
+- .gemtest
 homepage: http://github.com/flavorjones/lorax
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2415192576309333351
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: lorax
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: The Lorax is a full diff and patch library for XML/HTML documents, based on Nokogiri
+summary: The Lorax is a full diff and patch library for XML/HTML documents, based
+  on Nokogiri
 test_files: []
-