peachy 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,14 @@
+== 0.3.2
+* Minor improvements
+  * Better support for Ruby 1.8.6
+  * Better implementation of MorphIntoArray, which introduced the Mimic module.
+  * Standardised to_s implementations to return the encapsulated XML from Proxies.
+
+== 0.3.1
+* Minor improvements
+  * Should now work on 1.8.6, so removed minimum rqeuirement of Ruby version 1.8.7
+  * Tweaked some implementation details.
+
 == 0.3.0
 
 * Major improvements
@@ -7,7 +18,6 @@
 * Minor improvements
   * Improved implementation of NokogiriWrapper.
 
-
 == 0.2.1
 
 * Major improvements
@@ -16,11 +26,9 @@
   * Only children can now be treated as if they are arrays in any way, morphing into
     an array if treated as an array.
 
-
 == 0.2.0
 
 * Major improvements
   * Can now treat only children as if they are the first element in an array.
   * Console output is now configurable.
   * Test specs are now included in gem.
-

data/README.rdoc

@@ -28,7 +28,8 @@ node name:
     puts 'Contents: ' + proxy.xml.node.value
     -> Contents: Peachy
 
-Either .value or .to_s can be called to get the contents of the current node.
+Call #value on a childless node to get the contents the node, such as the example
+above.
 
 Peachy expects method names to be called in the Ruby convention of lowercase with
 underscores.  It will do it's best to match method names to elements and attributes
@@ -37,15 +38,23 @@ or hyphen-separated-names)
 
 More detailed usage examples can be found in the .rb files in the /test directory.
 
-=== XML parsing
+=== Getting the underlying XML
+It's possible to call #to_s on any node in the tree to get the underlying XML at
+that point in the tree, such as:
+
+    puts 'XML: ' + proxy.xml.node
+    -> <node>Peachy</node>
+
+The exact representation of the XML will depend on the underlying XML parser that 
+is being used, but the XML will be valid and correct.
 
+=== XML parsing
 Peachy tries to determine which XML parser to load when it is first used.  Nokogiri
 is currently the first choice, defaulting to REXML if Nokogiri is not available.
 It's possible to extend this out so let me know if there are any other XML parsers
 that you'd like Peachy to support.
 
 === Elements and Attributes
-
 Currently, elements and attributes are accessed in almost exactly the same way;
 call a method on your current node matching the attribute or element name that
 is required next.  Elements need to have .value or .to_s called on them to get
@@ -63,7 +72,6 @@ Peachy is just for slurping XML, so this convention should make it easy to know
 how to access the property that you're after, be they elements or attributes.
 
 === No method name match
-
 Peachy is currently short-tempered, in that if no element or attribute match is
 found when drilling down through proxies, a NoMatchingXmlPart error will be
 raised.

data/lib/method_not_in_ruby_convention.rb

@@ -1,6 +1,6 @@
 class MethodNotInRubyConvention < Exception
   def initialize method_name
-    super(MessageTemplate.gsub /method_name/, method_name.to_s)
+    super(MessageTemplate.gsub(/method_name/, method_name.to_s))
   end
 
   private

data/lib/nothing_to_mimic.rb

@@ -0,0 +1,2 @@
+class NothingToMimic < Exception
+end

data/lib/peachy.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'already_an_only_child')
 require File.join(File.dirname(__FILE__), 'invalid_proxy_parameters')
 require File.join(File.dirname(__FILE__), 'method_not_in_ruby_convention')
 require File.join(File.dirname(__FILE__), 'no_matching_xml_part')
-require File.join(File.dirname(__FILE__), 'peachy/convention_checks')
+require File.join(File.dirname(__FILE__), 'nothing_to_mimic')
 require File.join(File.dirname(__FILE__), 'peachy/string_styler')
 require File.join(File.dirname(__FILE__), 'peachy/method_name')
 require File.join(File.dirname(__FILE__), 'peachy/method_mask')
@@ -23,8 +23,6 @@ require File.join(File.dirname(__FILE__), 'peachy/proxy')
 require File.join(File.dirname(__FILE__), 'peachy/proxy_factory')
 require File.join(File.dirname(__FILE__), 'peachy/childless_proxy_with_attributes')
 
-# first up, load the underlying XML parser that Peachy will use
-
 module Peachy
   def self.whine
     @whine = true

data/lib/peachy/childless_proxy_with_attributes.rb

@@ -8,7 +8,7 @@ module Peachy
 
     private
     def generate_method_for_xml method_name
-      check_for_convention(method_name)
+      method_name.check_for_convention
       create_method_for_attribute(method_name) {|match| no_matching_xml(method_name) if match.nil? }
     end
   end

data/lib/peachy/method_mask.rb

@@ -3,9 +3,7 @@ module Peachy
     private
     def hide_public_methods exceptions
       methods_to_hide = public_instance_methods.clone
-      exceptions.each do |to_stay_public|
-        methods_to_hide.delete(to_stay_public)
-      end
+      exceptions.each {|stay_public| methods_to_hide.delete(stay_public) }
       private *methods_to_hide
     end
   end

data/lib/peachy/method_name.rb

@@ -15,6 +15,13 @@ module Peachy
       end).uniq
     end
 
+    # Checks whether the method name is in the accepted convention, raising a
+    # MethodNotInRubyConvention if it's not.  This check does not allow method
+    # names to have question marks, exclamation marks or numbers, however.
+    def check_for_convention
+      raise MethodNotInRubyConvention.new(self) unless matches_convention?
+    end
+
     def to_s
       return @method_name
     end
@@ -27,5 +34,12 @@ module Peachy
     def variation_methods
       Peachy::StringStyler.private_instance_methods
     end
+
+    # Checks whether the method name matches the Ruby convention of lowercase with
+    # underscores.  This method does not allow question marks, excalmation marks
+    # or numbers, however.
+    def matches_convention?
+      !(@method_name =~ /^[a-z]+(?:_[a-z]+){0,}$/).nil?
+    end
   end
 end

data/lib/peachy/mimic.rb

@@ -1,7 +1,11 @@
 module Peachy
   module Mimic
+    def mimic
+      raise NothingToMimic.new
+    end
+    
     def method_missing method_name, *args, &block
-      @mimicked.send(method_name, *args, &block)
+      mimic.send(method_name, *args, &block)
     end
   end
 end

data/lib/peachy/morph_into_array.rb

@@ -10,14 +10,16 @@ module Peachy
     end
 
     def mimic object_to_mimic
-      @mimicked = object_to_mimic
-      eval_on_singleton_class { include Mimic }
+      eval_on_singleton_class do
+        define_method(:mimic) { object_to_mimic }
+        include Mimic
+      end
     end
 
     def morph_into_array to_add_to_array, method_to_invoke, *args, &block
       puts "[Peachy::Proxy] Currently acts as #{@acts_as}" if Peachy.whiny?
-      raise AlreadyAnOnlyChild.new(node_name) if is_an_only_child
-      puts "[Peachy::Proxy] So #{node_name} should be an Array, then." if Peachy.whiny?
+      raise AlreadyAnOnlyChild.new(name) if is_an_only_child
+      puts "[Peachy::Proxy] So #{name} should be an Array, then." if Peachy.whiny?
       mimic [to_add_to_array]
       return send(method_to_invoke, *args, &block)
     end

data/lib/peachy/parsers/nokogiri_wrapper.rb

@@ -45,6 +45,10 @@ module Peachy
         @nokogiri.name
       end
 
+      def to_s
+        @nokogiri.to_s
+      end
+
       private
       def xpath xpath
         @nokogiri.xpath(xpath).map{|noko_node| make_from(noko_node) }

data/lib/peachy/parsers/rexml_attribute_wrapper.rb

@@ -12,6 +12,10 @@ module Peachy
       def name
         @attribute.first
       end
+
+      def to_s
+        @attribute.last
+      end
     end
   end
 end

data/lib/peachy/parsers/rexml_wrapper.rb

@@ -37,6 +37,10 @@ module Peachy
       def name
         @rexml.name
       end
+
+      def to_s
+        @rexml.to_s
+      end
     end
   end
 end

data/lib/peachy/proxy.rb

@@ -1,7 +1,7 @@
 module Peachy
   class Proxy
     extend MethodMask
-    include ConventionChecks, MorphIntoArray, MyMetaClass, XmlNode
+    include MorphIntoArray, MyMetaClass, XmlNode
 
     # This hides all public methods on the class except for 'methods', 'nil?'
     # 'respond_to?' and 'inspect', which I've found are too useful to hide for
@@ -15,6 +15,11 @@ module Peachy
       @node = xml_node if xml_node.kind_of? Peachy::Parsers::ParserWrapper
     end
 
+    def to_s
+      return @xml unless @xml.nil?
+      node.to_s
+    end
+
     # Overloaded so that calls to methods representative of an XML element or
     # attribute can be generated dynamically.
     #
@@ -88,8 +93,8 @@ module Peachy
 
     private
     def generate_method_for_xml method_name
-      check_for_convention(method_name)
-      attribute_content = create_attribute method_name
+      method_name.check_for_convention
+      attribute_content = create_attribute(method_name)
       return attribute_content unless attribute_content.nil?
       matches = node.find_matches(method_name)
       matches.nil? ? nil : create_method_for_child_or_content(method_name, matches)
@@ -133,7 +138,7 @@ module Peachy
     end
 
     def no_matching_xml method_name
-      raise NoMatchingXmlPart.new(method_name, node_name)
+      raise NoMatchingXmlPart.new(method_name, name)
     end
   end
 end

data/lib/peachy/proxy_factory.rb

@@ -8,7 +8,7 @@ module Peachy
       end
 
       def create_content_child match
-        SimpleContent.new(match.content, match.name)
+        SimpleContent.new(match)
       end
 
       def create_proxy match

data/lib/peachy/simple_content.rb

@@ -1,26 +1,24 @@
 module Peachy
   class SimpleContent
-    alias_method :original_method_missing, :method_missing
-    attr_reader :node_name
     include MorphIntoArray, MyMetaClass
-    [:to_s, :name].each {|method_name| define_method(method_name) { value } }
 
-    def initialize value, node_name
-      @value = value
-      @node_name = node_name
+    [:name, :to_s].each {|method| define_method(method) { @xml.send(method) }}
+
+    def initialize xml
+      @xml = xml
     end
 
     def value
       acts_as_only_child
-      @value
+      @xml.content
     end
 
     def method_missing method_name, *args, &block
       if you_use_me_like_an_array(method_name, block_given?, *args)
-        new_content = SimpleContent.new(@value, @node_name)
+        new_content = SimpleContent.new(@xml)
         return morph_into_array(new_content, method_name, *args, &block)
       end
-      original_method_missing method_name, *args
+      super
     end
   end
 end

data/lib/peachy/version.rb

@@ -1,3 +1,3 @@
 module Peachy
-  VERSION = '0.3.1'
-end
+  VERSION = '0.3.2'
+end

data/lib/peachy/xml_node.rb

@@ -6,7 +6,7 @@ module Peachy
     end
 
     # Returns the name of the encapsulated node.
-    def node_name
+    def name
       node.name
     end
 

data/spec/attributes_on_a_parent_node_spec.rb

@@ -15,10 +15,10 @@ describe "attributes on a parent node" do
 
   it "should define the attribute name as a method" do
     @proxy.root.test_node.name
-    @proxy.root.test_node.methods.should include 'name'
+    @proxy.root.test_node.methods.should include('name')
   end
 
   it "should raise an error if the attirbute does not exist" do
-    lambda { @proxy.root.test_node.other }.should raise_error NoMatchingXmlPart
+    lambda { @proxy.root.test_node.other }.should raise_error(NoMatchingXmlPart)
   end
 end

data/spec/camel_case_names_spec.rb

@@ -16,7 +16,7 @@ XML
 
   it "should define a method from a camel cased element name" do
     @proxy.root.test_node.value.should == 'Check meh.'
-    @proxy.root.methods.should include 'test_node'
+    @proxy.root.methods.should include('test_node')
   end
 
   it "should match a method to an attribute by camel case" do
@@ -25,12 +25,12 @@ XML
 
   it "should define a method from camel cased attribute name" do
     @proxy.root.second_node.record_label
-    @proxy.root.second_node.methods.should include 'record_label'
+    @proxy.root.second_node.methods.should include('record_label')
   end
 
   it "should match parent attribute names" do
     @proxy.root.third_node.record_label.should == 'Wall of Sound'
-    @proxy.root.third_node.methods.should include 'record_label'
+    @proxy.root.third_node.methods.should include('record_label')
   end
 end
 

data/spec/childless_elements_referenced_as_collections_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "a childless element with attributes referenced as the first part of a collection" do
   before(:each) do
     xml = <<XML
@@ -23,26 +25,27 @@ XML
 
     element_as_array = @proxy.xml.list.item
     element_as_array.any?.should be_true
-    element_as_array.one?.should be_true
     element_as_array.empty?.should be_false
     element_as_array.size.should == 1
     element_as_array[0].value.should == 'Hello'
   end
 
   it "should raise an error if the element value has already been accessed as an only child" do
-    @proxy.xml.list.item.value
-    lambda { @proxy.xml.list.item[0] }.should raise_error AlreadyAnOnlyChild, <<MSG
+  expected_message = <<MSG
 The 'item' node has already been accessed as a single child, but you are now trying to use it as a collection.
 Do not try to access Peachy::Proxies in a mixed manner in your implementation.
 MSG
+    @proxy.xml.list.item.value
+    lambda { @proxy.xml.list.item[0] }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 
   it "should raise an error if the element's attributes have already been accessed as an only child" do
-    @proxy.xml.list.item.id
-    lambda { @proxy.xml.list.item[0] }.should raise_error AlreadyAnOnlyChild, <<MSG
+    expected_message = <<MSG
 The 'item' node has already been accessed as a single child, but you are now trying to use it as a collection.
 Do not try to access Peachy::Proxies in a mixed manner in your implementation.
 MSG
+    @proxy.xml.list.item.id
+    lambda { @proxy.xml.list.item[0] }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 end
 

data/spec/collections_with_children_as_arrays_spec.rb

@@ -26,7 +26,7 @@ STR
 
   it "should define a method for the name of the list items" do
     @peachy_proxy.xml.list.item
-    @peachy_proxy.xml.list.methods.should include 'item'
+    @peachy_proxy.xml.list.methods.should include('item')
   end
 
   it "should create the children as expected" do

data/spec/elements_referenced_as_collections_spec.rb

@@ -27,7 +27,6 @@ XML
 
     element_as_array = @proxy.xml.list.item
     element_as_array.any?.should be_true
-    element_as_array.one?.should be_true
     element_as_array.empty?.should be_false
     element_as_array.size.should == 1
     (element_as_array.map {|item| item.child.value }).should == ['one']
@@ -46,11 +45,12 @@ XML
   end
 
   it "should raise an error if the element has already been accessed as a single child" do
-    @proxy.xml.list.item.child
-    lambda { @proxy.xml.list.item[0] }.should raise_error AlreadyAnOnlyChild, <<MSG
+    expected_message = <<MSG
 The 'item' node has already been accessed as a single child, but you are now trying to use it as a collection.
 Do not try to access Peachy::Proxies in a mixed manner in your implementation.
 MSG
+    @proxy.xml.list.item.child
+    lambda { @proxy.xml.list.item[0] }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 end
 

data/spec/hyphen_separated_names_spec.rb

@@ -17,7 +17,7 @@ XML
 
   it "should define a method for the element name" do
     @proxy.test_node
-    @proxy.methods.should include 'test_node'
+    @proxy.methods.should include('test_node')
   end
 
   it "should match a method to an attribute by pascal case" do
@@ -26,12 +26,12 @@ XML
 
   it "should define a method from pascal cased attribute name" do
     @proxy.test_node.second_child.record_label
-    @proxy.test_node.second_child.methods.should include 'record_label'
+    @proxy.test_node.second_child.methods.should include('record_label')
   end
 
   it "should define a method on a parent with attributes" do
     @proxy.test_node.third_child.record_label.should == 'Rough Trade'
-    @proxy.test_node.third_child.methods.should include 'record_label'
+    @proxy.test_node.third_child.methods.should include('record_label')
   end
 
   it "should allow child nodes to be selected after an attrbiute is selected on a parent node" do

data/spec/inferring_a_method_from_an_attribute_spec.rb

@@ -13,11 +13,11 @@ describe "inferring a method from an attribute" do
 
   it "should define a method for the attribute name" do
     @proxy.test_node.another
-    @proxy.test_node.methods.should include 'another'
+    @proxy.test_node.methods.should include('another')
   end
 
   it "should raise an error if method name doesn't match an attribute name" do
-    lambda { @proxy.test_node.missing }.should raise_error NoMatchingXmlPart, "missing is not contained as a child of the node test-node."
+    lambda { @proxy.test_node.missing }.should raise_error(NoMatchingXmlPart, "missing is not contained as a child of the node test-node.")
   end
 end
 

data/spec/inferring_a_method_from_element_name_spec.rb

@@ -7,11 +7,11 @@ describe "inferring a method from an element name" do
   end
 
   it "should defer method_missing to the base class implementation if arguments are passed with the missing method" do
-    lambda { @proxy.my_call "argument" }.should raise_error NoMethodError
+    lambda { @proxy.my_call "argument" }.should raise_error(NoMethodError)
   end
 
   it "should defer method_missing to the base class implementation if block is given with method_missing" do
-    lambda { @proxy.my_call() { puts "Blockhead." } }.should raise_error NoMethodError
+    lambda { @proxy.my_call() { puts "Blockhead." } }.should raise_error(NoMethodError)
   end
 
   it "should not expose the original method_missing alias publically" do
@@ -25,8 +25,8 @@ describe "inferring a method from an element name" do
 
   it 'should define the method on an instance, not on the class' do
     @proxy.testnode
-    @proxy.methods.should include 'testnode'
-    @another_proxy.methods.should_not include 'testnode'
+    @proxy.methods.should include('testnode')
+    @another_proxy.methods.should_not include('testnode')
   end
 
   it "should return the node contents when the node isn't defined as a method and the contents of the node is at the lowest point of the tree" do
@@ -45,6 +45,7 @@ describe "inferring a method from an element name" do
     @proxy.methods.should include('methods')
     @proxy.methods.should include('nil?')
     @proxy.methods.should include('respond_to?')
+    @proxy.methods.should include('to_s')
     @proxy.methods.should_not include('id')
   end
 end

data/spec/method_name_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "how to use Peachy::MethodName" do
   before(:each) do
     @method_name = Peachy::MethodName.new 'method_name'
@@ -18,10 +20,10 @@ describe "how to use Peachy::MethodName" do
   it "should return the expected variation formats" do
     variations = @method_name.variations
 
-    variations.should include 'method_name'
-    variations.should include 'methodName'
-    variations.should include 'method-name'
-    variations.should include 'MethodName'
+    variations.should include('method_name')
+    variations.should include('methodName')
+    variations.should include('method-name')
+    variations.should include('MethodName')
   end
 
   it "should be possible to create a MethodName from a symbol" do
@@ -31,10 +33,10 @@ describe "how to use Peachy::MethodName" do
     @method_name.to_s.should == 'this_method'
     @method_name.to_sym.should == :this_method
     
-    variations.should include 'this_method'
-    variations.should include 'thisMethod'
-    variations.should include 'this-method'
-    variations.should include 'ThisMethod'
+    variations.should include('this_method')
+    variations.should include('thisMethod')
+    variations.should include('this-method')
+    variations.should include('ThisMethod')
   end
 
   it "should not include duplicates in variations" do
@@ -42,8 +44,17 @@ describe "how to use Peachy::MethodName" do
     variations = @method_name.variations
 
     variations.size.should == 2
-    variations.should include 'method'
-    variations.should include 'Method'
+    variations.should include('method')
+    variations.should include('Method')
+  end
+
+  it "should know how to check for convention" do
+    @method_name = Peachy::MethodName.new('method_name')
+    @method_name.check_for_convention.should be_nil
   end
-end
 
+  it "should know when a method name does not match the accepted convention" do
+    method_name = Peachy::MethodName.new('method_Name')
+    lambda { method_name.check_for_convention }.should raise_error(MethodNotInRubyConvention)
+  end
+end

data/spec/mimc_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "using a Mimic" do
+  before(:each) do
+    @mimic = Object.new
+    class << @mimic
+      include Peachy::Mimic
+    end
+  end
+
+  it "should raise an error if the mimic method has not been overridden" do
+    lambda { @mimic.mimic }.should raise_error(NothingToMimic)
+  end
+  
+  it "should call the underlying object" do
+    to_mimic = "Hello"
+    @mimic.instance_eval do
+      (class << self; self; end).instance_eval { define_method(:mimic) { to_mimic } }
+    end
+    
+    @mimic.chomp('o').should == "Hell"
+    @mimic.rjust(8).should == "   Hello"
+  end
+end

data/spec/nested_elements_spec.rb

@@ -12,8 +12,8 @@ describe "nested elements should be handled corectly by Peachy" do
 
   it "should define methods for the ancestors" do
     @proxy.root.first.second
-    @proxy.root.methods.should include 'first'
-    @proxy.root.first.methods.should include 'second'
+    @proxy.root.methods.should include('first')
+    @proxy.root.first.methods.should include('second')
   end
 end
 

data/spec/nodes_with_children_spec.rb

@@ -11,8 +11,8 @@ describe "nodes with multiple children should be handled correctly" do
   it "should define a method with the child name on the proxy" do
     @node_to_test.child
     @node_to_test.second_child
-    @node_to_test.methods.should include 'child'
-    @node_to_test.methods.should include 'second_child'
+    @node_to_test.methods.should include('child')
+    @node_to_test.methods.should include('second_child')
   end
 
   it "should recurse the Proxy to ancestors so that a child will have the correct value" do

data/spec/nokogiri_is_the_available_xml_parser_spec.rb

@@ -33,7 +33,7 @@ describe "nokogiri is the available XML parser" do
   it "should create a NokogiriWrapper from xml" do
     @factory.load_parser
     wrapper = @factory.make_from '<thing>Stuff</thing>'
-    wrapper.should be_a Peachy::Parsers::NokogiriWrapper
+    wrapper.should be_a(Peachy::Parsers::NokogiriWrapper)
     wrapper.content.should == 'Stuff'
   end
 end

data/spec/only_rexml_is_available_spec.rb

@@ -34,7 +34,7 @@ describe "only REXML is available" do
   it "should create a REXMLWrapper from xml" do
     @factory.load_parser
     wrapper = @factory.make_from '<thing>Stuff</thing>'
-    wrapper.should be_a Peachy::Parsers::REXMLWrapper
+    wrapper.should be_a(Peachy::Parsers::REXMLWrapper)
     wrapper.has_children?.should be_true
   end
 end

data/spec/parsers/all_parser_wrappers_spec.rb

@@ -6,7 +6,7 @@ shared_examples_for "all parser wrappers" do
     matches.size.should == 1
     matches[0].name.should == 'child'
     matches[0].content.should == 'Name'
-    matches[0].should be_a @expected_wrapper_class
+    matches[0].should be_a(@expected_wrapper_class)
   end
 
   it "should return no matches for a child name that doesn't exist" do
@@ -36,26 +36,8 @@ shared_examples_for "all parser wrappers" do
   it "should indicate that an element has both children and an attribute" do
     @wrapper.has_children_and_attributes?.should be_true
   end
-end
 
-describe "the Nokogiri parser wrapper class" do
-  before(:each) do
-    noko = Nokogiri::XML('<root type="test"><child>Name</child></root>')
-    @wrapper = Peachy::Parsers::NokogiriWrapper.new((noko/'root')[0])
-    @expected_wrapper_class = Peachy::Parsers::NokogiriWrapper
+  it "should return a string representation of the XML" do
+    @wrapper.to_s.should == @raw_xml
   end
-
-  it_should_behave_like "all parser wrappers"
 end
-
-require 'rexml/document'
-
-describe "the REXML parser wrapper class" do
-  before(:each) do
-    rexml = REXML::Document.new('<root type="test"><child>Name</child></root>')
-    @wrapper = Peachy::Parsers::REXMLWrapper.new rexml.root
-    @expected_wrapper_class = Peachy::Parsers::REXMLWrapper
-  end
-
-  it_should_behave_like "all parser wrappers"
-end

data/spec/parsers/nokigiri_wrapper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'nokogiri'
+require File.join(File.dirname(__FILE__), 'all_parser_wrappers_spec')
+
+describe "a Peachy::Parsers::NokogiriWrapper" do
+  before(:each) do
+    @raw_xml = "<root type=\"test\">\n  <child>Name</child>\n</root>"
+    noko = Nokogiri::XML(@raw_xml)
+    @wrapper = Peachy::Parsers::NokogiriWrapper.new((noko/'root')[0])
+    @expected_wrapper_class = Peachy::Parsers::NokogiriWrapper
+  end
+
+  it_should_behave_like "all parser wrappers"
+end
+

data/spec/parsers/rexml_attribute_wrapper_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "a REXMLAttributeWrapper" do
+  before(:each) do
+    @attribute_name = 'name'
+    @attribute_value = 'value'
+    @wrapper = Peachy::Parsers::REXMLAttributeWrapper.new [@attribute_name, @attribute_value]
+  end
+
+  it "should return the string contents of the attribute" do
+    @wrapper.to_s.should == @attribute_value
+  end
+end
+

data/spec/parsers/rexml_wrapper_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'rexml/document'
+require File.join(File.dirname(__FILE__), 'all_parser_wrappers_spec')
+
+describe "the REXML parser wrapper class" do
+  before(:each) do
+    @raw_xml = "<root type='test'>\n  <child>Name</child>\n</root>"
+    rexml = REXML::Document.new(@raw_xml)
+    @wrapper = Peachy::Parsers::REXMLWrapper.new rexml.root
+    @expected_wrapper_class = Peachy::Parsers::REXMLWrapper
+  end
+
+  it_should_behave_like "all parser wrappers"
+end

data/spec/pascal_case_names_spec.rb

@@ -17,7 +17,7 @@ XML
 
   it "should define a method from a pascal cased element name" do
     @proxy.root.test_node.value.should == 'Check meh.'
-    @proxy.root.methods.should include 'test_node'
+    @proxy.root.methods.should include('test_node')
   end
 
   it "should match a method to an attribute by pascal case" do
@@ -26,12 +26,12 @@ XML
 
   it "should define a method from pascal cased attribute name" do
     @proxy.root.second_node.record_label
-    @proxy.root.second_node.methods.should include 'record_label'
+    @proxy.root.second_node.methods.should include('record_label')
   end
 
   it "should define a method on a parent with attributes" do
     @proxy.root.third_node.record_label.should == 'Wall of Sound'
-    @proxy.root.third_node.methods.should include 'record_label'
+    @proxy.root.third_node.methods.should include('record_label')
   end
 
   it "should allow child nodes to be selected after an attrbiute is selected on a parent node" do

data/spec/proxy_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "stringifying a Proxy" do
+  it "should return the stringified underlying parser wrapper" do
+    expected_string = "<some><xml>XML!!</xml></some>"
+    stub_wrapper = mock()
+    stub_wrapper.stubs(:to_s).returns(expected_string)
+    stub_wrapper.stubs(:kind_of?).with(String).returns(false)
+    stub_wrapper.stubs(:kind_of?).with(Peachy::Parsers::ParserWrapper).returns(true)
+    proxy = Peachy::Proxy.new stub_wrapper
+
+    proxy.to_s.should == expected_string
+  end
+
+  it "should return the XML that is passed in to the consructor" do
+    expected_string = "<some><xml>XML!!</xml></some>"
+    proxy = Peachy::Proxy.new expected_string
+    proxy.to_s.should == expected_string
+  end
+end
+

data/spec/simple_content_wrapper_for_Peachy_spec.rb

@@ -1,45 +1,51 @@
 require 'spec_helper'
+
 describe "Peachy::SimpleContent wrapper for the contents of a simple XML element" do
   before(:each) do
-    @node_name = 'parent_node'
-    @content = Peachy::SimpleContent.new 'the value', @node_name
+    @expected_to_s = "<blar>boo</blar>"
+    mock_wrapper = mock()
+    mock_wrapper.stubs(:name).returns('real_node')
+    mock_wrapper.stubs(:content).returns('the real value')
+    mock_wrapper.stubs(:to_s).returns(@expected_to_s)
+    @content = Peachy::SimpleContent.new mock_wrapper
   end
 
   it "should return the expected content" do
-    @content.value.should == 'the value'
+    @content.value.should == 'the real value'
   end
 
   it "should to_s in the expected way" do
-    @content.to_s.should == 'the value'
+    @content.to_s.should == @expected_to_s
   end
 
   it "should return the value from the index of 0" do
     item = @content[0]
-    item.value.should == 'the value'
+    item.value.should == 'the real value'
   end
 
   it "should make the name of the parent node available" do
-    @content.node_name.should == @node_name
+    @content.name.should == 'real_node'
   end
 
   it "should raise an error if the SimpleContent is treated as an Array after being treated as SimpleContent" do
-    @content.value
-    lambda { @content[0].value }.should raise_error AlreadyAnOnlyChild, <<MESSAGE
-The 'parent_node' node has already been accessed as a single child, but you are now trying to use it as a collection.
+    expected_message = <<MESSAGE
+The 'real_node' node has already been accessed as a single child, but you are now trying to use it as a collection.
 Do not try to access Peachy::Proxies in a mixed manner in your implementation.
 MESSAGE
+    @content.value
+    lambda { @content[0].value }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 
   it "should behave as other objects when a method does not exist" do
-    lambda { @content.how_random }.should raise_error NoMethodError
+    lambda { @content.how_random }.should raise_error(NoMethodError)
   end
 
   it "should behave as other objects when a method with a parameter does not exist" do
-    lambda { @content.how_random("Hello") }.should raise_error NoMethodError
+    lambda { @content.how_random("Hello") }.should raise_error(NoMethodError)
   end
 
   it "should behave as other objects when a method with a block does not exist" do
-    lambda { @content.how_random() { puts "Boo!" } }.should raise_error NoMethodError
+    lambda { @content.how_random() { puts "Boo!" } }.should raise_error(NoMethodError)
   end
 end
 

data/spec/simple_element_referenced_as_collections_spec.rb

@@ -19,7 +19,6 @@ XML
 
     element_as_array = @proxy.xml.list.item
     element_as_array.any?.should be_true
-    element_as_array.one?.should be_true
     element_as_array.empty?.should be_false
     element_as_array.size.should == 1
     (element_as_array.map {|item| item.value }).should == ['Hello']
@@ -27,10 +26,11 @@ XML
   end
 
   it "should raise an error if the element value has already been accessed as an only child" do
-    @proxy.xml.list.item.value
-    lambda { @proxy.xml.list.item[0] }.should raise_error AlreadyAnOnlyChild, <<MSG
+    expected_message = <<MSG
 The 'item' node has already been accessed as a single child, but you are now trying to use it as a collection.
 Do not try to access Peachy::Proxies in a mixed manner in your implementation.
 MSG
+    @proxy.xml.list.item.value
+    lambda { @proxy.xml.list.item[0] }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 end

data/spec/simple_xml_collections_as_arrays_spec.rb

@@ -10,7 +10,7 @@ describe "a simple XML collection should be interpretted as an array" do
 
   it "should define a method for the item list name" do
     @proxy.xml.stuff.item
-    @proxy.xml.stuff.methods.should include 'item'
+    @proxy.xml.stuff.methods.should include('item')
   end
 
   it "should set each array item to the content for the list item" do

data/spec/using_peachy_proxy_incorrectly_spec.rb

@@ -8,19 +8,21 @@ describe "using Peachy::Proxy incorrectly" do
   end
 
   it "should raise an error if the method name is not in Ruby convention" do
-    lambda { @proxy.testNode }.should raise_error MethodNotInRubyConvention, <<EOF
+    expected_message = <<EOF
 You've tried to infer testNode using Peachy, but Peachy doesn't currently like defining methods that break Ruby convention.
 Please use methods matching ^[a-z]+(?:_[a-z]+)?{0,}$ and Peachy will try to do the rest with your XML.*/
 EOF
+    lambda { @proxy.testNode }.should raise_error(MethodNotInRubyConvention, expected_message)
   end
 
   it "should throw an InvalidProxyParameters error if an incorrect type of parameter was passed as the initializer argument" do
-    invalid_proxy = Peachy::Proxy.new Hash.new
-    lambda { invalid_proxy.boom }.should raise_error InvalidProxyParameters, <<EOF
+    expected_message = <<EOF
 The parameters that you passed to the Proxy were invalid.
 :nokogiri = nil
 :xml = nil
 EOF
+    invalid_proxy = Peachy::Proxy.new Hash.new
+    lambda { invalid_proxy.boom }.should raise_error(InvalidProxyParameters, expected_message)
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - NJ Pearman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +01:00
+date: 2010-05-31 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +32,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/peachy/xml_node.rb
-- lib/peachy/convention_checks.rb
 - lib/peachy/childless_proxy_with_attributes.rb
 - lib/peachy/method_name.rb
 - lib/peachy/mimic.rb
@@ -50,6 +49,7 @@ files:
 - lib/peachy/morph_into_array.rb
 - lib/peachy/my_meta_class.rb
 - lib/peachy/string_styler.rb
+- lib/nothing_to_mimic.rb
 - lib/no_matching_xml_part.rb
 - lib/invalid_proxy_parameters.rb
 - lib/method_not_in_ruby_convention.rb
@@ -57,6 +57,7 @@ files:
 - lib/peachy.rb
 - spec/nokogiri_is_the_available_xml_parser_spec.rb
 - spec/hyphen_separated_names_spec.rb
+- spec/proxy_spec.rb
 - spec/elements_referenced_as_collections_spec.rb
 - spec/simple_content_wrapper_for_Peachy_spec.rb
 - spec/collections_with_children_as_arrays_spec.rb
@@ -65,13 +66,17 @@ files:
 - spec/simple_xml_collections_as_arrays_spec.rb
 - spec/simple_element_referenced_as_collections_spec.rb
 - spec/using_peachy_proxy_incorrectly_spec.rb
+- spec/mimc_spec.rb
 - spec/inferring_a_method_from_an_attribute_spec.rb
 - spec/camel_case_names_spec.rb
 - spec/attributes_on_a_parent_node_spec.rb
 - spec/pascal_case_names_spec.rb
 - spec/peachy_spec.rb
 - spec/only_rexml_is_available_spec.rb
+- spec/parsers/rexml_attribute_wrapper_spec.rb
 - spec/parsers/all_parser_wrappers_spec.rb
+- spec/parsers/nokigiri_wrapper_spec.rb
+- spec/parsers/rexml_wrapper_spec.rb
 - spec/inferring_a_method_from_element_name_spec.rb
 - spec/spec_helper.rb
 - spec/nested_elements_spec.rb

data/lib/peachy/convention_checks.rb

@@ -1,17 +0,0 @@
-module Peachy
-  module ConventionChecks
-    private
-    # Checks whether the provided method name is in the accepted convention,
-    # raising a MethodNotInRubyConvention if it's not.
-    def check_for_convention method_name
-      raise MethodNotInRubyConvention.new(method_name) unless matches_convention(method_name)
-    end
-
-    # Checks whether the given method name matches the Ruby convention of
-    # lowercase with underscores.  This method does not allow question marks,
-    # excalmation marks or numbers, however.
-    def matches_convention method_name
-      method_name.to_s =~ /^[a-z]+(?:_[a-z]+){0,}$/
-    end
-  end
-end