diatone 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2c9a54a1deb61e431edfd11449450a77e181e3e
-  data.tar.gz: 1d4dbf824a2cbb08107e9203916240f96a31c92e
+SHA256:
+  metadata.gz: c75a0a1808996f56ec45af3136c222e04ec3bb27dd99e1a145e408094ae07c0b
+  data.tar.gz: 5fd1d73f70c069941aa0ae2697702f979344f567a552df48e996bbf1283f50d8
 SHA512:
-  metadata.gz: db134339f8b1b002f1dd243561ad76a18b44af0e4294bbd263c51fed0a2edcbd3d8bd15ba8108762b18cead75834cfa85bcf98955cf2a45309696d59db052291
-  data.tar.gz: 56df25088a044ebae716842b15b277fd8089cc64885c10a58ac33e73c9f2d3d2559f7f560bcc9b1121e2d238df8b576d8aacc5a18f40f908818cd549e87775d6
+  metadata.gz: c626782006a817be0f0ed95b8102932364b0336b2091f3c7d2de3e576ef3479787bf220b1ec7cd43e4dac5b44332a2e487cbd8708cd4fbceed7df3c14bf4bf5d
+  data.tar.gz: 14114ff313728e831877801819a04348df071a7629c0f1d842e8aaff09bfc7508a6b8b4ce7bec165b3a031a4297bfc252388f53a08bcc1f6a7637a883c00c341

data/lib/diatone.rb

@@ -12,6 +12,7 @@ module Diatone
     'm' => "212212",
   }
   CHORDS = {
+
     '' => [0,2,4],
     '6' => [0,2,4,5],
     '7' => [0,2,4,6.4],
@@ -21,7 +22,7 @@ module Diatone
     '13' => [0,2,4,6.4,8,10,12],
     
     'maj7' => [0,2,4,6],
-    'maj9' => [0,2,4,8,6],
+    'maj9' => [0,2,4,6,8],
     'maj11' => [0,2,4,6,8,10],
     'maj13' => [0,2,4,6,8,10,12],
 
@@ -39,8 +40,12 @@ module Diatone
     'dim' => [0,2.4,4.4],
     'dim7' => [0,2.4,4.4,6.3],
     '+' => [0,2,4.6],
+    '-' => [0,2.4,4.4],
+    '+5' => [0,2,4.6],
+    '-5' => [0,2.4,4.4],
+    'm-5' => [0,2.4,4.4],
     'majb5' => [0,2,4.4],
-    '5' => [0,4],
+    '5' => [0,4]
 
   }
     
@@ -163,8 +168,9 @@ module Diatone
       return t
     end
 
-    def self.get (s)
+    def self.get (s,relative=false)
       notes = []
+      s.sub!("#","♯")
       if s[1] == '♯' or s[1] == 'b'
         scale = Scale.get s[0..1]
         type = abbr(s[2..-1])
@@ -174,14 +180,18 @@ module Diatone
       end
       if CHORDS.include? type
         CHORDS[type].each do |n|
-          if n == n.to_i
-            notes.push scale[n%scale.length]
+          if relative
+            notes.push(n.floor + 1)
           else
-            r = ((n*10).to_i%10)-5
-            s = scale[n.to_i%scale.length]
-            f = Note.fix(s) + r
-            n = Note.key(f, false)
-            notes.push(n)
+            if n == n.to_i
+              notes.push scale[n%scale.length]
+            else
+              r = ((n*10).to_i%10)-5
+              s = scale[n.to_i%scale.length]
+              f = Note.fix(s) + r
+              n = Note.key(f, false)
+              notes.push(n)
+            end
           end
         end
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diatone
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Yakup Cetinkaya
@@ -36,8 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Diatonal calculations