gitara 0.5.0 → 0.6.0

data/spec/lib/gitara/node/alternative_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Gitara::Node::Alternative do
+  describe "#call_value" do
+    it "should be a call to lilypond's alternative command" do
+      alternative = FactoryGirl.build(:alternative, :children => [
+        FactoryGirl.build(:bar, :name => 'First'),
+        FactoryGirl.build(:bar, :name => 'Second')
+      ])
+
+      version = Node::Base::NodeVersion.new(:node => alternative)
+      alternative.call_value(version).should == "\\alternative { { \\nBarFirst } { \\nBarSecond } }"
+    end
+  end
+end

data/spec/lib/gitara/node/bar/chorded_version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'ChordedVersion' do
-  describe "value" do
+describe Gitara::Node::Bar::ChordedVersion do
+  describe "#value" do
     it "should be the call names of the chord sets in the bar, if available" do
       bar = FactoryGirl.build(:bar, :children => [FactoryGirl.build(:chord_set, :name => :Am, :value => 'r-"Am"')])
 

data/spec/lib/gitara/node/bar/stanza_version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'StanzaVersion' do
-  describe "value" do
+describe Gitara::Node::Bar::StanzaVersion do
+  describe "#value" do
     it "should be the stanza heading of the bar" do
       bar = FactoryGirl.build(:bar)
       stanza = FactoryGirl.build(:stanza, :name => 'Intro', :children => [bar])

data/spec/lib/gitara/node/bar/voiced_version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'Bar::VoicedVersion' do
-  describe "matching_note_set" do
+describe Gitara::Node::Bar::VoicedVersion do
+  describe "#matching_note_set" do
     it "should be the note_set matching this voiced bar" do
       note_set = FactoryGirl.build(:note_set)
 

data/spec/lib/gitara/node/bar_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'Bar' do
-  describe "note_sets" do
+describe Gitara::Node::Bar do
+  describe "#note_sets" do
     it "should be the note sets of its definition" do
       definition_bar = FactoryGirl.build(:bar, :name => 'Intro').tap {|bar|
         bar.children = [
@@ -18,7 +18,7 @@ describe 'Bar' do
     end
   end
 
-  describe "stanza_heading" do
+  describe "#stanza_heading" do
     it "should be a whole rest with the stanza name if the bar is the first node of a stanza" do
       bar = FactoryGirl.build(:bar)
       stanza = FactoryGirl.build(:stanza, :name => 'Intro', :children => [bar])
@@ -32,7 +32,7 @@ describe 'Bar' do
     end
   end
 
-  describe "with a special_duration" do
+  describe "#with a special_duration" do
     subject { FactoryGirl.build(:bar, :specified_duration => 8) }
 
     it "should be a partial with the stanza name if the bar is the first node of a stanza" do
@@ -46,7 +46,7 @@ describe 'Bar' do
     end
   end
 
-  describe "first_bar_of_stanza?" do
+  describe "#first_bar_of_stanza?" do
     it "should be true if the bar is the first bar of a stanza" do
       bar = FactoryGirl.build(:bar)
       stanza = FactoryGirl.build(:stanza, :name => 'Intro', :children => [bar])
@@ -66,7 +66,7 @@ describe 'Bar' do
     end
   end
 
-  describe "specified_duration_as_lilypond" do
+  describe "#specified_duration_as_lilypond" do
     it "should be \\partial specified_duration if present" do
       bar = FactoryGirl.build(:bar, :specified_duration => 8)
       bar.specified_duration_as_lilypond.should == '\partial 8'
@@ -78,7 +78,7 @@ describe 'Bar' do
     end
   end
 
-  describe "duration" do
+  describe "#duration" do
     it "should be 1 if there is no specified duration" do
       FactoryGirl.build(:bar, :specified_duration => nil).duration.should == 1
     end

data/spec/lib/gitara/node/base/chorded_version_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe 'ChordedVersion' do
+describe Gitara::Node::Base::ChordedVersion do
 end
 

data/spec/lib/gitara/node/base/node_version_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Gitara::Node::Base::NodeVersion do
+  describe "#prefix" do
+    it "should be by default the first letter of the class" do
+      version = Node::Base::NodeVersion.new
+      version.prefix.should == 'n'
+    end
+  end
+
+  describe "#definition_name" do
+    it "should include the node's class and the node's name" do
+      version = Node::Base::NodeVersion.new(:node => FactoryGirl.build(:base, :name => 'some node'))
+      version.definition_name.should == 'nBaseSomeNode'
+    end
+  end
+
+  describe "#call_name" do
+    it "should be the call version of the definition name" do
+      version = Node::Base::NodeVersion.new(:node => FactoryGirl.build(:base, :name => 'some node'))
+      version.call_name.should == '\nBaseSomeNode'
+    end
+  end
+
+  describe "#value" do
+    it "should be the call values of its definition_children" do
+      node = FactoryGirl.build(:base, :children => [
+        FactoryGirl.build(:base, :name => :First),
+        FactoryGirl.build(:base, :name => :Second)
+      ])
+      node_version = Node::Base::NodeVersion.new(:node => node)
+      node_version.value.should == '\nBaseFirst \nBaseSecond'
+    end
+  end
+
+  describe "#definition_children" do
+    it "should be versionized versions of the node's definition_children" do
+      parent = FactoryGirl.build(:base, :name => 'parent')
+      child = FactoryGirl.build(:base, :name => 'child')
+      parent.add child
+
+      node_version = Node::Base::NodeVersion.new(:node => parent)
+
+      children = node_version.definition_children
+      children.should have(1).child
+      children[0].node.should == child
+      children[0].should be_a(Node::Base::NodeVersion)
+    end
+  end
+
+  describe "#call_value" do
+    it "should be the call name if we want to render the node's definition name in the lilypond output" do
+      node = FactoryGirl.build(:base, :name => 'parent')
+      node_version = Node::Base::NodeVersion.new(:node => node)
+      node_version.call_value.should == '\nBaseParent'
+    end
+
+    it "should be the call value of the node if we don't want to render the node's definition name in the lilypond output" do
+      node = FactoryGirl.build(:base, :name => 'name')
+      node_version = Node::Base::NodeVersion.new(:node => node)
+      node.should_receive(:call_value).with(node_version).and_return("todo { }")
+      node_version.call_value.should == "todo { }"
+    end
+  end
+end
+

data/spec/lib/gitara/node/base/voiced_version_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe 'VoicedVersion' do
-  describe "prefix" do
+describe Gitara::Node::Base::VoicedVersion do
+  describe "#prefix" do
     it "should be based on the voice's id" do
       voiced_version = FactoryGirl.build(:voiced_version, :node => FactoryGirl.build(:base, :name => 'Intro'), :voice => FactoryGirl.build(:voice, :id => 1))
       voiced_version.prefix.should == 'vOne'
     end
   end
 
-  describe "children" do
-    it "should be voiced versions of the node's children" do
+  describe "#definition_children" do
+    it "should be voiced versions of the node's definition_children" do
       parent = FactoryGirl.build(:base, :name => 'parent')
       child = FactoryGirl.build(:base, :name => 'child')
       parent.add child
@@ -18,7 +18,7 @@ describe 'VoicedVersion' do
 
       voiced_version = FactoryGirl.build(:voiced_version, :node => parent, :voice => voice)
 
-      children = voiced_version.children
+      children = voiced_version.definition_children
       children.should have(1).voiced_version
       children[0].node.should == child
       children[0].voice.should == voice

data/spec/lib/gitara/node/base_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Node::Base do
-  describe "children" do
+describe Gitara::Node::Base do
+  describe "#definition_children" do
     it "should be its own children if they exist" do
       child = FactoryGirl.build(:base, :id => nil)
 
       parent = FactoryGirl.build(:base)
       parent.children = [child]
-      parent.children.should == [child]
+      parent.definition_children.should == [child]
     end
 
     it "should be the children of its definition if the node is not a definition" do
@@ -20,11 +20,11 @@ describe Node::Base do
 
       tab = FactoryGirl.build(:tab, :children => [definition_bar, call_bar])
 
-      call_bar.children.should == [child]
+      call_bar.definition_children.should == [child]
     end
   end
 
-  describe "children=(other)" do
+  describe "#children=" do
     it "should set the ids and parents of the children" do
       parent = FactoryGirl.build(:base)
       parent.children = [FactoryGirl.build(:base, :id => nil)]
@@ -33,7 +33,7 @@ describe Node::Base do
     end
   end
 
-  describe "add(child)" do
+  describe "#add" do
     it "should set the id and parent of the child" do
       parent = FactoryGirl.build(:base)
 
@@ -63,7 +63,7 @@ describe Node::Base do
     end
   end
 
-  describe "definition" do
+  describe "#definition" do
     it "should be the definition node which matches this node's name" do
       definition_bar = FactoryGirl.build(:bar, :name => 'Intro').tap {|bar|
         bar.children = [
@@ -80,7 +80,7 @@ describe Node::Base do
     end
   end
 
-  describe "definition?" do
+  describe "#definition?" do
     it "should be true if this node has children" do
       definition_bar = FactoryGirl.build(:bar, :name => 'Intro').tap {|bar|
         bar.add FactoryGirl.build(:note_set)
@@ -91,26 +91,31 @@ describe Node::Base do
 
     it "should be true if the node has a value" do
       chord_set = FactoryGirl.build(:chord_set, :name => :Am, :value =>'r4-"Am" r r r')
-      chord_set.own_children.should be_empty
+      chord_set.children.should be_empty
       chord_set.should be_definition
     end
 
     it "should be false if this node does not have children and it does not have a value" do
       call_bar = FactoryGirl.build(:bar, :name => 'Intro', :children => [])
-      call_bar.own_children.should be_empty
+      call_bar.children.should be_empty
       call_bar.value.should be_nil
       call_bar.should_not be_definition
     end
   end
 
-  describe "value" do
+  describe "#value" do
     it "should convert slashes to backslashes" do
       node = FactoryGirl.build(:base, :value => %q|notes "<g'/1>8 <a/3>8 <g'/1>8 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"|)
       node.value.should == %q|notes "<g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8"|
     end
+
+    it "should work with non-strings" do
+      node = FactoryGirl.build(:base, :value => 1)
+      node.value.should == 1
+    end
   end
 
-  describe "voiced_as(arg)" do
+  describe "#voiced_as" do
     it "should return the voiced version of the node, if arg is a voice" do
       node = FactoryGirl.build(:base)
       voice = FactoryGirl.build(:voice)
@@ -138,7 +143,7 @@ describe Node::Base do
     end
   end
 
-  describe "definitions(klass)" do
+  describe "#definitions" do
     it "should be itself if it is an instance of the klass" do
       node = FactoryGirl.build(:bar)
       node.add FactoryGirl.build(:note_set)
@@ -157,26 +162,7 @@ describe Node::Base do
     end
   end
 
-  describe "root" do
-    it "should be itself if it has no parent" do
-      node = FactoryGirl.build(:base)
-      node.root.should == node
-    end
-
-    it "should be the ancentor of the node which has no parent of its own" do
-      note_set = FactoryGirl.build(:note_set)
-
-      bar = FactoryGirl.build(:bar)
-      bar.add note_set
-
-      root = FactoryGirl.build(:base)
-      root.add bar
-
-      note_set.root.should == root
-    end
-  end
-
-  describe "name" do
+  describe "#name" do
     it "should be the given name, if available" do
       FactoryGirl.build(:bar, :name => :Intro).name.should == :Intro
     end
@@ -194,28 +180,28 @@ describe Node::Base do
     end
   end
 
-  describe "id" do
+  describe "#id" do
     it "should be 1 by default" do
       child = FactoryGirl.build(:note_set)
       child.id.should == 1
     end
   end
 
-  describe "id_as_word" do
+  describe "#id_as_word" do
     it "should camelize if necessary" do
       node = FactoryGirl.build(:base, :id => 24)
       node.id_as_word.should == "TwentyFour"
     end
   end
 
-  describe "definition_name" do
+  describe "#definition_name" do
     it "should turn the name to a lilypond acceptable name" do
       node = FactoryGirl.build(:base, :name => "Verse 1 line-2")
       node.definition_name.should == "VerseOneLineTwo"
     end
   end
 
-  describe "descendants(klass)" do
+  describe "#descendants" do
     it "should be itself if it is an instance of the klass" do
       tab = FactoryGirl.build(:tab, :children => [FactoryGirl.build(:bar)])
       tab.descendants(Node::Tab).should == [tab]
@@ -244,14 +230,14 @@ describe Node::Base do
         ])
       ])
 
-      bar = tab.own_children[0]
+      bar = tab.children[0]
 
-      stanza = tab.own_children[2]
+      stanza = tab.children[2]
       stanza.descendants(Node::Bar).should == [bar]
     end
   end
 
-  describe "chorded" do
+  describe "#chorded" do
     it "should return the chorded version of the node" do
       node = FactoryGirl.build(:base)
       chorded_version = node.chorded
@@ -260,7 +246,7 @@ describe Node::Base do
     end
   end
 
-  describe "stanza_version" do
+  describe "#stanza_version" do
     it "should be a stanza version of the node" do
       node = FactoryGirl.build(:base)
       stanza_version = node.stanza_version
@@ -269,7 +255,7 @@ describe Node::Base do
     end
   end
 
-  describe "ancestor(node_class)" do
+  describe "#ancestor" do
     it "should be the first ancestor of the node matching the node class" do
       bar = FactoryGirl.build(:bar)
       line = FactoryGirl.build(:line, :name => 'Intro', :children => [bar])
@@ -283,4 +269,12 @@ describe Node::Base do
       bar.ancestor(Node::Stanza).should be_nil
     end
   end
+
+  describe "#call_value" do
+    it "should be the call name by default" do
+      node = FactoryGirl.build(:base, :name => 'MyNode')
+      node_version = Node::Base::NodeVersion.new(:node => node)
+      node.call_value(node_version).should == '\nBaseMyNode'
+    end
+  end
 end

data/spec/lib/gitara/node/chord_set/chorded_version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'ChordSet::ChordedVersion' do
-  describe "value" do
+describe Gitara::Node::ChordSet::ChordedVersion do
+  describe "#value" do
     it "should be the chord set's value" do
       chorded_version = FactoryGirl.build(:chorded_chord_set, :node => FactoryGirl.build(:chord_set, :name => :Am, :value => '4r-"Am" r r r'))
       chorded_version.value.should == '4r-"Am" r r r'

data/spec/lib/gitara/node/chord_set_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
 
-describe Node::ChordSet do
+describe Gitara::Node::ChordSet do
 end

data/spec/lib/gitara/node/note_set_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
 
-describe Node::NoteSet do
+describe Gitara::Node::NoteSet do
 end

data/spec/lib/gitara/node/repeat_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Gitara::Node::Repeat do
+  describe "#call_value" do
+    it "should be a call to lilypond's repeat command" do
+      repeat = FactoryGirl.build(:repeat, :value => 2, :children => [
+        FactoryGirl.build(:bar)
+      ])
+
+      version = Node::Base::NodeVersion.new(:node => repeat)
+      repeat.call_value(version).should == "\\repeat volta 2 { \\nBarRepeatOneBarOne }"
+    end
+  end
+
+end