head_music 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bbe45d50118d4f5f4bcf02e3192da3ddd2ec70
-  data.tar.gz: 1900eb67572a4bfb79e0b91c05673bfadd1f7c2c
+  metadata.gz: 208eb249d8215ed60a1047fa2ce44d615da37cf3
+  data.tar.gz: 9e02bbfcd8df9e1ca07dc737b594063831caf7f3
 SHA512:
-  metadata.gz: 30f5b988d501ca3286bc41da70c3ca3672d9d30438d81a5740c1c8db4bd1d4e3e9af594302aa928afea446c2d6197f1b3aa0d69280c1e94fc986e03359712872
-  data.tar.gz: d5534e5c7dadf6b7339d29b4db89256cf2d853b5415add44032c15eb24f1e10a83bb0d185d4437ef319a29f7c003f0b90228e3cce19bcfe22d5d73646255f561
+  metadata.gz: a76df5d52cfc41df45d538da2fb0b4443d64bd65f4713e412e611082853906495881c26631799bad5c1fd160eea7355baa6c3c8911ad4151f8c719f61866900a
+  data.tar.gz: 3153be5ac2b260d3ef0c9035d2e2772ba35d0871f831878eba88313365a843a08e24a4bb6ce59d1bc2fc661c388e317efdb7a2fc3ff92c76eed6db45b5165a3b

data/lib/head_music/consonance.rb

@@ -0,0 +1,20 @@
+class HeadMusic::Consonance
+  LEVELS = %w[perfect imperfect dissonant]
+
+  def self.get(name)
+    @consonances ||= {}
+    @consonances[name.to_sym] ||= new(name) if LEVELS.include?(name.to_s)
+  end
+
+  attr_reader :name
+
+  delegate :to_s, to: :name
+
+  def initialize(name)
+    @name = name.to_s.to_sym
+  end
+
+  LEVELS.each do |method_name|
+    define_method(:"#{method_name}?") { to_s == method_name }
+  end
+end

data/lib/head_music/functional_interval.rb

@@ -26,6 +26,7 @@ class HeadMusic::FunctionalInterval
 
   delegate :to_s, to: :name
   delegate :==, to: :to_s
+  delegate :perfect?, :major?, :minor?, :diminished?, :augmented?, :doubly_diminished?, :doubly_augmented?, to: :quality
 
   def self.get(name)
     words = name.to_s.split(/[_ ]+/)
@@ -136,4 +137,34 @@ class HeadMusic::FunctionalInterval
     end
     HeadMusic::FunctionalInterval.new(higher_pitch, inverted_low_pitch)
   end
+
+  def consonance
+    if quality.perfect?
+      if [number, simple_number].include?(4)
+        HeadMusic::Consonance.get(:dissonant)
+      else
+        HeadMusic::Consonance.get(:perfect)
+      end
+    elsif quality.major? || quality.minor?
+      if [number, simple_number] & [3, 6].empty?
+        HeadMusic::Consonance.get(:dissonant)
+      else
+        HeadMusic::Consonance.get(:imperfect)
+      end
+    else
+      HeadMusic::Consonance.get(:dissonant)
+    end
+  end
+
+  def skip?
+    number > 2
+  end
+
+  def step?
+    number <= 2
+  end
+
+  NUMBER_NAMES.each do |method_name|
+    define_method(:"#{method_name}?") { number_name == method_name }
+  end
 end

data/lib/head_music/quality.rb

@@ -59,5 +59,9 @@ class HeadMusic::Quality
     %w[a e i o u h].include?(name.to_s.first) ? 'an' : 'a'
   end
 
+  NAMES.each do |method_name|
+    define_method(:"#{method_name}?") { name == method_name }
+  end
+
   private_class_method :new
 end

data/lib/head_music/scale.rb

@@ -42,8 +42,8 @@ class HeadMusic::Scale
     end
   end
 
-  def spellings
-    pitches.map(&:spelling).map(&:to_s)
+  def spellings(direction: :ascending, octaves: 1)
+    pitches(direction: direction, octaves: octaves).map(&:spelling).map(&:to_s)
   end
 
   def pitch_names(direction: :ascending, octaves: 1)

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/head_music.rb

@@ -6,6 +6,7 @@ require "humanize"
 
 require "head_music/accidental"
 require "head_music/circle"
+require "head_music/consonance"
 require "head_music/functional_interval"
 require "head_music/interval"
 require "head_music/key_signature"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ files:
 - lib/head_music.rb
 - lib/head_music/accidental.rb
 - lib/head_music/circle.rb
+- lib/head_music/consonance.rb
 - lib/head_music/functional_interval.rb
 - lib/head_music/interval.rb
 - lib/head_music/key_signature.rb