tonal-tools 0.1.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 104f86d9527406e4ebb2bc443347c1cd6c45c4b8380c8739c435c504a4381842
-  data.tar.gz: a605b1bdd7c4fc7c20f6a66417422c9e55909bc9eaacaa5e4336280ca8e2f2a4
+  metadata.gz: bc35954dbfa03dfe0acca0efda8508d06cffc3259fd7f9d959ff260e099c2de5
+  data.tar.gz: 1de6de9804f88b954ec67720e5b29a3de83a6c6d49577de5a679745b5f4491ab
 SHA512:
-  metadata.gz: '068a485c121ef0941c05d4fcc2e67e607aa8572fd2ba572e7481f5f54189cdeff0c4e04648b2809db35e2bc533dffe81c406bd0873093719bf5a8ea388718f44'
-  data.tar.gz: b5d341be94a1ef9bb7c57cf5974b647bcd943151386c8a9fd4615f1a6f3e251ca8567994870d8882263e7963bcdaeb3214490a4bd245fdb423543fc41ef032f9
+  metadata.gz: 4f9cd04eab65b20ddf0263910c661337c6a02d47ebabc5277eeaf7358e686f38283d1158ef985ee238625330b338acca9090021d22c10128d92955b3d5f59891
+  data.tar.gz: '0858ee0672ee37381878371622d7b46471341e56e7c85bceae5c447a3112199330d59931f5ba070fb5a82d6fd9e1e42d8f66838edb229707c9afbdadb13222cd'

data/data/commas.yml

@@ -0,0 +1,11 @@
+commas:
+  # Interval between two enharmonically equivalent notes, as B# and C, in the Pythogorean tuning. ~23 cents
+  ditonic: 531441/524288
+  # The interval between a just major third (5:4) and a Pythogorean third (81:64). ~22 cents
+  syntonic: 81/80
+  # Difference between the syntonic and ditonic commas. ~2 cents
+  schisma: 32805/32768
+  diaschisma: 2048/2025
+  dieses1: 648/625
+  dieses2: 128/125
+  septimal: 64/63

data/lib/tonal/approximations.rb

@@ -30,7 +30,7 @@ class Tonal::Ratio
       self_in_cents = to_cents
       within = cents_tolerance.kind_of?(Tonal::Cents) ? cents_tolerance : Tonal::Cents.new(cents: cents_tolerance)
       [].tap do |results|
-        ContinuedFraction.new(antecedent.to_f/consequent, conv_limit).convergents_as_rationals.each do |convergent|
+        ContinuedFraction.new(antecedent.to_f/consequent, conv_limit).convergents.each do |convergent|
           ratio2 = ratio.class.new(convergent.numerator,convergent.denominator)
           results << ratio2 if ratio.class.within_cents?(self_in_cents, ratio2.to_cents, within) && ratio2.within_prime?(max_prime)
           break if results.length >= depth

data/lib/tonal/comma.rb

@@ -0,0 +1,45 @@
+class Tonal::Comma
+  # @return [Hash] of comma key/value pairs
+  # @example
+  #   Tonal::Comma.commas
+  #   => {"ditonic"=>"531441/524288",
+  #       "syntonic"=>"81/80",
+  #       "schisma"=>"32805/32768",
+  #       ...}
+  #
+  def self.commas
+    @commas ||= JSON.parse(YAML::load_file("#{__dir__}/../../data/commas.yml", aliases: true).to_json)["commas"]
+  end
+
+  # @return [Array] of comma values
+  # @example
+  #   Tonal::Comma.values
+  #   => [(531441/524288),
+  #       (81/80),
+  #       (32805/32768),
+  #       ...]
+  #
+  def self.values
+    @values ||= commas.values.map(&:to_r)
+  end
+
+  # @return [Array] of comma keys
+  # @example
+  #   Tonal::Comma.keys
+  #   => ["ditonic",
+  #       "syntonic",
+  #       "schisma",
+  #       ...]
+  #
+  def self.keys
+    @keys ||= commas.keys
+  end
+
+  # @return [Rational] the comma found in the repo
+  # @example
+  #   Tonal::Comma.ditonic => (531441/524288)
+  #
+  def self.method_missing(comma)
+    commas[comma.to_s].to_r
+  end
+end

data/lib/tonal/ratio.rb

@@ -469,12 +469,12 @@ class Tonal::Ratio
     # Return label, if defined; or,
     # Return the "antecedent/consequent", if antecedent is less than 7 digits long; or
     # Return the floating point representation rounded to 2 digits of precision
-    @label || ((Math.log10(antecedent).to_i + 1) <= 6 ? "#{antecedent}/#{consequent}" : to_f.round(2))
+    (@label || ((Math.log10(antecedent).to_i + 1) <= 6 ? "#{antecedent}/#{consequent}" : to_f.round(2))).to_s
   end
 
   # @return [String] the string representation of Tonal::Ratio
   # @example
-  #   Tonal::Ratio.new(3, 2).inspect => "[3, 2]"
+  #   Tonal::Ratio.new(3, 2).inspect => "(3/2)"
   #
   def inspect
     "(#{antecedent}/#{consequent})"

data/lib/tonal/tools.rb

@@ -1,9 +1,12 @@
 module Tonal
+  require "yaml"
+  require "json"
   require "prime"
   require "matrix"
   require "sorted_set"
   require "continued_fractions"
   require "fraction_tree"
+  require "tonal/comma"
   require "tonal/cents"
   require "tonal/hertz"
   require "tonal/log"

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tonal-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: prime
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fraction-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +157,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- data/commas.yml
 - lib/tonal/approximations.rb
 - lib/tonal/cents.rb
+- lib/tonal/comma.rb
 - lib/tonal/extensions.rb
 - lib/tonal/hertz.rb
 - lib/tonal/interval.rb
@@ -153,12 +183,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 requirements: []
 rubygems_version: 3.4.22
 signing_key: