insert_into 0.0.2 → 0.1.0

data/README.rdoc

@@ -2,7 +2,17 @@
 
 Insert some random text into XML/HTML.
 
-InsertInto.insert("My Text").into("<tag></tag>").between_tag("tag").process
+InsertInto.new.insert("text").into("<wrapper><tag/></wrapper>").between_tag("tag").process
+
+Results in:
+
+<wrapper><tag>text</tag></wrapper>
+
+Supports:
+
+between_tag
+before_tag
+after_tag
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/insert_into.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{insert_into}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Hart"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-04-02}
   s.description = %q{Insert text into XML/HTML.}
   s.email = %q{richard@ur-ban.com}
   s.extra_rdoc_files = [

data/lib/insert_into.rb

@@ -1,14 +1,15 @@
 class InsertInto
 
   require 'rubygems'
-  require 'nokogiri'
+  require 'hpricot'
 
-  attr_reader :insert_text, :into_text, :target_tag
+  attr_reader :insert_text, :into_text, :target_tag, :type
 
   def initialize
     @insert_text = ""
-    @into_text = Nokogiri::XML.parse("")
+    @into_text = Hpricot("")
     @target_tag = ""
+    @type = :between
   end
 
   def insert insert_text
@@ -17,23 +18,42 @@ class InsertInto
   end
 
   def into into_text
-    @into_text = Nokogiri::XML.parse(into_text)
+    @into_text = Hpricot(into_text)
     self
   end
 
   def into_text
-    @into_text.root.to_s.gsub(/[ \n]/,'')
+    @into_text.to_s.gsub(/[ \n]/,'')
   end
 
   def between_tag target_tag
     @target_tag = target_tag
+    @type = :between
+    self
+  end
+
+  def before_tag target_tag
+    @target_tag = target_tag
+    @type = :before
+    self
+  end
+
+  def after_tag target_tag
+    @target_tag = target_tag
+    @type = :after
     self
   end
 
   def process
     return @insert_text << into_text if @target_tag.empty?
-    @into_text.search("//#{@target_tag}").each do |node|
-      node.content = @insert_text
+    @into_text.search(@target_tag) do |node|
+      if @type == :after
+        node.after insert_text
+      elsif @type == :before
+        node.before insert_text
+      else
+        node.inner_html insert_text
+      end
     end
     into_text
   end

data/spec/insert_into_spec.rb

@@ -50,13 +50,23 @@ describe InsertInto do
   end
 
   it "should insert text into a string if target tag is supplied" do
-    result = InsertInto.new.insert("insert").into("<into/>").between_tag("into").process
-    result.should == "<into>insert</into>"
+    result = InsertInto.new.insert("<foo>insert</foo>").into("<into/>").between_tag("into").process
+    result.should == "<into><foo>insert</foo></into>"
   end
 
   it "should insert text multiple times into a string if target tag is supplied" do
-    result = InsertInto.new.insert("insert").into("<wrapper><into/><into/></wrapper>").between_tag("into").process
-    result.should == "<wrapper><into>insert</into><into>insert</into></wrapper>"
+    result = InsertInto.new.insert("<foo>insert</foo>").into("<bar><into/><into/></bar>").between_tag("into").process
+    result.should == "<bar><into><foo>insert</foo></into><into><foo>insert</foo></into></bar>"
+  end
+
+  it "should insert text before a tag" do
+    result = InsertInto.new.insert("<foo>insert</foo>").into("<bar><into/></bar>").before_tag("into").process
+    result.should == "<bar><foo>insert</foo><into/></bar>"
+  end
+
+  it "should insert text after a tag" do
+    result = InsertInto.new.insert("<foo>insert</foo>").into("<bar><into/></bar>").after_tag("into").process
+    result.should == "<bar><into/><foo>insert</foo></bar>"
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Richard Hart
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +01:00
+date: 2010-04-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency