@@ -17,7 +17,6 @@ spec/grammars/assignments.treetop spec/grammars/dot_xen.rb spec/grammars/dot_xen.treetop spec/grammars/magic.rb -spec/grammars/magic.treetop spec/integration/assignments_spec.rb spec/integration/dot_xen_spec.rb spec/integration/magic_spec.rb Manifest.txt @@ -10,7 +10,7 @@ class Object end # Defines an instance method within a class - def class_def name, &blk - class_eval { define_method name, &blk } - end + # def class_def name, &blk + # class_eval { define_method name, &blk } + # end end lib/treehouse/metaid.rb @@ -1,6 +1,8 @@ module Treehouse class Node + # Create a new node class with the given attributes. + # def self.create(*attribs) Class.new(self) do attribs.each do |attrib| @@ -21,6 +23,9 @@ module Treehouse @attribute_mapping ||= {} end + # Instantiate a new AST node. + # Values can either be a hash of values (simple case) or a Treetop syntax node instance (automatic building) + # def initialize(values={}) if values.kind_of?(Treetop::Runtime::SyntaxNode) build_from_parsed_node(values) @@ -35,17 +40,11 @@ module Treehouse def build_from_parsed_node(parsed_node) attributes.each do |attrib| - if mapping(attrib) - value = parsed_node.send(mapping(attrib)) - if value.kind_of?(Array) - value = value.map { |v| v.build } - else - value = parsed_node.send(mapping(attrib)) - end - send("#{attrib}=", value) - else - send("#{attrib}=", parsed_node.send(attrib).build) - end + # TODO handle lambda mappings for even more customizability + value = mapping(attrib) ? parsed_node.send(mapping(attrib)) : parsed_node.send(attrib) + value = value.map { |val| val.respond_to?(:build) ? val.build : val } if value.kind_of?(Array) + value = value.build if value.respond_to?(:build) + send("#{attrib}=", value) end end lib/treehouse/node.rb @@ -9,11 +9,9 @@ module Treehouse parsed_node = Treetop::Runtime::SyntaxNode.new(*args) node_class = @node_class # local scope for the block below - parsed_node.meta_eval do - # TODO don't define this method if it already exists (e.g. inline eval, etc.) - define_method :build do - node_class.new(self) - end + # TODO don't define this method if it already exists (e.g. inline eval, etc.) + parsed_node.meta_def :build do + node_class.new(self) end parsed_node lib/treehouse/node_creator.rb @@ -13,9 +13,7 @@ describe Treehouse::Node do before(:each) do @node = Treehouse::Node.create(:foo, :bar) end - it "returns a class" do - @node.should be_an_instance_of(Class) - end + it "creates a class with the given attributes" do n = @node.new(:foo => 1, :bar => 2) n.foo.should == 1 @@ -30,6 +28,98 @@ describe Treehouse::Node do end + describe "with an attribute hash" do + before(:each) do + @node = Treehouse::Node.create(:lhs => :left_value, :rhs => :right_value) + end + + it "creates a class with attributes matching the hash keys" do + @node.attributes.should == ["lhs", "rhs"] + end + + it "creates attributes with a default of raising an exception if not set" do + n = @node.new + lambda { n.lhs }.should raise_error(RuntimeError, "no value given for lhs") + end + + it "returns a class with an attribute mapping" do + @node.attribute_mapping.should == {"lhs" => :left_value, "rhs" => :right_value} + end + + end + + describe "with a mix of named attributes and hash attributes" do + before(:each) do + @node = Treehouse::Node.create(:one, :two, :three => :value) + end + + it "creates a class with attributes matching the named attributes and hash keys" do + @node.attributes.should == %w(one two three) + end + + it "updates the attribute mapping" do + @node.attribute_mapping.should == {"three" => :value} + end + + end + + end + + describe ".new" do + before(:each) do + @node = Treehouse::Node.create(:child, :value => :data) + end + + describe "with empty args" do + it "initializes a node without touching the attributes" do + n = @node.new + lambda { n.child }.should raise_error(RuntimeError) + end + end + + describe "with a hash" do + it "initializes each of the attributes to the given value" do + n = @node.new(:child => 1, :value => 2) + n.child.should == 1 + n.value.should == 2 + end + end + + describe "with an instance of Treetop::Runtime::SyntaxNode" do + before(:each) do + @child = mock_syntax_node :build => "child value" + @top = mock_syntax_node :child => @child, :data => "data" + end + + it "sets the named values by calling build on the named child node" do + @top.should_receive(:child).and_return(@child) + @child.should_receive(:build).and_return("child value") + n = @node.new(@top) + n.child.should == "child value" + end + + it "calls the specified method directly for hash values" do + @top.should_receive(:data).and_return do + puts "called from #{caller.detect {|c| c !~ /rspec/}}" + "foo" + end + n = @node.new(@top) + n.value.should == "foo" + end + + it "calls build on each element of a referenced node value if that value is an array" do + @top.should_receive(:child).and_return([@child, @child]) + @child.should_receive(:build).exactly(2).times.and_return("one", "two") + n = @node.new(@top) + n.child.should == %w(one two) + end + + it "only calls build on elements of an array if they respond to that method" do + @top.should_receive(:child).and_return([@child, "blah"]) + @node.new(@top).child.should == ["child value", "blah"] + end + + end end end spec/node_spec.rb @@ -9,4 +9,26 @@ Spec::Runner.configure do |config| # config.mock_with :mocha # config.mock_with :flexmock # config.mock_with :rr + + # borrowed from rspec_on_rails' mock_model + def mock_syntax_node(stubs={}) + m = mock "mock syntax node", stubs + m.send(:__mock_proxy).instance_eval do + def @target.is_a?(other) + Treetop::Runtime::SyntaxNode.ancestors.include?(other) + end + def @target.kind_of?(other) + Treetop::Runtime::SyntaxNode.ancestors.include?(other) + end + def @target.instance_of?(other) + other == Treetop::Runtime::SyntaxNode + end + def @target.class + Treetop::Runtime::SyntaxNode + end + end + yield m if block_given? + m + end + end spec/spec_helper.rb @@ -18,7 +18,7 @@ PROJ = OpenStruct.new( :email => nil, :url => "\000", :version => ENV['VERSION'] || '0.0.0', - :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/ \.tmproj$), + :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/ \.tmproj$ ^coverage/), :release_name => ENV['RELEASE'], # System Defaults tasks/setup.rb @@ -26,7 +26,7 @@ namespace :spec do Spec::Rake::SpecTask.new(:rcov) do |t| t.ruby_opts = PROJ.ruby_opts t.spec_opts = PROJ.spec.opts - t.spec_files = PROJ.spec.files + t.spec_files = PROJ.spec.files.select { |f| f !~ /integration/ } t.libs += PROJ.libs t.rcov = true t.rcov_dir = PROJ.rcov.dir tasks/spec.rake edd9f5038a0efa7528d7eaa56b2e4aca4e842c23 Nathan Witmer nwitmer@gmail.com http://github.com/aniero/tire_swing/commit/7bb7169e7745a5a59566d16f30888df843789f0e 7bb7169e7745a5a59566d16f30888df843789f0e 2008-07-09T22:40:27-07:00 2008-07-09T22:40:27-07:00 Added node specs * mock_syntax_node helper for convenience * simplified node building from a parsed node 4f9ed53093095969a216b33d861ae8526682d4de Nathan Witmer nwitmer@gmail.com