gitara 0.4.0 → 0.4.1

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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe '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'
+    end
+  end
+end
+

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

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe 'Stanza' do
   describe "heading_in_lilypond" do
     it "should allow the stanza's name to be added as a heading to the lilypond template" do
-      stanza = Node::Stanza.new(:name => "Verse 1", :children => [
-        Node::Line.new(:children => [
-          Node::Bar.new(:children => [Node::NoteSet.new]),
-          Node::Bar.new(:children => [Node::NoteSet.new]),
+      stanza = FactoryGirl.build(:stanza, :name => "Verse 1", :children => [
+        FactoryGirl.build(:line, :children => [
+          FactoryGirl.build(:bar),
+          FactoryGirl.build(:bar),
         ])
       ])
 

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

@@ -3,16 +3,12 @@ require 'spec_helper'
 describe 'Tab' do
   describe "voices" do
     it "should create a <max_number_of_voices> voices" do
-      tab = Node::Tab.new.tap {|tab|
-        tab.children = [
-          Node::Bar.new.tap {|bar|
-            bar.children = [
-              Node::NoteSet.new,
-              Node::NoteSet.new
-            ]
-          }
-        ]
-      }
+      tab = FactoryGirl.build(:tab, :children => [
+        FactoryGirl.build(:bar, :children => [
+          FactoryGirl.build(:note_set),
+          FactoryGirl.build(:note_set)
+        ])
+      ])
       voices = tab.voices
       voices.should have(2).values
       voices[0].id.should == 1
@@ -23,33 +19,26 @@ describe 'Tab' do
 
   describe "max_number_of_voices" do
     it "should be the max number of note_sets in a bar" do
-      tab = Node::Tab.new.tap {|tab|
-        tab.children = [
-          Node::Bar.new.tap {|bar|
-            bar.children = [
-              Node::NoteSet.new,
-              Node::NoteSet.new
-            ]
-          }
-        ]
-      }
+      tab = FactoryGirl.build(:tab, :children => [
+        FactoryGirl.build(:bar, :children => [
+          FactoryGirl.build(:note_set),
+          FactoryGirl.build(:note_set)
+        ])
+      ])
+
       tab.max_number_of_voices.should == 2
     end
   end
 
   describe "playable_child" do
     it "should be the last child of the tab" do
-      tab = Node::Tab.new.tap {|tab|
-        tab.children = [
-          Node::Bar.new(:name => 'Intro').tap {|bar|
-            bar.children = [
-              Node::NoteSet.new,
-              Node::NoteSet.new
-            ]
-          },
-          Node::Bar.new(:name => 'Intro')
-        ]
-      }
+      tab = FactoryGirl.build(:tab, :children => [
+        FactoryGirl.build(:bar, :name => 'Intro', :children => [
+          FactoryGirl.build(:note_set),
+          FactoryGirl.build(:note_set)
+        ]),
+        FactoryGirl.build(:bar, :name => 'Intro')
+      ])
 
       tab.playable_child.id.should == 2
     end
@@ -57,7 +46,7 @@ describe 'Tab' do
 
   describe "midi_instrument" do
     it "should have acoustic guitar (nylon) as default" do
-      tab = Node::Tab.new
+      tab = FactoryGirl.build(:tab)
       tab.midi_instrument.should == 'acoustic guitar (nylon)'
     end
   end

data/spec/lib/gitara/voice_spec.rb

@@ -3,82 +3,82 @@ require 'spec_helper'
 describe Voice do
   describe "call_name" do
     it "should be the variable name of the node when called inside lilypond" do
-      voice = Voice.new(:id => 1)
+      voice = FactoryGirl.build(:voice, :id => 1)
       voice.call_name.should == '\vOne'
     end
   end
 
   describe "definition_name" do
     it "should be the name of the voice in a lilypond variable definition statement" do
-      voice = Voice.new(:id => 1)
+      voice = FactoryGirl.build(:voice, :id => 1)
       voice.definition_name.should == "vOne"
     end
   end
 
   describe "id_as_word" do
     it "should convert the id to word" do
-      node = Voice.new(:id => 1)
+      node = FactoryGirl.build(:voice, :id => 1)
       node.id_as_word.should == "One"
     end
   end
 
   describe "stem_type" do
     it "should be the lilypond stem type for the voice" do
-      voice = Voice.new(:id => 1)
+      voice = FactoryGirl.build(:voice, :id => 1)
       voice.stem_type.should == '\voiceOne'
     end
   end
 
   describe "transposition" do
     it "should be based on the tab's transposition and the voice's octave" do
-      tab = Node::Tab.new(
+      tab = FactoryGirl.build(:tab, 
         :transposition => 'd',
         :children => [
-          Node::Bar.new(:children => [
-            Node::NoteSet.new,
-            Node::NoteSet.new
+          FactoryGirl.build(:bar, :children => [
+            FactoryGirl.build(:note_set),
+            FactoryGirl.build(:note_set)
           ])
         ]
       )
       tab.max_number_of_voices.should == 2
 
-      voice = Voice.new(:parent => tab, :id => 1)
+      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
       voice.transposition.should == "d''"
 
-      voice = Voice.new(:parent => tab, :id => 2)
+      voice = FactoryGirl.build(:voice, :parent => tab, :id => 2)
       voice.transposition.should == "d'"
     end
 
     it "should be blank if the tab has no transposition" do
-      tab = Node::Tab.new(
+      tab = FactoryGirl.build(:tab, 
         :children => [
-          Node::Bar.new(:children => [
-            Node::NoteSet.new,
-            Node::NoteSet.new
+          FactoryGirl.build(:bar, :children => [
+            FactoryGirl.build(:note_set),
+            FactoryGirl.build(:note_set)
           ])
         ]
       )
       tab.max_number_of_voices.should == 2
 
-      voice = Voice.new(:parent => tab, :id => 1)
+      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
       voice.transposition.should be_nil
     end
   end
 
   describe "octave" do
     it "should be based on the voice's position in the tab" do
-      tab = Node::Tab.new(:children => [
-        Node::Bar.new(:children => [
-          Node::NoteSet.new,
-          Node::NoteSet.new
+      tab = FactoryGirl.build(:tab, :children => [
+        FactoryGirl.build(:bar, :children => [
+          FactoryGirl.build(:note_set),
+          FactoryGirl.build(:note_set)
         ])
       ])
       tab.max_number_of_voices.should == 2
 
-      voice = Voice.new(:parent => tab, :id => 1)
+      voice = FactoryGirl.build(:voice, :parent => tab, :id => 1)
       voice.octave.should == 2
 
-      voice = Voice.new(:parent => tab, :id => 2)
+      voice = FactoryGirl.build(:voice, :parent => tab, :id => 2)
       voice.octave.should == 1
     end
   end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
+require 'factory_girl'
 require 'gitara'
 require 'pry'
 
 RSpec.configure do |config|
   include Gitara
+  require 'factories'
 
   config.before :each do
     test_tmp_dir.delete! if test_tmp_dir.exists?

metadata

@@ -1,186 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitara
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: active_support
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &68938610 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *68938610
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &68938130 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: linguistics
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *68938130
+- !ruby/object:Gem::Dependency
+  name: linguistics
+  requirement: &68937660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pow
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *68937660
+- !ruby/object:Gem::Dependency
+  name: pow
+  requirement: &68928100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *68928100
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &68927880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: valuable
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *68927880
+- !ruby/object:Gem::Dependency
+  name: valuable
+  requirement: &68927660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *68927660
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &68927440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *68927440
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &68927230 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *68927230
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &68927020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rb-inotify
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *68927020
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &68926690 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *68926690
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: &68926400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *68926400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &68926120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *68926120
 description: A Ruby DSL for generating Lilypond guitar tablatures.
-email: 
+email:
 - gsmendoza@gmail.com
-executables: 
+executables:
 - gitara
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -192,6 +162,10 @@ files:
 - examples/aimee-man-wise-up/aimee-man-wise-up.midi
 - examples/aimee-man-wise-up/aimee-man-wise-up.pdf
 - examples/aimee-man-wise-up/aimee-man-wise-up.rb
+- examples/eraserheads-huling-el-bimbo/tab.ly
+- examples/eraserheads-huling-el-bimbo/tab.midi
+- examples/eraserheads-huling-el-bimbo/tab.pdf
+- examples/eraserheads-huling-el-bimbo/tab.rb
 - examples/tab-with-bar.rb
 - examples/tab-with-reused-bar.rb
 - examples/tab.ly
@@ -201,14 +175,17 @@ files:
 - lib/gitara/app.rb
 - lib/gitara/dsl.rb
 - lib/gitara/dsl_macros.rb
+- lib/gitara/is_node_version.rb
 - lib/gitara/node/bar.rb
-- lib/gitara/node/bar/chorded_node.rb
-- lib/gitara/node/bar/voiced_node.rb
+- lib/gitara/node/bar/chorded_version.rb
+- lib/gitara/node/bar/stanza_version.rb
+- lib/gitara/node/bar/voiced_version.rb
 - lib/gitara/node/base.rb
-- lib/gitara/node/base/chorded_node.rb
-- lib/gitara/node/base/voiced_node.rb
+- lib/gitara/node/base/chorded_version.rb
+- lib/gitara/node/base/stanza_version.rb
+- lib/gitara/node/base/voiced_version.rb
 - lib/gitara/node/chord_set.rb
-- lib/gitara/node/chord_set/chorded_node.rb
+- lib/gitara/node/chord_set/chorded_version.rb
 - lib/gitara/node/line.rb
 - lib/gitara/node/note_set.rb
 - lib/gitara/node/score.rb
@@ -226,15 +203,18 @@ files:
 - lib/gitara/utilities.rb
 - lib/gitara/version.rb
 - lib/gitara/voice.rb
+- spec/factories.rb
 - spec/lib/gitara/app_spec.rb
 - spec/lib/gitara/dsl_spec.rb
-- spec/lib/gitara/node/bar/chorded_node_spec.rb
-- spec/lib/gitara/node/bar/voiced_node_spec.rb
+- spec/lib/gitara/is_node_version_spec.rb
+- spec/lib/gitara/node/bar/chorded_version_spec.rb
+- spec/lib/gitara/node/bar/stanza_version_spec.rb
+- spec/lib/gitara/node/bar/voiced_version_spec.rb
 - spec/lib/gitara/node/bar_spec.rb
-- spec/lib/gitara/node/base/chorded_node_spec.rb
-- spec/lib/gitara/node/base/voiced_node_spec.rb
+- spec/lib/gitara/node/base/chorded_version_spec.rb
+- spec/lib/gitara/node/base/voiced_version_spec.rb
 - spec/lib/gitara/node/base_spec.rb
-- spec/lib/gitara/node/chord_set/chorded_node_spec.rb
+- spec/lib/gitara/node/chord_set/chorded_version_spec.rb
 - spec/lib/gitara/node/chord_set_spec.rb
 - spec/lib/gitara/node/note_set_spec.rb
 - spec/lib/gitara/node/stanza_spec.rb
@@ -242,38 +222,28 @@ files:
 - spec/lib/gitara/voice_spec.rb
 - spec/lib/gitara_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gitara
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby + Lilypond = pretty guitar tablatures.
 test_files: []
-