head_music 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fa77af760e9919b585bfb9db2e53d30b382ecf
-  data.tar.gz: 244d2c9e9d85800cfc0f897773e17d4a1410c885
+  metadata.gz: 823f43abc378e376a7302ceb5338ba72e2a29ed6
+  data.tar.gz: 0f4759f0ab0699dabca8510df197e7c19141011b
 SHA512:
-  metadata.gz: 89befc698de10095285b790246b6102bcd6d1ca94c3cf50ea19ee39c9f60e00de277c954172a652e7af1209d3660d33e8d002111aa1c4a426e3be82a574d683e
-  data.tar.gz: 71e3d3c4ed45c6b7407d077fb500227d1a372518190bd3cc3400d8bcdb49aea803c2d11b8815c4568b44ef2e5b5a2cc0022e1bef9eabee0eedb7c6ab5d23ec22
+  metadata.gz: 54cb6e28840e3578e3ec278410be1f79c919943153f7d20b99ffcf9c5e856b326ddd7123a833ed4df469205d9919b8aa35a81f2c5e4d905bfe58407218d38955
+  data.tar.gz: 847ee46aebc7cb4b415641bfd94eb4826959f55d754bee89006c9dab3c86c7b923e18317396b75fc3d421bf40ff1b97f2f66420bbe2e2eb28823ffa32b86cc61

data/lib/head_music/clef.rb

@@ -20,14 +20,16 @@ class HeadMusic::Clef
   def self.get(name)
     name = name.to_s
     @clefs ||= {}
-    @clefs[name.to_s.to_sym] = new(name)
+    key = HeadMusic::Utilities::HashKey.for(name)
+    @clefs[key] ||= new(name)
   end
 
   attr_reader :name, :pitch, :line
+  delegate :to_s, to: :name
 
   def initialize(name)
     @name = name.to_s
-    clef_data = CLEFS.detect { |clef| clef[:names].include?(name) }
+    clef_data = CLEFS.detect { |clef| clef[:names].map(&:downcase).include?(name.downcase) }
     @pitch = HeadMusic::Pitch.get(clef_data[:pitch])
     @line = clef_data[:line]
   end
@@ -51,4 +53,8 @@ class HeadMusic::Clef
       pitch.natural_steps(steps)
     end
   end
+
+  def ==(other)
+    to_s == other.to_s
+  end
 end

data/lib/head_music/grand_staff.rb

@@ -0,0 +1,53 @@
+class HeadMusic::GrandStaff
+  GRAND_STAVES = {
+    piano: {
+      instrument: :piano,
+      staves: [
+        { clef: :treble, instrument: :piano },
+        { clef: :bass, instrument: :piano }
+      ]
+    },
+    organ: {
+      instrument: :organ,
+      staves: [
+        { clef: :treble, instrument: :organ },
+        { clef: :bass, instrument: :organ },
+        { clef: :bass, instrument: :pedals }
+      ]
+    }
+  }
+
+  def self.get(name)
+    @grand_staves ||= {}
+    hash_key = HeadMusic::Utilities::HashKey.for(name)
+    return nil unless GRAND_STAVES.keys.include?(hash_key)
+    @grand_staves[hash_key] ||= new(hash_key)
+  end
+
+  attr_reader :identifier, :data
+
+  def initialize(name)
+    @identifier = HeadMusic::Utilities::HashKey.for(name)
+    @data = GRAND_STAVES[identifier]
+  end
+
+  def instrument
+    @instrument ||= HeadMusic::Instrument.get(data[:instrument])
+  end
+
+  def staves
+    @staves ||= begin
+      data[:staves].map { |staff|
+        HeadMusic::Staff.new(staff[:clef], instrument: staff[:instrument] || instrument)
+      }
+    end
+  end
+
+  def brace_staves_index_first
+    0
+  end
+
+  def brace_staves_index_last
+    1
+  end
+end

data/lib/head_music/instrument.rb

@@ -0,0 +1,51 @@
+class HeadMusic::Instrument
+  INSTRUMENTS = {
+    violin: {
+      name: "violin",
+      family: :string,
+      default_clef: :treble
+    },
+    piano: {
+      name: "piano",
+      family: :string,
+      default_system: [:treble, :bass]
+    }
+  }
+
+  def self.get(name)
+    @instruments ||= {}
+    key = HeadMusic::Utilities::HashKey.for(name)
+    @instruments[key] ||= new(name.to_s)
+  end
+
+  attr_reader :name
+  delegate :to_s, to: :name
+
+  def initialize(name)
+    @name = name.to_s
+  end
+
+  def data
+    @data ||= INSTRUMENTS[hash_key]
+  end
+
+  def hash_key
+    HeadMusic::Utilities::HashKey.for(name)
+  end
+
+  def family
+    data[:family]
+  end
+
+  def default_system
+    data[:default_system]
+  end
+
+  def default_clef
+    data[:default_clef]
+  end
+
+  def ==(other)
+    to_s == other.to_s
+  end
+end

data/lib/head_music/staff.rb

@@ -0,0 +1,12 @@
+class HeadMusic::Staff
+  DEFAULT_LINE_COUNT = 5
+
+  attr_reader :default_clef, :line_count, :instrument
+  alias_method :clef, :default_clef
+
+  def initialize(default_clef, instrument: nil, line_count: nil)
+    @default_clef = HeadMusic::Clef.get(default_clef)
+    @line_count = line_count || DEFAULT_LINE_COUNT
+    @instrument = HeadMusic::Instrument.get(instrument) if instrument
+  end
+end

data/lib/head_music/utilities/hash_key.rb

@@ -0,0 +1,9 @@
+module HeadMusic
+  module Utilities
+    class HashKey
+      def self.for(name)
+        name.to_s.downcase.gsub(/\W+/, '_').to_sym
+      end
+    end
+  end
+end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/lib/head_music.rb

@@ -9,6 +9,8 @@ require 'head_music/circle'
 require 'head_music/clef'
 require 'head_music/consonance'
 require 'head_music/functional_interval'
+require 'head_music/grand_staff'
+require 'head_music/instrument'
 require 'head_music/interval'
 require 'head_music/key_signature'
 require 'head_music/letter_name'
@@ -23,6 +25,8 @@ require 'head_music/rhythmic_value'
 require 'head_music/scale'
 require 'head_music/scale_type'
 require 'head_music/spelling'
+require 'head_music/staff'
+require 'head_music/utilities/hash_key'
 
 module HeadMusic
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,6 +119,8 @@ files:
 - lib/head_music/clef.rb
 - lib/head_music/consonance.rb
 - lib/head_music/functional_interval.rb
+- lib/head_music/grand_staff.rb
+- lib/head_music/instrument.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb
 - lib/head_music/letter_name.rb
@@ -133,6 +135,8 @@ files:
 - lib/head_music/scale.rb
 - lib/head_music/scale_type.rb
 - lib/head_music/spelling.rb
+- lib/head_music/staff.rb
+- lib/head_music/utilities/hash_key.rb
 - lib/head_music/version.rb
 homepage: https://github.com/roberthead/head_music
 licenses: