daisydiff 0.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +18 -0
- data/.rspec +3 -0
- data/Gemfile +4 -0
- data/LICENSE.txt +22 -0
- data/README.md +29 -0
- data/Rakefile +1 -0
- data/daisydiff.gemspec +30 -0
- data/lib/daisydiff/daisydiff.jar +0 -0
- data/lib/daisydiff/result.rb +24 -0
- data/lib/daisydiff/version.rb +3 -0
- data/lib/daisydiff.rb +48 -0
- data/spec/daisydiff_spec.rb +64 -0
- data/spec/fixtures/example_1_1.html +1 -0
- data/spec/fixtures/example_1_2.html +1 -0
- data/spec/spec_helper.rb +12 -0
- metadata +148 -0
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: e0ec11106f66c5137caad5200efd6f9976439cc6
|
4
|
+
data.tar.gz: feb157a3d248185ea68d498406e74d6db76cd75b
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 2a4aab7f62a996a5a0fb0e63bbb8ad3c039e7a0951aeb9e54b2fa25ef448c6f7fc9584ec8e4ed17433c3ed870a7604093309331e19ead94b29c4e893c9e54b28
|
7
|
+
data.tar.gz: f61919475f125e7292c01d45fe19834c1ef8a910921ae95eee69568858b9347c45b9ac740cee483211e414d7a014d6bb3375d9a17dded03d68c26de1d513f569
|
data/.gitignore
ADDED
data/.rspec
ADDED
data/Gemfile
ADDED
data/LICENSE.txt
ADDED
@@ -0,0 +1,22 @@
|
|
1
|
+
Copyright (c) 2013 Sanjay Ginde
|
2
|
+
|
3
|
+
MIT License
|
4
|
+
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
6
|
+
a copy of this software and associated documentation files (the
|
7
|
+
"Software"), to deal in the Software without restriction, including
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
11
|
+
the following conditions:
|
12
|
+
|
13
|
+
The above copyright notice and this permission notice shall be
|
14
|
+
included in all copies or substantial portions of the Software.
|
15
|
+
|
16
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
19
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
20
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
21
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
22
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
ADDED
@@ -0,0 +1,29 @@
|
|
1
|
+
# Daisy Diff Wrapper
|
2
|
+
|
3
|
+
A simple wrapper around [DaisyDiff](https://code.google.com/p/daisydiff/) HTML parser. (Requires Java)
|
4
|
+
|
5
|
+
## Installation
|
6
|
+
|
7
|
+
Add this line to your application's Gemfile:
|
8
|
+
|
9
|
+
gem 'daisydiff'
|
10
|
+
|
11
|
+
And then execute:
|
12
|
+
|
13
|
+
$ bundle
|
14
|
+
|
15
|
+
Or install it yourself as:
|
16
|
+
|
17
|
+
$ gem install daisydiff
|
18
|
+
|
19
|
+
## Usage
|
20
|
+
|
21
|
+
TODO: Write usage instructions here
|
22
|
+
|
23
|
+
## Contributing
|
24
|
+
|
25
|
+
1. Fork it
|
26
|
+
2. Create your feature branch (`git checkout -b my-new-feature`)
|
27
|
+
3. Commit your changes (`git commit -am 'Add some feature'`)
|
28
|
+
4. Push to the branch (`git push origin my-new-feature`)
|
29
|
+
5. Create new Pull Request
|
data/Rakefile
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
require "bundler/gem_tasks"
|
data/daisydiff.gemspec
ADDED
@@ -0,0 +1,30 @@
|
|
1
|
+
# coding: utf-8
|
2
|
+
lib = File.expand_path('../lib', __FILE__)
|
3
|
+
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
|
+
require 'daisydiff/version'
|
5
|
+
|
6
|
+
Gem::Specification.new do |spec|
|
7
|
+
spec.name = "daisydiff"
|
8
|
+
spec.version = DaisyDiff::VERSION
|
9
|
+
spec.authors = ["Sanjay Ginde"]
|
10
|
+
spec.email = ["sanjayginde@gmail.com"]
|
11
|
+
spec.description = "A simple ruby wrapper for Daisy Diff."
|
12
|
+
spec.summary = "Basic implementation that utilizes the daisydiff.jar via command line and temp files."
|
13
|
+
spec.homepage = "http://github.com/sanjayginde/daisydiff"
|
14
|
+
spec.license = "MIT"
|
15
|
+
|
16
|
+
spec.files = `git ls-files`.split($/)
|
17
|
+
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
18
|
+
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
|
+
spec.require_paths = ["lib"]
|
20
|
+
|
21
|
+
spec.add_dependency "cocaine", ">= 0.5.1"
|
22
|
+
spec.add_dependency "nokogiri", ">= 1.4.2"
|
23
|
+
|
24
|
+
spec.add_development_dependency "bundler", ">= 1.3"
|
25
|
+
spec.add_development_dependency "rake"
|
26
|
+
spec.add_development_dependency "rspec"
|
27
|
+
spec.add_development_dependency "ruby-prof"
|
28
|
+
# spec.add_development_dependency "posix-spawn"
|
29
|
+
|
30
|
+
end
|
Binary file
|
@@ -0,0 +1,24 @@
|
|
1
|
+
require 'nokogiri'
|
2
|
+
|
3
|
+
class DaisyDiff::Result
|
4
|
+
|
5
|
+
attr_reader :html
|
6
|
+
|
7
|
+
def initialize(result_text)
|
8
|
+
doc = Nokogiri::HTML.parse result_text
|
9
|
+
body = doc.css('body')
|
10
|
+
body.css('script').remove
|
11
|
+
body.css('div.diff-topbar').remove
|
12
|
+
|
13
|
+
body.xpath("//@*[starts-with(name(.), 'on')]").remove # Remove any daisy diff ui js handler
|
14
|
+
# body.xpath('//@id').remove
|
15
|
+
# body.xpath('//@changeid').remove
|
16
|
+
# body.xpath('//@previous').remove
|
17
|
+
# body.xpath('//@next').remove
|
18
|
+
|
19
|
+
# body.xpath('//@changes').remove
|
20
|
+
|
21
|
+
@html = body.inner_html
|
22
|
+
end
|
23
|
+
|
24
|
+
end
|
data/lib/daisydiff.rb
ADDED
@@ -0,0 +1,48 @@
|
|
1
|
+
require 'daisydiff/version'
|
2
|
+
require 'daisydiff/result'
|
3
|
+
require 'tempfile'
|
4
|
+
require 'cocaine'
|
5
|
+
|
6
|
+
module DaisyDiff
|
7
|
+
|
8
|
+
def self.strings(html_1, html_2)
|
9
|
+
begin
|
10
|
+
file_1 = create_tempfile('html_1', html_1)
|
11
|
+
file_2 = create_tempfile('html_2', html_2)
|
12
|
+
output_file = create_tempfile('html_diff')
|
13
|
+
|
14
|
+
line = Cocaine::CommandLine.new("java", "-jar :jar_path :file_1_path :file_2_path --file=:output_file_path")
|
15
|
+
# puts line.command
|
16
|
+
line.run(:jar_path => File.expand_path(File.dirname(__FILE__) + '/daisydiff/daisydiff.jar'), :file_1_path => file_1.path, :file_2_path => file_2.path, :output_file_path => output_file.path)
|
17
|
+
|
18
|
+
results = output_file.read
|
19
|
+
# rescue
|
20
|
+
#handle the error here?
|
21
|
+
ensure
|
22
|
+
close_tempfile file_1
|
23
|
+
close_tempfile file_2
|
24
|
+
close_tempfile output_file
|
25
|
+
end
|
26
|
+
|
27
|
+
end
|
28
|
+
|
29
|
+
protected
|
30
|
+
|
31
|
+
def self.create_tempfile(filename, contents=nil)
|
32
|
+
tempfile = Tempfile.new(filename)
|
33
|
+
unless contents.nil?
|
34
|
+
tempfile.write(contents)
|
35
|
+
tempfile.flush
|
36
|
+
end
|
37
|
+
tempfile
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.close_tempfile(tempfile)
|
41
|
+
unless tempfile.nil?
|
42
|
+
tempfile.close
|
43
|
+
tempfile.unlink
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
end
|
48
|
+
|
@@ -0,0 +1,64 @@
|
|
1
|
+
# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
|
2
|
+
require 'spec_helper'
|
3
|
+
|
4
|
+
require 'cocaine'
|
5
|
+
require 'ruby-prof'
|
6
|
+
require 'benchmark'
|
7
|
+
|
8
|
+
|
9
|
+
describe "DaisyDiff" do
|
10
|
+
it "works?" do
|
11
|
+
html1 = <<-HTML
|
12
|
+
<p>I got some text here.<p>
|
13
|
+
HTML
|
14
|
+
|
15
|
+
html2 = <<-HTML
|
16
|
+
<p>I got <i>even more</i> text here.</p>
|
17
|
+
HTML
|
18
|
+
|
19
|
+
puts DaisyDiff.strings(html1, html2)
|
20
|
+
|
21
|
+
end
|
22
|
+
|
23
|
+
it "works again" do
|
24
|
+
file_1 = File.new File.expand_path(File.dirname(__FILE__) + '/fixtures/example_1_1.html')
|
25
|
+
file_2 = File.new File.expand_path(File.dirname(__FILE__) + '/fixtures/example_1_2.html')
|
26
|
+
|
27
|
+
# RubyProf.start
|
28
|
+
|
29
|
+
before = get_memory_usage
|
30
|
+
puts "BEFORE: #{before}"
|
31
|
+
|
32
|
+
Benchmark.bm do |x|
|
33
|
+
x.report("diff") {
|
34
|
+
100.times {
|
35
|
+
benchmark_test(file_1, file_2)
|
36
|
+
}
|
37
|
+
}
|
38
|
+
end
|
39
|
+
|
40
|
+
after = get_memory_usage
|
41
|
+
puts "AFTER: #{after}"
|
42
|
+
puts "DIFF: #{after-before}"
|
43
|
+
|
44
|
+
# result = RubyProf.stop
|
45
|
+
# printer = RubyProf::GraphHtmlPrinter.new(result)
|
46
|
+
# printer.print(File.expand_path(File.dirname(__FILE__) + '/prof.html'), :min_percent => (ENV['MIN_PERCENT'] || 0.1).to_f)
|
47
|
+
|
48
|
+
# printer = RubyProf::GraphPrinter.new(result)
|
49
|
+
# printer.print(STDOUT, :min_percent => 2)
|
50
|
+
|
51
|
+
end
|
52
|
+
|
53
|
+
|
54
|
+
def get_memory_usage
|
55
|
+
`ps -o rss= -p #{Process.pid}`.to_i
|
56
|
+
end
|
57
|
+
|
58
|
+
def benchmark_test(file_1, file_2)
|
59
|
+
output_file = Tempfile.new('example_1_diff.html')
|
60
|
+
line = Cocaine::CommandLine.new("java", "-jar :jar_path :file_1_path :file_2_path --file=:output_file_path")
|
61
|
+
line.run(:jar_path => File.expand_path(File.dirname(__FILE__) + '/../lib/daisydiff/daisydiff.jar'), :file_1_path => file_1.path, :file_2_path => file_2.path, :output_file_path => output_file.path)
|
62
|
+
end
|
63
|
+
|
64
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
<p>I got some text here.<p>
|
@@ -0,0 +1 @@
|
|
1
|
+
<p>I got <i>even more</i> text here.</p>
|
data/spec/spec_helper.rb
ADDED
@@ -0,0 +1,12 @@
|
|
1
|
+
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
|
2
|
+
$LOAD_PATH.unshift(File.dirname(__FILE__))
|
3
|
+
require 'rspec'
|
4
|
+
require 'daisydiff'
|
5
|
+
|
6
|
+
# Requires supporting files with custom matchers and macros, etc,
|
7
|
+
# in ./support/ and its subdirectories.
|
8
|
+
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
|
9
|
+
|
10
|
+
RSpec.configure do |config|
|
11
|
+
|
12
|
+
end
|
metadata
ADDED
@@ -0,0 +1,148 @@
|
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
|
+
name: daisydiff
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.0.1
|
5
|
+
platform: ruby
|
6
|
+
authors:
|
7
|
+
- Sanjay Ginde
|
8
|
+
autorequire:
|
9
|
+
bindir: bin
|
10
|
+
cert_chain: []
|
11
|
+
date: 2013-09-27 00:00:00.000000000 Z
|
12
|
+
dependencies:
|
13
|
+
- !ruby/object:Gem::Dependency
|
14
|
+
name: cocaine
|
15
|
+
requirement: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - '>='
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: 0.5.1
|
20
|
+
type: :runtime
|
21
|
+
prerelease: false
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
23
|
+
requirements:
|
24
|
+
- - '>='
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: 0.5.1
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: nokogiri
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - '>='
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 1.4.2
|
34
|
+
type: :runtime
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - '>='
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: 1.4.2
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: bundler
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - '>='
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: '1.3'
|
48
|
+
type: :development
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - '>='
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '1.3'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: rake
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - '>='
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '0'
|
62
|
+
type: :development
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - '>='
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: '0'
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: rspec
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - '>='
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :development
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - '>='
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: ruby-prof
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - '>='
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '0'
|
90
|
+
type: :development
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - '>='
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '0'
|
97
|
+
description: A simple ruby wrapper for Daisy Diff.
|
98
|
+
email:
|
99
|
+
- sanjayginde@gmail.com
|
100
|
+
executables: []
|
101
|
+
extensions: []
|
102
|
+
extra_rdoc_files: []
|
103
|
+
files:
|
104
|
+
- .gitignore
|
105
|
+
- .rspec
|
106
|
+
- Gemfile
|
107
|
+
- LICENSE.txt
|
108
|
+
- README.md
|
109
|
+
- Rakefile
|
110
|
+
- daisydiff.gemspec
|
111
|
+
- lib/daisydiff.rb
|
112
|
+
- lib/daisydiff/daisydiff.jar
|
113
|
+
- lib/daisydiff/result.rb
|
114
|
+
- lib/daisydiff/version.rb
|
115
|
+
- spec/daisydiff_spec.rb
|
116
|
+
- spec/fixtures/example_1_1.html
|
117
|
+
- spec/fixtures/example_1_2.html
|
118
|
+
- spec/spec_helper.rb
|
119
|
+
homepage: http://github.com/sanjayginde/daisydiff
|
120
|
+
licenses:
|
121
|
+
- MIT
|
122
|
+
metadata: {}
|
123
|
+
post_install_message:
|
124
|
+
rdoc_options: []
|
125
|
+
require_paths:
|
126
|
+
- lib
|
127
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
128
|
+
requirements:
|
129
|
+
- - '>='
|
130
|
+
- !ruby/object:Gem::Version
|
131
|
+
version: '0'
|
132
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
133
|
+
requirements:
|
134
|
+
- - '>='
|
135
|
+
- !ruby/object:Gem::Version
|
136
|
+
version: '0'
|
137
|
+
requirements: []
|
138
|
+
rubyforge_project:
|
139
|
+
rubygems_version: 2.0.0
|
140
|
+
signing_key:
|
141
|
+
specification_version: 4
|
142
|
+
summary: Basic implementation that utilizes the daisydiff.jar via command line and
|
143
|
+
temp files.
|
144
|
+
test_files:
|
145
|
+
- spec/daisydiff_spec.rb
|
146
|
+
- spec/fixtures/example_1_1.html
|
147
|
+
- spec/fixtures/example_1_2.html
|
148
|
+
- spec/spec_helper.rb
|