gitara 0.4.0 → 0.4.1

data/examples/tab.ly

@@ -29,26 +29,32 @@ cChordSetFD = { r4-"F" r r-"D" r }
 vOneBarBeganIt = { \skip 4 <a\3 c'\2 >8 <g\3>8 \skip 4 <g\3 c'\2 >8 <g\3>8 }
 vTwoBarBeganIt = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 cBarBeganIt = { \cChordSetFC }
+sBarBeganIt = { r1 }
 
 vOneBarItsNot = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
 vTwoBarItsNot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 cBarItsNot = { \cChordSetFC }
+sBarItsNot = { r1 }
 
 vOneBarItThough = { r8 <d'\2>16( <c'\2>16) r8 <a\3>16 <c'\2>16 r8 <d'\2>16( <c'\2>16) r8 <a\3>8 }
 vTwoBarItThough = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
 cBarItThough = { \cChordSetFD }
+sBarItThough = { r1 }
 
 vOneBarWhatYouThought = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
 vTwoBarWhatYouThought = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 cBarWhatYouThought = { \cChordSetFC }
+sBarWhatYouThought = { r1 }
 
 vOneBarWhenYouFirst = { <e'\1>8 <d'\2>16( <c'\2>8) <a\3>8. <c'\2>4 <a\3>8 <c'\2>8 }
 vTwoBarWhenYouFirst = { <a,\5>4 <a,\5>8 <e\4>4 <a,\5>4 \skip 8 }
 cBarWhenYouFirst = { \cChordSetAm }
+sBarWhenYouFirst = { r1 }
 
 vOneBarYouGot = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
 vTwoBarYouGot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 cBarYouGot = { \cChordSetFC }
+sBarYouGot = { r1 }
 
 
 %-----------------------------------------------------------------------
@@ -57,10 +63,12 @@ cBarYouGot = { \cChordSetFC }
 vOneLineVerseOneLineTwo = { \vOneBarYouGot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarItThough \break }
 vTwoLineVerseOneLineTwo = { \vTwoBarYouGot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarItThough \break }
 cLineVerseOneLineTwo = { \cBarYouGot \cBarWhatYouThought \cBarWhenYouFirst \cBarItThough }
+sLineVerseOneLineTwo = { \sBarYouGot \sBarWhatYouThought \sBarWhenYouFirst \sBarItThough }
 
 vOneLineVerseOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
 vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
 cLineVerseOneLineOne = { \cBarItsNot \cBarWhatYouThought \cBarWhenYouFirst \cBarBeganIt }
+sLineVerseOneLineOne = { \sBarItsNot \sBarWhatYouThought \sBarWhenYouFirst \sBarBeganIt }
 
 
 %-----------------------------------------------------------------------
@@ -69,6 +77,7 @@ cLineVerseOneLineOne = { \cBarItsNot \cBarWhatYouThought \cBarWhenYouFirst \cBar
 vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
 cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
+sStanzaVerseOne = { \sLineVerseOneLineOne \sLineVerseOneLineTwo }
 
 
 %-----------------------------------------------------------------------
@@ -77,6 +86,7 @@ cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
 vOneScoreTabOneScoreOne = { \vOneStanzaVerseOne }
 vTwoScoreTabOneScoreOne = { \vTwoStanzaVerseOne }
 cScoreTabOneScoreOne = { \cStanzaVerseOne }
+sScoreTabOneScoreOne = { \sStanzaVerseOne }
 
 
 %-----------------------------------------------------------------------
@@ -96,9 +106,7 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = {
-  r1^"Verse 1" r r r r r r r
-}
+stanzaHeadings = { \sScoreTabOneScoreOne }
 
 %-----------------------------------------------------------------------
 % Chord Headings

data/gitara.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "valuable"
 
+  s.add_development_dependency "factory_girl"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "pry"

data/lib/gitara.rb

@@ -7,14 +7,17 @@ require "valuable"
 
 require "gitara/app"
 require "gitara/dsl"
+require "gitara/is_node_version"
 require "gitara/node/base"
-require "gitara/node/base/chorded_node"
-require "gitara/node/base/voiced_node"
+require "gitara/node/base/chorded_version"
+require "gitara/node/base/stanza_version"
+require "gitara/node/base/voiced_version"
 require "gitara/node/bar"
-require "gitara/node/bar/chorded_node"
-require "gitara/node/bar/voiced_node"
+require "gitara/node/bar/chorded_version"
+require "gitara/node/bar/stanza_version"
+require "gitara/node/bar/voiced_version"
 require "gitara/node/chord_set"
-require "gitara/node/chord_set/chorded_node"
+require "gitara/node/chord_set/chorded_version"
 require "gitara/node/line"
 require "gitara/node/note_set"
 require "gitara/node/score"

data/lib/gitara/is_node_version.rb

@@ -0,0 +1,23 @@
+module Gitara
+  module IsNodeVersion
+    def call_name
+      "\\#{definition_name}"
+    end
+
+    def children
+      node.children.map{|child| self.class.new(:node => child)}
+    end
+
+    def definition_name
+      "#{prefix}#{node.class.to_s.split('::').last}#{node.definition_name}"
+    end
+
+    def prefix
+      self.class.to_s.split('::').last[0].downcase
+    end
+
+    def value
+      children.map(&:call_name).join(' ')
+    end
+  end
+end

data/lib/gitara/node/bar.rb

@@ -1,9 +1,21 @@
 module Gitara
   module Node
     class Bar < Base
+      def first_bar_of_stanza?
+        stanza && stanza.descendants(Node::Bar)[0] == self
+      end
+
       def note_sets
         children.select{|child| child.is_a?(Node::NoteSet)}
       end
+
+      def stanza
+        self.ancestor(Node::Stanza)
+      end
+
+      def stanza_heading
+        first_bar_of_stanza? ? %Q|r1^"#{ancestor(Node::Stanza).name}"| : "r1"
+      end
     end
   end
 end

data/lib/gitara/node/bar/{chorded_node.rb → chorded_version.rb}

@@ -1,7 +1,7 @@
 module Gitara
   module Node
     class Bar
-      class ChordedNode < Base::ChordedNode
+      class ChordedVersion < Base::ChordedVersion
         def value
           node.descendants(Node::ChordSet).map(&:chorded).map(&:call_name).join(' ')
         end

data/lib/gitara/node/bar/stanza_version.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class Bar
+      class StanzaVersion < Base::StanzaVersion
+        def value
+          node.stanza_heading
+        end
+      end
+    end
+  end
+end

data/lib/gitara/node/bar/{voiced_node.rb → voiced_version.rb}

@@ -1,7 +1,7 @@
 module Gitara
   module Node
     class Bar
-      class VoicedNode < Base::VoicedNode
+      class VoicedVersion < Base::VoicedVersion
         alias_method :bar, :node
 
         def matching_note_set

data/lib/gitara/node/base.rb

@@ -12,6 +12,10 @@ module Gitara
         child.parent = self
       end
 
+      def ancestor(node_class)
+        self.is_a?(node_class) ? self : self.parent && self.parent.ancestor(node_class)
+      end
+
       def children
         if own_children.empty?
           definition ? definition.own_children : []
@@ -21,13 +25,14 @@ module Gitara
       end
 
       def children=(values)
+        own_children.clear
         values.each do |child|
           add child
         end
       end
 
       def chorded
-        self.class::ChordedNode.new(:node => self)
+        self.class::ChordedVersion.new(:node => self)
       end
 
       def definition(target = self)
@@ -82,13 +87,17 @@ module Gitara
         parent.nil? ? self : parent.root
       end
 
+      def stanza_version
+        self.class::StanzaVersion.new(:node => self)
+      end
+
       def value
         attributes[:value] ? attributes[:value].gsub('/', "\\") : nil
       end
 
       def voiced_as(arg)
         if arg.is_a?(Voice)
-          self.class::VoicedNode.new(:node => self, :voice => arg)
+          self.class::VoicedVersion.new(:node => self, :voice => arg)
         elsif arg.is_a?(Array)
           arg.map{|voice| self.voiced_as(voice) }
         else

data/lib/gitara/node/base/chorded_version.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class Base
+      class ChordedVersion < Valuable
+        include IsNodeVersion
+
+        has_value :node
+      end
+    end
+  end
+end

data/lib/gitara/node/base/stanza_version.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class Base
+      class StanzaVersion < Valuable
+        include IsNodeVersion
+
+        has_value :node
+      end
+    end
+  end
+end

data/lib/gitara/node/base/{voiced_node.rb → voiced_version.rb}

@@ -1,20 +1,18 @@
 module Gitara
   module Node
     class Base
-      class VoicedNode < Valuable
+      class VoicedVersion < Valuable
+        include IsNodeVersion
+
         has_value :node
         has_value :voice
 
-        def call_name
-          "\\#{definition_name}"
-        end
-
         def children
           node.children.map{|child| child.voiced_as(voice) }
         end
 
-        def definition_name
-          "#{voice.definition_name}#{node.class.to_s.split('::').last}#{node.definition_name}"
+        def prefix
+          voice.definition_name
         end
       end
     end

data/lib/gitara/node/chord_set/{chorded_node.rb → chorded_version.rb}

@@ -1,7 +1,7 @@
 module Gitara
   module Node
     class ChordSet
-      class ChordedNode < Base::ChordedNode
+      class ChordedVersion < Base::ChordedVersion
         def value
           node.value
         end

data/lib/gitara/template/bar.erb

@@ -2,3 +2,4 @@
 <%= voiced_bar.definition_name %> = { <%= voiced_bar.matching_note_set.value %> }
 <% end %>
 <%= self.chorded.definition_name %> = { <%= self.chorded.value %> }
+<%= self.stanza_version.definition_name %> = { <%= self.stanza_version.value %> }

data/lib/gitara/template/line.erb

@@ -1,4 +1,5 @@
 <% self.voiced_as(self.root.voices).each do |voiced_line| %>
-<%= voiced_line.definition_name %> = { <%= voiced_line.children.map(&:call_name).join(' ') %> \break }
+<%= voiced_line.definition_name %> = { <%= voiced_line.value %> \break }
 <% end %>
 <%= self.chorded.definition_name %> = { <%= self.chorded.value %> }
+<%= self.stanza_version.definition_name %> = { <%= self.stanza_version.value %> }

data/lib/gitara/template/score.erb

@@ -1,4 +1,5 @@
 <% self.voiced_as(self.root.voices).each do |voiced_score| %>
-<%= voiced_score.definition_name %> = { <%= voiced_score.children.map(&:call_name).join(' ') %> }
+<%= voiced_score.definition_name %> = { <%= voiced_score.value %> }
 <% end %>
 <%= self.chorded.definition_name %> = { <%= self.chorded.value %> }
+<%= self.stanza_version.definition_name %> = { <%= self.stanza_version.value %> }

data/lib/gitara/template/stanza.erb

@@ -1,4 +1,5 @@
 <% self.voiced_as(self.root.voices).each do |voiced_stanza| %>
-<%= voiced_stanza.definition_name %> = { <%= voiced_stanza.children.map(&:call_name).join(' ') %> }
+<%= voiced_stanza.definition_name %> = { <%= voiced_stanza.value %> }
 <% end %>
 <%= self.chorded.definition_name %> = { <%= self.chorded.value %> }
+<%= self.stanza_version.definition_name %> = { <%= self.stanza_version.value %> }

data/lib/gitara/template/tab.erb

@@ -57,11 +57,7 @@
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = {
-  <% definitions(Gitara::Node::Stanza).each do |stanza| %>
-  <%= stanza.heading_in_lilypond %>
-  <% end %>
-}
+stanzaHeadings = { <%= playable_child.stanza_version.call_name %> }
 
 %-----------------------------------------------------------------------
 % Chord Headings

data/lib/gitara/version.rb

@@ -1,3 +1,3 @@
 module Gitara
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/factories.rb

@@ -0,0 +1,54 @@
+FactoryGirl.define do
+  factory :note_set, :class => Node::NoteSet do
+  end
+
+  factory :app, :class => App do
+  end
+
+  factory :bar, :class => Node::Bar do
+    children [FactoryGirl.build(:note_set)]
+  end
+
+  factory :base, :class => Node::Base do
+  end
+
+  factory :chord_set, :class => Node::ChordSet do
+  end
+
+  factory :chorded_bar, :class => Node::Bar::ChordedVersion do
+  end
+
+  factory :chorded_chord_set, :class => Node::ChordSet::ChordedVersion do
+  end
+
+  factory :dsl, :class => Dsl do
+  end
+
+  factory :line, :class => Node::Line do
+    children [FactoryGirl.build(:bar)]
+  end
+
+  factory :stanza, :class => Node::Stanza do
+    children [FactoryGirl.build(:line)]
+  end
+
+  factory :stanza_version_bar, :class => Node::Bar::StanzaVersion do
+  end
+
+  factory :score, :class => Node::Score do
+    children [FactoryGirl.build(:stanza)]
+  end
+
+  factory :tab, :class => Node::Tab do
+    children [FactoryGirl.build(:score)]
+  end
+
+  factory :voice, :class => Voice do
+  end
+
+  factory :voiced_bar, :class => Node::Bar::VoicedVersion do
+  end
+
+  factory :voiced_version, :class => Node::Base::VoicedVersion do
+  end
+end

data/spec/lib/gitara/app_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe App do
   describe "export" do
     it "can convert a tab without a reused bar to lilypond" do
-      app = Gitara::App.new
+      app = FactoryGirl.build(:app)
       app.invoke :export, ['examples/tab.rb'], "target-directory" => test_tmp_dir.path, "run-lilypond" => false
 
       example = Pow('examples/tab.ly').read

data/spec/lib/gitara/dsl_spec.rb

@@ -4,7 +4,7 @@ describe Gitara do
   describe Dsl do
     describe "bar(name, &block)" do
       it "should add a bar with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.bar 'Intro'
@@ -17,10 +17,10 @@ describe Gitara do
       end
 
       it "should add the children declared in the block to the bar" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        note_set = Node::NoteSet.new
+        note_set = FactoryGirl.build(:note_set)
 
         dsl.bar 'Intro' do
           add note_set
@@ -37,10 +37,10 @@ describe Gitara do
 
     describe "add(child, &block)" do
       it "should add the child to the dsl's node" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        bar = Node::Bar.new(:name => 'Intro')
+        bar = FactoryGirl.build(:bar, :name => 'Intro')
 
         dsl.add bar
 
@@ -49,11 +49,11 @@ describe Gitara do
       end
 
       it "should add the children in the block to the child" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        bar = Node::Bar.new
-        note_set = Node::NoteSet.new
+        bar = FactoryGirl.build(:bar, :children => [])
+        note_set = FactoryGirl.build(:note_set)
 
         dsl.add bar do
           add note_set
@@ -69,7 +69,7 @@ describe Gitara do
 
     describe "notes(value)" do
       it "should add a note set with the value" do
-        dsl = Dsl.new(:node => Node::Bar.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:bar, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.notes 'test'
@@ -81,7 +81,7 @@ describe Gitara do
 
     describe "line(name, &block)" do
       it "should add a line with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.line 'Intro'
@@ -94,10 +94,10 @@ describe Gitara do
       end
 
       it "should add the children declared in the block to the line" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        bar = Node::Bar.new
+        bar = FactoryGirl.build(:bar)
 
         dsl.line 'Intro' do
           add bar
@@ -114,7 +114,7 @@ describe Gitara do
 
     describe "add_names(o)" do
       it "should add a node with o[:name] of o[:node_class] to the node" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.add_names :names => [:Intro, :Intro], :node_class => Node::Bar
@@ -127,7 +127,7 @@ describe Gitara do
       end
 
       it "should add a node with nil name if the o[:names] is blank" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.add_names :names => [], :node_class => Node::Bar
@@ -140,7 +140,7 @@ describe Gitara do
 
     describe "score(name, &block)" do
       it "should add a score with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.score
@@ -153,10 +153,10 @@ describe Gitara do
       end
 
       it "should add the children declared in the block to the score" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        note_set = Node::NoteSet.new
+        note_set = FactoryGirl.build(:note_set)
 
         dsl.score do
           add note_set
@@ -172,7 +172,7 @@ describe Gitara do
 
     describe "stanza(name, &block)" do
       it "should add a stanza with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.stanza 'Intro'
@@ -185,10 +185,10 @@ describe Gitara do
       end
 
       it "should add the children declared in the block to the stanza" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
-        line = Node::Line.new
+        line = FactoryGirl.build(:line)
 
         dsl.stanza 'Intro' do
           add line
@@ -206,9 +206,9 @@ describe Gitara do
     [:title, :composer, :arranger, :instrument, :midi_instrument, :tempo, :transposition].each do |property|
       describe "#{property}(value)" do
         it "should set the #{property} of the tab to value" do
-          tab =Node::Tab.new
+          tab = FactoryGirl.build(:tab)
 
-          dsl = Dsl.new(:node => tab)
+          dsl = FactoryGirl.build(:dsl, :node => tab)
           dsl.send property, "test"
 
           tab.send(property).should == "test"
@@ -218,7 +218,7 @@ describe Gitara do
 
     describe "chords(name, value)" do
       it "should add a chord set with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.chords :Am, 'r4-"Am" r r r'
@@ -233,7 +233,7 @@ describe Gitara do
 
     describe "chords(name)" do
       it "should add a bar with the name" do
-        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
         dsl.node.own_children.should be_empty
 
         dsl.chords :Am