excesselt 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excesselt (1.0.0)
+    excesselt (1.1.0)
       builder (= 2.1.2)
       nokogiri (= 1.4.3.1)
 

data/excesselt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{excesselt}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Heath"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2010-11-09}
   s.description = %q{I had a lot of XML transformation to do and the requirements kept changing, so I sat down and wrote something that was easy to modify.}
   s.email = %q{daniel.r.heath@gmail.com}
   s.extra_rdoc_files = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
      "script/console",
      "script/destroy",
      "script/generate",
+     "spec/element_wrapper_spec.rb",
      "spec/excesselt_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/matchers/dom_matcher.rb",
@@ -60,7 +61,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Helps you to transform XML without using XSLT.}
   s.test_files = [
-    "spec/excesselt_spec.rb",
+    "spec/element_wrapper_spec.rb",
+     "spec/excesselt_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/matchers/dom_matcher.rb"
   ]

data/lib/excesselt/rule.rb

@@ -34,10 +34,10 @@ module Excesselt
       @extensions.each {|e| wrapper.extend e }
       wrapper.instance_eval(&@block)
     rescue Exception => e
-      if e.message =~ /With Included Modules/
+      if e.message =~ /With selector .* and included modules/
         raise e
       else
-        raise e.class, "With Included Modules: #{@extensions.inspect}\n#{e.message}\n#{e.backtrace.join("\n")}"
+        raise e.class, "With selector #{selector} and included modules: #{@extensions.inspect}\n#{e.message}\n#{e.backtrace.join("\n")}"
       end
     end
     

data/lib/excesselt/stylesheet.rb

@@ -7,15 +7,18 @@ module Excesselt
     def self.transform(xml)
       self.new.transform(xml)
     end
-  
-    def initialize
-      @builder = Builder::XmlMarkup.new
-      @helper_modules = []
-      @errors = []
+
+    def initialize(options={})
+      @builder = options[:builder] || Builder::XmlMarkup.new
+      @helper_modules = options[:helper_modules] || []
+      @errors = options[:errors] || []
     end
   
+    # Pass in a string or a Nokogiri Node or Document.
     def transform(xml)
-      generate_element(Nokogiri::XML(xml, nil, nil, Nokogiri::XML::ParseOptions.new).root)
+      xml = xml.root if xml.is_a? Nokogiri::XML::Document
+      xml = Nokogiri::XML(xml, nil, nil, Nokogiri::XML::ParseOptions.new).root unless xml.is_a? Nokogiri::XML::Node
+      generate_element(xml)
     end
 
     def generate_element(element)

data/lib/excesselt.rb

@@ -1,9 +1,9 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Excesselt
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end
 
 require 'excesselt/stylesheet'
 require 'excesselt/rule'
-require 'excesselt/element_wrapper'
+require 'excesselt/element_wrapper'

data/spec/element_wrapper_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Excesselt::ElementWrapper do
+  
+  before do
+    @stylesheet = Object.new
+    @element = Object.new
+    @builder = Object.new
+    @wrapper = Excesselt::ElementWrapper.new(@stylesheet, @element, @builder)
+  end
+  
+  describe "passing through method calls" do
+    describe "when an error is raised in a passed through call" do
+      it "should raise an error" do
+        lambda {
+          @wrapper.foo
+        }.should raise_exception      
+      end
+    end
+  end
+  
+end

data/spec/excesselt_spec.rb

@@ -80,7 +80,7 @@ describe "excesselt" do
           <parent class="explode">foo</parent>
         XML
         @instance = @stylesheet.new
-        lambda { @instance.transform(xml) }.should raise_exception {|e| e.message.should =~ /With Included Modules: \[TestHelper\]/}
+        lambda { @instance.transform(xml) }.should raise_exception {|e| e.message.should =~ /With selector .* and included modules: \[TestHelper\]/}
       end
       
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excesselt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Heath
@@ -15,13 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +11:00
+date: 2010-11-09 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: nokogiri
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,10 +32,10 @@ dependencies:
         - 1
         version: 1.4.3.1
   requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
   type: :runtime
-  name: builder
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,10 +48,10 @@ dependencies:
         - 2
         version: 2.1.2
   requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: builder
   prerelease: false
-  type: :development
-  name: activesupport
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,10 +62,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
   type: :development
-  name: rake
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,10 +76,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
   type: :development
-  name: rspec
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,10 +92,10 @@ dependencies:
         - 0
         version: 2.0.0
   requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
-  name: rcov
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,10 +106,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
   type: :development
-  name: ruby-debug
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,10 +120,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-- !ruby/object:Gem::Dependency 
+  name: ruby-debug
   prerelease: false
   type: :development
-  name: jeweler
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -137,6 +134,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
+  name: jeweler
+  prerelease: false
+  type: :development
 description: I had a lot of XML transformation to do and the requirements kept changing, so I sat down and wrote something that was easy to modify.
 email: daniel.r.heath@gmail.com
 executables: []
@@ -178,6 +178,7 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- spec/element_wrapper_spec.rb
 - spec/excesselt_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/dom_matcher.rb
@@ -222,6 +223,7 @@ signing_key:
 specification_version: 3
 summary: Helps you to transform XML without using XSLT.
 test_files: 
+- spec/element_wrapper_spec.rb
 - spec/excesselt_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/dom_matcher.rb