Add implementation of Rand for Division and add zoom_in/zoom_out methods

Author: mitchmindtree

.travis.yml

@@ -2,11 +2,7 @@ language: rust
 
 rust:
     - nightly
-    - 1.0.0-beta
-
-os:
-    - osx
-    - linux
+    - stable
 
 script:
     - cargo build --verbose

Cargo.toml

@@ -12,4 +12,5 @@ homepage = "https://github.com/RustAudio/time_calc"
 
 [dependencies]
 num = "*"
+rand = "*"
 rustc-serialize = "*"

README.md

@@ -22,8 +22,8 @@ Usage
 Add time_calc to your cargo dependencies like this:
 
 ```
-[dependencies.time_calc]
-git = "https://github.com/RustAudio/time_calc.git"
+[dependencies]
+time_calc = "*"
 ```
 
 See [the example](https://github.com/RustAudio/time_calc/blob/master/examples/test.rs) for a better demo.

src/division.rs

@@ -27,6 +27,10 @@ pub enum Division {
     OneThousandTwentyFourth,
 }
 
+const HIGHEST_ZOOM_STEP: u8 = 10;
+
+
+
 impl Division {
 
     pub fn from_isize<T: ToPrimitive>(num: T) -> Division {
@@ -50,6 +54,21 @@ impl Division {
         }
     }
 
+    /// Zoom into a higher resolution division by the number of steps given.
+    pub fn zoom_in(&self, steps: u8) -> Division {
+        let zoom_step = self.to_u8().unwrap() + steps;
+        assert!(zoom_step <= HIGHEST_ZOOM_STEP);
+        NumCast::from(zoom_step).unwrap()
+    }
+
+    /// Zoom into a higher resolution division by the number of steps given.
+    pub fn zoom_out(&self, steps: u8) -> Division {
+        let current_zoom_step = self.to_u8().unwrap();
+        assert!(steps <= current_zoom_step);
+        let zoom_step = current_zoom_step - steps;
+        NumCast::from(zoom_step).unwrap()
+    }
+
 }
 
 impl NumCast for Division {
@@ -112,11 +131,11 @@ impl Sub<isize> for Division {
 }
 
 /// The 'Division Type'. Used for handling 'Thirds'.
-/// Whole represents a Whole division, while TwoThirds
-/// represents two thirds of a division.
+/// Whole represents a Whole division, while TwoThirds represents two thirds of a division.
 #[derive(Debug, Copy, Clone, RustcEncodable, RustcDecodable, PartialEq, Eq)]
 pub enum DivType {
-    Whole, TwoThirds
+    Whole,
+    TwoThirds,
 }
 
 
@@ -132,6 +151,13 @@ impl NumCast for DivType {
     }
 }
 
+impl ::rand::Rand for DivType {
+    fn rand<R: ::rand::Rng>(rng: &mut R) -> DivType {
+        let rand: bool = rng.gen();
+        if rand { DivType::Whole } else { DivType::TwoThirds }
+    }
+}
+
 impl FromPrimitive for DivType {
     fn from_i64(n: i64) -> Option<Self> { Self::from_u64(n as u64) }
     fn from_u64(n: u64) -> Option<Self> {

src/lib.rs

@@ -6,6 +6,7 @@
 //!
 
 extern crate num;
+extern crate rand;
 extern crate rustc_serialize;
 
 pub use bars::Bars;