dirb 1.0.0 → 1.1.0

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+*.swp

data/CHANGELOG

@@ -0,0 +1,5 @@
+== 1.0.1 ==
+* Compatibility with ruby 1.8.6 and 1.9
+
+== 1.0.0 ==
+* HTML output and better documentation

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 Sam Goldstein
+
+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

@@ -40,26 +40,28 @@ Here's an example of using Dirb to diff two strings
 Outputing the diff as html is easy too.
 
     >> puts Dirb::Diff.new(string1, string2).to_s(:html)
-    <ul class="diff">
-      <li class="del"><del>Hello how are you</del></li>
-      <li class="ins"><ins>Hello how are you?</ins></li>
-      <li class="unchanged"><span>I'm fine</span></li>
-      <li class="del"><del>That's great</del></li>
-      <li class="ins"><ins>That's swell</ins></li>
-    </ul>
+    <div class="diff">
+      <ul>
+        <li class="del"><del>Hello how are you</del></li>
+        <li class="ins"><ins>Hello how are you?</ins></li>
+        <li class="unchanged"><span>I'm fine</span></li>
+        <li class="del"><del>That's great</del></li>
+        <li class="ins"><ins>That's swell</ins></li>
+      </ul>
+    </div>
 
 Then try adding this css to your stylesheets:
 
-  .diff{overflow:auto;}
-  .diff ul{background:#fff;overflow:auto;font-size:13px;list-style:none;margin:0;padding:0;display:table;width:100%;}
-  .diff del, .diff ins{display:block;text-decoration:none;}
-  .diff li{padding:0; display:table-row;margin: 0;}
-  .diff li.ins{background:#9f9;}
-  .diff li.del{background:#ccf;}
-  .diff li:hover{background:#ffc}
-  .diff del, .diff ins, .diff span{white-space:pre;font-family:courier;}
+    .diff{overflow:auto;}
+    .diff ul{background:#fff;overflow:auto;font-size:13px;list-style:none;margin:0;padding:0;display:table;width:100%;}
+    .diff del, .diff ins{display:block;text-decoration:none;}
+    .diff li{padding:0; display:table-row;margin: 0;}
+    .diff li.ins{background:#9f9;}
+    .diff li.del{background:#ccf;}
+    .diff li:hover{background:#ffc}
+    .diff del, .diff ins, .diff span{white-space:pre;font-family:courier;}
 
-Dirb::Diff also alows you to set a default format.  Here we set the default to
+`Dirb::Diff` also alows you to set a default format.  Here we set the default to
 use ANSI termnial color escape sequences.
 
     >> Dirb::Diff.default_format = :color

data/Rakefile

@@ -7,6 +7,7 @@ task :default => :spec
 desc "Run all specs in spec directory"
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w{--color --format profile}
 end
 
 Rake::RDocTask.new do |rd|
@@ -19,7 +20,6 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = %q{dirb}
-    s.version = "0.1.0"
 
     s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
     s.authors = ["Sam Goldstein"]

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/dirb.gemspec

@@ -1,22 +1,26 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dirb}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-10-15}
   s.description = %q{Convenient diffing in ruby}
   s.email = %q{sgrock@gmail.com}
   s.extra_rdoc_files = [
-    "README.md"
+    "LICENSE",
+     "README.md"
   ]
   s.files = [
-    "README.md",
+    ".gitignore",
+     "CHANGELOG",
+     "LICENSE",
+     "README.md",
      "Rakefile",
      "VERSION",
      "dirb.gemspec",
@@ -26,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/samg/dirb/tree/master}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A convenient way to diff string in ruby}
   s.test_files = [
     "spec/dirb_spec.rb"
@@ -36,9 +40,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+

data/lib/dirb.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'tempfile'
 require 'open3'
+require 'erb'
 module Dirb
   class Diff
     class << self
@@ -25,7 +26,9 @@ module Dirb
     end
 
     def each &block
-      diff.each_line.reject{|x| x =~ /^---|\+\+\+|@@/ }.each &block
+      diff.split("\n").reject{|x| x =~ /^---|\+\+\+|@@/ }.each do |line| 
+        block.call line + "\n"
+      end
     end
 
     def tempfile(string)
@@ -37,9 +40,9 @@ module Dirb
 
     def to_s(format = nil)
       format ||= self.class.default_format
-      formats = Format.instance_methods(false)
+      formats = Format.instance_methods(false).map{|x| x.to_s}
       if formats.include? format.to_s
-        enum = self.each
+        enum = self.to_a
         enum.extend Format
         enum.send format
       else
@@ -79,11 +82,11 @@ module Dirb
         lines = map do |line|
           case line
           when /^\+/
-            '    <li class="ins"><ins>' + line.gsub(/^./, '').chomp + '</ins></li>'
+            '    <li class="ins"><ins>' + ERB::Util.h(line.gsub(/^./, '').chomp) + '</ins></li>'
           when /^-/
-            '    <li class="del"><del>' + line.gsub(/^./, '').chomp + '</del></li>'
+            '    <li class="del"><del>' + ERB::Util.h(line.gsub(/^./, '').chomp) + '</del></li>'
           when /^ /
-            '    <li class="unchanged"><span>' + line.gsub(/^./, '').chomp + '</span></li>'
+            '    <li class="unchanged"><span>' + ERB::Util.h(line.gsub(/^./, '').chomp) + '</span></li>'
           end
         end
         %'<div class="diff">\n  <ul>\n#{lines.join("\n")}\n  </ul>\n</div>\n'

data/spec/dirb_spec.rb

@@ -135,6 +135,21 @@ baz
           DIFF
       end
     end
+
+    it "should escape diffed html in html output" do
+      diff = Dirb::Diff.new("<script>alert('bar')</script>", "<script>alert('foo')</script>").to_s(:html)
+      diff.should include('&lt;script&gt;')
+      diff.should_not include('<script>')
+    end
+
+    it "should be easy to generate custom format" do
+      Dirb::Diff.new("foo\nbar\n", "foo\nbar\nbaz\n").map do |line|
+        case line
+        when /^\+/ then "line #{line.chomp} added"
+        when /^-/ then "line #{line.chomp} removed"
+        end
+      end.compact.join.should == "line +baz added"
+    end
   end
 end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dirb
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,8 +26,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.md
 files: 
+- .gitignore
+- CHANGELOG
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -39,21 +49,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A convenient way to diff string in ruby