ruby-mext 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bdefcc4ff87903fed556272a44c7af65c0c68108afcb10b44aef7bc276a4cd
-  data.tar.gz: 69e8d7f5bb010371caccabe8839ca9768010ae80a030fe746dab7d893bc917f7
+  metadata.gz: c1b60bb4be1d46a063d19d7c10b24ca53e82e9861a12c91548bd27750fe3d4c9
+  data.tar.gz: 8a1c7dc60abe41dc5d544abc66cf207005f51fe2786e6b1734f178e12a8316fe
 SHA512:
-  metadata.gz: a5b044b625e0c7d055bac3dda679a5beade14ff2bc2e898ba7c6faa6cd1b5d6e28ca235f564105e8fe2aeba26488dcaf8e3c3a7d513a919938aeaa98d23d0153
-  data.tar.gz: a0080228a81c072b97bf51b165776ad8820fd44ccfb9c0a6c7dbe7910d2d450dcd89cb07dd5fd8432c356c5303a085c1156700365c621768d8c57dd9e87d58ed
+  metadata.gz: 37a6f09b84d3d71ebf5fbf1d95cfabd639186c67f67159731383b2d5f1298fdc4480bb9ab46d25b95a3a873d21ea9f8c832340ba86c055e49b6d5700d89ec990
+  data.tar.gz: 5c57b0de2b0481cdc4776ea0e3a03f89d4d70e82c8241a7caca2b76cf76e3cd3d88fd0b33648262cc110ff85f3b95a16e12e8966c669b6fb6d6138210e0e9f86

data/lib/mext/music.rb

@@ -6,4 +6,5 @@ end
 
 %w(
   pitch_class
+  meter
 ).each { |f| require File.join(Mext::MUSIC_PATH, f) }

data/lib/mext/{numeric → music}/meter.rb

@@ -1,5 +1,5 @@
 module Mext
-  module Numeric
+  module Music
 
     #
     # +Meter+:
@@ -20,6 +20,7 @@ module Mext
       end
 
       def to_r
+        raise ZeroDivisionError, "#{self.numerator}/#{self.divisor} provokes a zero-division error" unless self.divisor != 0
         Rational(self.numerator, self.divisor)
       end
 
@@ -30,6 +31,11 @@ module Mext
       # we use the logic of +Rational+ to perform logic on +Meter+
       #
       [:==, :<, :<=, :>, :>=, :<=>, :===].each { |m| define_method(m) { |other| common_logic(m, other) } }
+      #
+      # we use the arithmetic of +Rational+ to perform arithmetic on +Meter+
+      #
+      [:+, :-, :*, :/, :**, :^, ].each { |m| define_method(m) { |other| common_arithmetic(m, other) } }
+
 
     private
 
@@ -37,6 +43,10 @@ module Mext
         raise ArgumentError, "#{other} is neither a #{self.class} nor a Rational (#{other.class})" unless other.kind_of?(Meter) || other.kind_of?(Rational)
         self.to_r.send(method, other.to_r)
       end
+
+      def common_arithmetic(method, other)
+        self.to_r.send(method, other.to_r).to_meter
+      end
   
     end
 
@@ -47,7 +57,7 @@ end
 # +Meter(n, d)+ is defined to actually mimick a +Rational()+
 #
 def Meter(n, d)
-  Mext::Numeric::Meter.new(n,d)
+  Mext::Music::Meter.new(n,d)
 end
 
 #
@@ -65,3 +75,28 @@ class String
   end
 
 end
+
+#
+# we extend the +Rational+ class to carry a +to_meter+ which
+# will convert a  into a Meter class
+#
+class Rational
+
+  def to_meter
+    Meter(self.numerator, self.denominator)
+  end
+
+end
+
+#
+# we extend the +Float+ class to carry a +to_meter+ which
+# will convert a  into a Meter class
+#
+class Float
+
+  def to_meter
+    r = self.to_r
+    Meter(r.numerator, r.denominator)
+  end
+
+end

data/lib/mext/numeric.rb

@@ -24,7 +24,6 @@ module Mext
     NON_VECTORIZABLE_METHODS = %w(
       constants
       pitch_fork
-      meter
     )
     ADDED_METHODS = NON_VECTORIZABLE_METHODS + VECTORIZABLE_METHODS
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mext
-  VERSION = '0.21.2'
+  VERSION = '0.21.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mext
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Nicola Bernardini
@@ -159,6 +159,7 @@ files:
 - lib/mext/math/log.rb
 - lib/mext/math/stepwise.rb
 - lib/mext/music.rb
+- lib/mext/music/meter.rb
 - lib/mext/music/pitch_class.rb
 - lib/mext/numeric.rb
 - lib/mext/numeric/addsemi.rb
@@ -169,7 +170,6 @@ files:
 - lib/mext/numeric/dbamp.rb
 - lib/mext/numeric/ftom.rb
 - lib/mext/numeric/gold.rb
-- lib/mext/numeric/meter.rb
 - lib/mext/numeric/mmtot.rb
 - lib/mext/numeric/mround.rb
 - lib/mext/numeric/mtof.rb