js-code-wrapper 0.1.1 → 0.1.2

data/Gemfile

@@ -4,4 +4,5 @@ group :development do
   gem "rspec"
   gem "rake"
   gem "jeweler"
+  gem "nokogiri"
 end

data/Gemfile.lock

@@ -7,6 +7,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    nokogiri (1.5.0)
     rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -22,5 +23,6 @@ PLATFORMS
 
 DEPENDENCIES
   jeweler
+  nokogiri
   rake
   rspec

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/js-code-wrapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "js-code-wrapper"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dom1nga"]
-  s.date = "2011-11-28"
+  s.date = "2011-11-29"
   s.description = "Usage: wrap_js_code('<script>alert('wrap me!');</script>') # => '<code><script>alert('wrap me!');</script></code>'"
   s.email = "beloved.dom1nga@gmail.com"
   s.extra_rdoc_files = [
@@ -43,15 +43,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end
 

data/lib/js-code-wrapper.rb

@@ -1,41 +1,11 @@
+require 'nokogiri'
+
 module JsCodeWrapper
   def wrap_js_code(text)
-    code_coords = code_tag_coords(text)
-    matches_count = script_to_code_tags_inclusion(text, code_coords).count {|t| !t[1]}
-
-    while matches_count > 0 do
-      text = insert_code_tags(text, code_coords)
-      matches_count = matches_count - 1
-      code_coords = code_tag_coords(text)
-    end
-
-    text
-  end
-
-  private
-
-  def code_tag_coords(text)
-    code_begin = text.to_enum(:scan,/(<code)/i).map { |m,| $`.size }
-    code_end = text.to_enum(:scan,/(<\/code>)/i).map { |m,| $`.size }
-    0.upto(code_begin.length - 1).map {|i| [code_begin[i], code_end[i]] }
+    doc = ::Nokogiri::HTML("<text>#{text}</text>")
+    doc.xpath("//script[not(ancestor::code)] | //*/@*[starts-with(name(.), 'on')]/..").wrap('<code>')
+    doc.xpath("//body/*").to_s.scan(/<text>(.*)<\/text>/im)[0][0]
   end
-
-  def script_to_code_tags_inclusion(text, code_coords)
-    text.to_enum(:scan,/(<script{1}[^<]*<\/script>{1})/i).map { |m,| $`.size }.map { |v| [v, code_coords.map{|c| c[0] < v && v < c[1] }.compact.any?] }
-  end
-
-  def insert_code_tags(text, code_coords)
-    matches = text.gsub /(<script{1}[^<]*<\/script>{1})/i
-
-    script_to_code_tags_inclusion(text, code_coords).each do |b|
-      tmp = matches.next
-      unless b[1]
-        text[b[0]..(b[0]+tmp.length-1)] = '<code>'+ tmp +'</code>'
-        return text
-      end
-    end
-  end
-
 end
 
 Object.send(:include, JsCodeWrapper)

data/spec/lib/js_code_wrapper_spec.rb

@@ -4,28 +4,43 @@ describe JsCodeWrapper do
 
   describe "#wrap_js_code" do
     it "should return the text without changes, if it doesn't contains script tags" do
-      wrap_js_code("text <p>text</p><h1>text</h1>").should == "text <p>text</p><h1>text</h1>"
+      wrap_js_code("text <p>text</p><h1>text</h1>").should ==
+                   "text <p>text</p>\n<h1>text</h1>"
     end
 
     it "should return the text with script body (type1) wrapped into code tags" do
-      wrap_js_code("<script>alert('wrap me!')</script>").should == "<code><script>alert('wrap me!')</script></code>"
+      wrap_js_code("<script>alert('wrap me!')</script>").should ==
+                   "<code><script>alert('wrap me!')</script></code>"
     end
 
     it "should return the text with script body (type2) wrapped into code tags" do
-      wrap_js_code('<script type="text/javascript" src="example.com/example.js"></script>').should == '<code><script type="text/javascript" src="example.com/example.js"></script></code>'
+      wrap_js_code('<script type="text/javascript" src="example.com/example.js"></script>').should ==
+                   '<code><script type="text/javascript" src="example.com/example.js"></script></code>'
     end
 
     it "should return the text with script body wrapped into code tags when script body duplicated in text" do
       wrap_js_code('<code><script>alert("wrap me!")</script></code><script>alert("wrap me!")</script>').should ==
-      '<code><script>alert("wrap me!")</script></code><code><script>alert("wrap me!")</script></code>'
+                   '<code><script>alert("wrap me!")</script></code><code><script>alert("wrap me!")</script></code>'
     end
 
     it "should return the text with script body wrapped into code tags" do
-      wrap_js_code("<code><script>alert('wrap me1!')</script><script type='text/javascript' src='example.com/example1.js'></script></code><p>text1</p><script>alert('wrap me2!')</script><script type='text/javascript' src='example.com/example2.js'></script><code><script>alert('wrap me3!')</script></code>").should == "<code><script>alert('wrap me1!')</script><script type='text/javascript' src='example.com/example1.js'></script></code><p>text1</p><code><script>alert('wrap me2!')</script></code><code><script type='text/javascript' src='example.com/example2.js'></script></code><code><script>alert('wrap me3!')</script></code>"
+      wrap_js_code("<code><script>alert('wrap me1!')</script><script type='text/javascript' src='example.com/example1.js'></script></code><p>text1</p><script>alert('wrap me2!')</script><script type='text/javascript' src='example.com/example2.js'></script><code><script>alert('wrap me3!')</script></code>").should ==
+                   "<code><script>alert('wrap me1!')</script><script type=\"text/javascript\" src=\"example.com/example1.js\"></script></code><p>text1</p>\n<code><script>alert('wrap me2!')</script></code><code><script type=\"text/javascript\" src=\"example.com/example2.js\"></script></code><code><script>alert('wrap me3!')</script></code>"
     end
 
     it "should return the text without changes, if script body into code tags" do
-      wrap_js_code("<code><script>alert('wrap me!')</script></code>").should == "<code><script>alert('wrap me!')</script></code>"
+      wrap_js_code("<code><script>alert('wrap me!')</script></code>").should ==
+                   "<code><script>alert('wrap me!')</script></code>"
+    end
+
+    it "should return the text with link wrapped into code tags if link contains event attribute" do
+      wrap_js_code('<a href="#" onclick="alert(\'wrap me!\'); return 0;">link</a>').should ==
+                   "<code><a href=\"#\" onclick=\"alert('wrap me!'); return 0;\">link</a></code>"
+    end
+
+    it "should return the text with tags without changes if tags not contains event attributes" do
+      wrap_js_code('<a href="#">link</a><div class="div1"></div><p>text1</p>').should ==
+                   "<a href=\"#\">link</a><div class=\"div1\"></div>\n<p>text1</p>"
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-code-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - dom1nga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -59,6 +59,20 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: nokogiri
+  prerelease: false
+  type: :development
 description: "Usage: wrap_js_code('<script>alert('wrap me!');</script>') # => '<code><script>alert('wrap me!');</script></code>'"
 email: beloved.dom1nga@gmail.com
 executables: []