stave 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298ec095fbd8df1e9ee1f77db4708598d0fbb433a3d364810884787451dcec21
-  data.tar.gz: 1c89449bb41bdabb016ef555b0cc8962eb9d6cf99fe90f35e689632c326ff48a
+  metadata.gz: 8dbd5c1307918d3c9af4689f6126d374ab8d7a31b03777f0bc3e9a32cf127188
+  data.tar.gz: 985afcf77f58ea34b29e1f16f3ee98b01b711ae2701d0c7f0b084586ca553b64
 SHA512:
-  metadata.gz: 134a5a015273135682beec053a9985eb6f0084e972a516f26da08a221b3c16edee37c3d4ac1ec46c2ffedc4d7b77206ccd539b041a772214ca31ae295ead4c64
-  data.tar.gz: 3d7b9d994d481785c8625757caa253fd4ae2f70e1f9a24531758a7ed392bccbe24a10912069ed2fa2ef51f13be4bf22d09a7c93ad72e267ee487773547435140
+  metadata.gz: 0d318f7a0cf99045f8e7191734c8d0adb6f41af1d7fc0d63e91176ca2c60328cbe8c731011a2697736068bf0e4326d6032eb287ee818928ef06f900fdb2326b9
+  data.tar.gz: 26f57ce7d59c8b333c2f4db3988763eb46c1ec1ab2c36cea23df1ac387ebd2104fc15e24293fe41929f37c3018136fc0c84701e78fc55b734952344ee8ea5d0a

data/lib/stave/theory/note.rb

@@ -1,6 +1,6 @@
 module Stave
   module Theory
-    class Note < Core::Lookup
+    class Note < Core::Lookup # rubocop:disable Metrics/ClassLength
       class PitchClass < Core::Lookup
         variant :c, index: 0, symbol: "C", to_i: 0
         variant :d, index: 1, symbol: "D", to_i: 2
@@ -26,59 +26,157 @@ module Stave
       end
 
       with_options pitch_class: PitchClass.a do
-        variant :a_double_flat,  accidental: Accidental.double_flat
-        variant :a_flat,         accidental: Accidental.flat
-        variant :a_natural,      accidental: Accidental.natural
-        variant :a_sharp,        accidental: Accidental.sharp
-        variant :a_double_sharp, accidental: Accidental.double_sharp
+        variant :a_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :a_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :a_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :a_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: false
+
+        variant :a_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.b do
-        variant :b_double_flat,  accidental: Accidental.double_flat
-        variant :b_flat,         accidental: Accidental.flat
-        variant :b_natural,      accidental: Accidental.natural
-        variant :b_sharp,        accidental: Accidental.sharp
-        variant :b_double_sharp, accidental: Accidental.double_sharp
+        variant :b_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :b_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :b_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :b_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: false
+
+        variant :b_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.c do
-        variant :c_double_flat,  accidental: Accidental.double_flat
-        variant :c_flat,         accidental: Accidental.flat
-        variant :c_natural,      accidental: Accidental.natural
-        variant :c_sharp,        accidental: Accidental.sharp
-        variant :c_double_sharp, accidental: Accidental.double_sharp
+        variant :c_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :c_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :c_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :c_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: true
+
+        variant :c_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.d do
-        variant :d_double_flat,  accidental: Accidental.double_flat
-        variant :d_flat,         accidental: Accidental.flat
-        variant :d_natural,      accidental: Accidental.natural
-        variant :d_sharp,        accidental: Accidental.sharp
-        variant :d_double_sharp, accidental: Accidental.double_sharp
+        variant :d_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :d_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :d_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :d_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: false
+
+        variant :d_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.e do
-        variant :e_double_flat,  accidental: Accidental.double_flat
-        variant :e_flat,         accidental: Accidental.flat
-        variant :e_natural,      accidental: Accidental.natural
-        variant :e_sharp,        accidental: Accidental.sharp
-        variant :e_double_sharp, accidental: Accidental.double_sharp
+        variant :e_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :e_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :e_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :e_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: false
+
+        variant :e_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.f do
-        variant :f_double_flat,  accidental: Accidental.double_flat
-        variant :f_flat,         accidental: Accidental.flat
-        variant :f_natural,      accidental: Accidental.natural
-        variant :f_sharp,        accidental: Accidental.sharp
-        variant :f_double_sharp, accidental: Accidental.double_sharp
+        variant :f_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :f_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: false
+
+        variant :f_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :f_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: true
+
+        variant :f_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       with_options pitch_class: PitchClass.g do
-        variant :g_double_flat,  accidental: Accidental.double_flat
-        variant :g_flat,         accidental: Accidental.flat
-        variant :g_natural,      accidental: Accidental.natural
-        variant :g_sharp,        accidental: Accidental.sharp
-        variant :g_double_sharp, accidental: Accidental.double_sharp
+        variant :g_double_flat,
+                accidental: Accidental.double_flat,
+                circle_of_fifths?: false
+
+        variant :g_flat,
+                accidental: Accidental.flat,
+                circle_of_fifths?: true
+
+        variant :g_natural,
+                accidental: Accidental.natural,
+                circle_of_fifths?: true
+
+        variant :g_sharp,
+                accidental: Accidental.sharp,
+                circle_of_fifths?: false
+
+        variant :g_double_sharp,
+                accidental: Accidental.double_sharp,
+                circle_of_fifths?: false
       end
 
       def +(other)
@@ -116,6 +214,10 @@ module Stave
         note_above(interval.invert!)
       end
 
+      def self.double_flats
+        where(accidental: Accidental.double_flat)
+      end
+
       def self.flats
         where(accidental: Accidental.flat)
       end
@@ -128,12 +230,16 @@ module Stave
         where(accidental: Accidental.sharp)
       end
 
+      def self.double_sharps
+        where(accidental: Accidental.double_sharp)
+      end
+
       def self.single_accidental
         flats + naturals + sharps
       end
 
       def self.circle_of_fifths
-        Circle.new(type: CircleType.fifths, root: Note.c_natural).notes
+        where(circle_of_fifths?: true)
       end
     end
   end

data/lib/stave/theory/scale.rb

@@ -6,13 +6,13 @@ module Stave
       end
 
       def triads
-        return unless type.hexatonic?
+        return unless type.heptatonic?
 
         harmonise!(type.triad_types)
       end
 
       def sevenths
-        return unless type.hexatonic?
+        return unless type.heptatonic?
 
         harmonise!(type.seventh_types)
       end
@@ -26,6 +26,10 @@ module Stave
         )
       end
 
+      def symbol
+        "#{root.symbol} #{type.symbol}"
+      end
+
       private
 
       def harmonise!(chord_types)

data/lib/stave/theory/scale_type.rb

@@ -1,7 +1,7 @@
 module Stave
   module Theory
     class ScaleType < Core::DegreeCollection
-      variant :major, degrees: [
+      variant :major, symbol: "major", degrees: [
         Degree.root,
         Degree.two,
         Degree.three,
@@ -12,7 +12,7 @@ module Stave
         Degree.octave
       ]
 
-      variant :minor, degrees: [
+      variant :minor, symbol: "minor", degrees: [
         Degree.root,
         Degree.two,
         Degree.flat_three,
@@ -24,7 +24,7 @@ module Stave
       ]
 
       with_options suffix: :pentatonic do
-        variant :major, degrees: [
+        variant :major, symbol: "major pentatonic", degrees: [
           Degree.root,
           Degree.two,
           Degree.three,
@@ -33,7 +33,7 @@ module Stave
           Degree.octave
         ]
 
-        variant :minor, degrees: [
+        variant :minor, symbol: "minor pentatonic", degrees: [
           Degree.root,
           Degree.flat_three,
           Degree.four,
@@ -47,7 +47,7 @@ module Stave
         count == 5
       end
 
-      def hexatonic?
+      def heptatonic?
         count == 7
       end
 

data/lib/stave/version.rb

@@ -1,3 +1,3 @@
 module Stave
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stave
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk