From 92b43a7500d51c70f4377d20ffe510b87a47a3ce Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 27 Jul 2015 00:23:16 +0200 Subject: [PATCH] Renamed on_begin to on_followed_by --- lib/oga/ruby/generator.rb | 6 +----- lib/oga/ruby/node.rb | 2 +- spec/oga/ruby/generator_spec.rb | 4 ++-- spec/oga/ruby/node_spec.rb | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/oga/ruby/generator.rb b/lib/oga/ruby/generator.rb index ec31908..1946961 100644 --- a/lib/oga/ruby/generator.rb +++ b/lib/oga/ruby/generator.rb @@ -16,13 +16,9 @@ module Oga send(:"on_#{ast.type}", ast) end - ## - # Processes a "begin" node. - # # @param [Oga::Ruby::Node] ast # @return [String] - # - def on_begin(ast) + def on_followed_by(ast) ast.to_a.map { |child| process(child) }.join("\n\n") end diff --git a/lib/oga/ruby/node.rb b/lib/oga/ruby/node.rb index 254b78f..7e2c0dd 100644 --- a/lib/oga/ruby/node.rb +++ b/lib/oga/ruby/node.rb @@ -146,7 +146,7 @@ module Oga # @return [Oga::Ruby::Node] # def followed_by(other) - Node.new(:begin, [self, other]) + Node.new(:followed_by, [self, other]) end ## diff --git a/spec/oga/ruby/generator_spec.rb b/spec/oga/ruby/generator_spec.rb index f143665..ca046c4 100644 --- a/spec/oga/ruby/generator_spec.rb +++ b/spec/oga/ruby/generator_spec.rb @@ -5,13 +5,13 @@ describe Oga::Ruby::Generator do @generator = described_class.new end - describe '#on_begin' do + describe '#on_followed_by' do it 'returns a String' do node1 = Oga::Ruby::Node.new(:lit, %w{10}) node2 = Oga::Ruby::Node.new(:lit, %w{20}) joined = node1.followed_by(node2) - @generator.on_begin(joined).should == "10\n\n20" + @generator.on_followed_by(joined).should == "10\n\n20" end end diff --git a/spec/oga/ruby/node_spec.rb b/spec/oga/ruby/node_spec.rb index 9d04f0f..9eca407 100644 --- a/spec/oga/ruby/node_spec.rb +++ b/spec/oga/ruby/node_spec.rb @@ -128,7 +128,7 @@ describe Oga::Ruby::Node do node2 = described_class.new(:lit, %w{B}) joined = node1.followed_by(node2) - joined.type.should == :begin + joined.type.should == :followed_by joined.to_a.should == [node1, node2] end end