dirb 1.0.1 → 1.1.0

data/Rakefile

@@ -20,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.1
+1.1.0

data/dirb.gemspec

@@ -1,15 +1,15 @@
 # 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.1"
+  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-07-03}
+  s.date = %q{2010-10-15}
   s.description = %q{Convenient diffing in ruby}
   s.email = %q{sgrock@gmail.com}
   s.extra_rdoc_files = [
@@ -30,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"
@@ -40,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
@@ -81,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

@@ -136,6 +136,12 @@ baz
       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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dirb
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  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-07-03 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -43,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