peachy 0.3.4 → 0.3.5

data/lib/peachy.rb

@@ -5,6 +5,7 @@ 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__), 'nothing_to_mimic')
+require File.join(File.dirname(__FILE__), 'peachy/compatibility')
 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')

data/lib/peachy/compatibility.rb

@@ -0,0 +1,7 @@
+module Peachy
+  module Compatibility
+    def version_safe_method_id(method)
+      RUBY_VERSION < '1.9' ? method.to_s : method.to_sym
+    end
+  end
+end

data/lib/peachy/method_mask.rb

@@ -1,14 +1,12 @@
 module Peachy
   module MethodMask
+    include Compatibility
+
     private
     def hide_public_methods exceptions
-      formatted_exception = exceptions.map {|method_name| version_safe_method(method_name)}
+      formatted_exception = exceptions.map {|method_name| version_safe_method_id(method_name)}
       methods_to_hide = public_instance_methods.map {|method| method unless formatted_exception.include? method }.compact
       private *methods_to_hide
     end
-
-    def version_safe_method(method_name)
-      /^1\.8/ === RUBY_VERSION ? method_name.to_s : method_name.to_s.to_sym
-    end
   end
 end

data/lib/peachy/morph_into_array.rb

@@ -1,12 +1,16 @@
 module Peachy
   module MorphIntoArray
+    include Compatibility
+
     private
+    MethodsForArraysOnly = Array.instance_methods - Object.instance_methods
+
     def used_as_array method_name, block_given, *args
       return (block_given or args.size > 0) && array_can?(method_name)
     end
 
     def array_can? method_name
-      Array.instance_methods.include?(method_name.to_s) && method_name != :type
+      MethodsForArraysOnly.include?( version_safe_method_id(method_name))
     end
 
     def morph_into_array to_add_to_array, method_to_invoke, *args, &block

data/lib/peachy/proxy.rb

@@ -6,7 +6,7 @@ module Peachy
     # This hides all public methods on the class except for 'methods', 'nil?'
     # 'respond_to?', 'inspect' and 'instance_eval', which I've found are too
     # useful / fundamental / dangerous to hide.
-    hide_public_methods ['methods', 'nil?', 'respond_to?', 'inspect', 'instance_eval', 'kind_of?', 'send']
+    hide_public_methods ['methods', 'nil?', 'respond_to?', 'inspect', 'instance_eval', 'kind_of?', 'send', 'is_a?']
 
     # Takes either a string containing XML or a Nokogiri::XML::Element as the
     # single argument.

data/lib/peachy/version.rb

@@ -1,3 +1,3 @@
 module Peachy
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/{parsers/all_parser_wrappers_spec.rb → all_parser_wrappers_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-shared_examples_for "all parser wrappers" do
+shared_examples_for 'all parser wrappers in Peachy' do
   it "should be able to find the correct matches in the underlying XML" do
     matches = @wrapper.find_matches(Peachy::MethodName.new('child'))
     matches.size.should == 1

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.map{|m| m.to_sym}.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)
   end
-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.map{|m| m.to_s}.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.map{|m| m.to_s}.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.map{|m| m.to_s}.should include('record_label')
   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.map{|m| m.to_s}.should include('item')
   end
 
   it "should create the children as expected" do

data/spec/elements_referenced_as_collections_spec.rb

@@ -44,21 +44,22 @@ XML
     @proxy.xml.list.item.size.should == 1
   end
 
-  it "should raise an error if the element has already been accessed as a single child" do
+  it "should not consider inherited Object instance methods to be an Array method" do
     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
+    @proxy.xml.list.item.type
     lambda { @proxy.xml.list.item[0] }.should raise_error(AlreadyAnOnlyChild, expected_message)
   end
 
-  it "should not treat Array#type as an array reference" do
+  it "should raise an error if the element has already been accessed as a single child" do
     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.type
+    @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.map{|m| m.to_s}.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.map{|m| m.to_s}.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.map{|m| m.to_s}.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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "inferring a method from an attribute" do
   before(:each) do
     @proxy = Peachy::Proxy.new '<test-node id="1" another="yellow">Check meh.</test-node>'
@@ -13,7 +15,7 @@ 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.map{|m| m.to_s}.should include('another')
   end
 
   it "should raise an error if method name doesn't match an attribute name" do

data/spec/inferring_a_method_from_element_name_spec.rb

@@ -15,18 +15,18 @@ describe "inferring a method from an element name" do
   end
 
   it "should not expose the original method_missing alias publically" do
-    @proxy.methods.include?('original_method_missing').should be_false
+    @proxy.methods.map{|m| m.to_s}.include?('original_method_missing').should be_false
   end
 
   it 'should add a reader for the method to the underlying class if the method does map to underlying XML node' do
     @proxy.testnode
-    @proxy.methods.include?('testnode').should be_true
+    @proxy.methods.map{|m| m.to_s}.include?('testnode').should be_true
   end
 
   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.map{|m| m.to_s}.should include('testnode')
+    @another_proxy.methods.map{|m| m.to_s}.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
@@ -41,12 +41,16 @@ describe "inferring a method from an element name" do
   end
 
   it "should only contain the expected public and protected methods" do
-    @proxy.methods.should include('inspect')
-    @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 include('instance_eval')
-    @proxy.methods.should_not include('id')
+    all_methods = @proxy.methods.map{|m| m.to_s}
+    all_methods.should include('inspect')
+    all_methods.should include('methods')
+    all_methods.should include('nil?')
+    all_methods.should include('respond_to?')
+    all_methods.should include('to_s')
+    all_methods.should include('instance_eval')
+    all_methods.should include('kind_of?')
+    all_methods.should include('send')
+    all_methods.should include('is_a?')
+    all_methods.should_not include('id')
   end
 end

data/spec/nested_elements_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'ruby-debug'
 
 describe "nested elements should be handled corectly by Peachy" do
   before(:each) do
@@ -12,8 +11,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.map{|m| m.to_s}.should include('first')
+    @proxy.root.first.methods.map{|m| m.to_s}.should include('second')
   end
 end
 

data/spec/nodes_with_children_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "nodes with multiple children should be handled correctly" do
   before(:each) do
     @peachy_proxy = Peachy::Proxy.new '<testnode><child>Check meh.</child><second_child><ancestor>Check meh two times.</ancestor></second_child></testnode>'
@@ -11,8 +13,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.map{|m| m.to_s}.should include('child')
+    @node_to_test.methods.map{|m| m.to_s}.should include('second_child')
   end
 
   it "should recurse the Proxy to ancestors so that a child will have the correct value" do

data/spec/{parsers/nokigiri_wrapper_spec.rb → nokigiri_wrapper_spec.rb}

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require File.join(File.dirname(__FILE__), 'all_parser_wrappers_spec')
 
 # this is to ignore this spec if the nokogiri gem is not available
 if Gem.available? 'nokogiri'
@@ -12,6 +11,6 @@ if Gem.available? 'nokogiri'
       @expected_wrapper_class = Peachy::Parsers::NokogiriWrapper
     end
 
-    it_should_behave_like "all parser wrappers"
+    it_should_behave_like 'all parser wrappers in Peachy'
   end
 end

data/spec/nokogiri_is_the_available_xml_parser_spec.rb

@@ -35,7 +35,7 @@ if Gem.available? 'nokogiri'
 
     it "should enable a way to a new NokogiriWrapper" do
       @factory.load_parser
-      @factory.methods.should include('make_from')
+      @factory.methods.map{|m| m.to_s}.should include('make_from')
     end
 
     it "should create a NokogiriWrapper from xml" do
@@ -45,4 +45,4 @@ if Gem.available? 'nokogiri'
       wrapper.content.should == 'Stuff'
     end
   end
-end
+end

data/spec/only_rexml_is_available_spec.rb

@@ -33,7 +33,7 @@ describe "only REXML is available" do
 
   it "should enable a way to a new REXMLWrapper" do
     @factory.load_parser
-    @factory.methods.should include('make_from')
+    @factory.methods.map{|m| m.to_s}.should include('make_from')
   end
 
   it "should create a REXMLWrapper from xml" do

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.map{|m| m.to_s}.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.map{|m| m.to_s}.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.map{|m| m.to_s}.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/{parsers/rexml_wrapper_spec.rb → rexml_wrapper_spec.rb}

@@ -1,6 +1,5 @@
 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
@@ -10,5 +9,5 @@ describe "the REXML parser wrapper class" do
     @expected_wrapper_class = Peachy::Parsers::REXMLWrapper
   end
 
-  it_should_behave_like "all parser wrappers"
+  it_should_behave_like 'all parser wrappers in Peachy'
 end

data/spec/simple_element_referenced_as_collections_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "a simple element referenced as the first part of a collection" do
   before(:each) do
     xml = <<XML

data/spec/simple_xml_collections_as_arrays_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "a simple XML collection should be interpretted as an array" do
   before(:each) do
     xml = "<xml><stuff><item>first</item><item>second</item><item>third</item></stuff></xml>"
@@ -10,7 +12,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.map{|m| m.to_s}.should include('item')
   end
 
   it "should set each array item to the content for the list item" do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/peachy'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'peachy'))
 require 'mocha'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end

data/spec/using_peachy_proxy_incorrectly_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "using Peachy::Proxy incorrectly" do
   before(:each) do
     @proxy = Peachy::Proxy.new '<testnode>Check meh.</testnode>'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - NJ Pearman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -31,56 +31,57 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- lib/peachy.rb
+- lib/peachy/proxy.rb
+- lib/peachy/my_meta_class.rb
+- lib/peachy/string_styler.rb
 - lib/peachy/xml_node.rb
-- lib/peachy/childless_proxy_with_attributes.rb
-- lib/peachy/method_name.rb
-- lib/peachy/mimic.rb
+- lib/peachy/compatibility.rb
 - lib/peachy/method_mask.rb
-- lib/peachy/simple_content.rb
-- lib/peachy/current_method_call.rb
-- lib/peachy/version.rb
-- lib/peachy/proxy.rb
+- lib/peachy/parsers/parser_wrapper.rb
 - lib/peachy/parsers/rexml_attribute_wrapper.rb
 - lib/peachy/parsers/nokogiri_wrapper.rb
-- lib/peachy/parsers/parser_factory.rb
-- lib/peachy/parsers/parser_wrapper.rb
 - lib/peachy/parsers/rexml_wrapper.rb
+- lib/peachy/parsers/parser_factory.rb
+- lib/peachy/current_method_call.rb
 - lib/peachy/morph_into_array.rb
-- lib/peachy/my_meta_class.rb
-- lib/peachy/string_styler.rb
+- lib/peachy/simple_content.rb
+- lib/peachy/version.rb
+- lib/peachy/method_name.rb
+- lib/peachy/childless_proxy_with_attributes.rb
+- lib/peachy/mimic.rb
+- lib/method_not_in_ruby_convention.rb
+- lib/invalid_proxy_parameters.rb
 - lib/nothing_to_mimic.rb
 - lib/no_matching_xml_part.rb
-- lib/invalid_proxy_parameters.rb
-- lib/method_not_in_ruby_convention.rb
 - lib/already_an_only_child.rb
-- 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
+- spec/nodes_with_children_spec.rb
+- spec/nokigiri_wrapper_spec.rb
 - spec/method_name_spec.rb
-- spec/childless_elements_referenced_as_collections_spec.rb
-- spec/make_peachy_quiet_spec.rb
-- 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/pascal_case_names_spec.rb
+- spec/rexml_wrapper_spec.rb
+- spec/simple_element_referenced_as_collections_spec.rb
+- spec/make_peachy_quiet_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/collections_with_children_as_arrays_spec.rb
+- spec/nokogiri_is_the_available_xml_parser_spec.rb
+- spec/simple_content_wrapper_for_Peachy_spec.rb
+- spec/simple_xml_collections_as_arrays_spec.rb
+- spec/all_parser_wrappers_spec.rb
+- spec/nested_elements_spec.rb
 - spec/inferring_a_method_from_element_name_spec.rb
+- spec/rexml_attribute_wrapper_spec.rb
+- spec/elements_referenced_as_collections_spec.rb
+- spec/only_rexml_is_available_spec.rb
+- spec/proxy_spec.rb
+- spec/peachy_spec.rb
+- spec/attributes_on_a_parent_node_spec.rb
+- spec/using_peachy_proxy_incorrectly_spec.rb
 - spec/spec_helper.rb
-- spec/nested_elements_spec.rb
-- spec/nodes_with_children_spec.rb
+- spec/childless_elements_referenced_as_collections_spec.rb
+- spec/hyphen_separated_names_spec.rb
 - README.rdoc
 - History.txt
 has_rdoc: true
@@ -94,6 +95,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -101,6 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -110,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Peachy gives a very simple object-style interface on top of an XML DOM.