artoo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6e726dc7a4d253d4acfb870173fd4928a8734c
-  data.tar.gz: f6ede2be821e79a2711f6f0cb8f67e5d511ce706
+  metadata.gz: f4a98d6ea130561bdfb378ba49cbc66a804d20cc
+  data.tar.gz: c69a8eccf219e3dab754bfc588ab2981f550a97e
 SHA512:
-  metadata.gz: 247a5ea51e36972fdab99d623f74089d6ed66fc6ad43aa400055cb7a0ea3d4229b21c577fe702b35a5c83b0ead2ea15641df1ff525b9773b931898122c7e75d6
-  data.tar.gz: 00b1db0bf425d8519bfc5efb30e64c71f5dfcc34898122a7acdd4f15c5930215b8c94336c8eea492fd9149500b356cd02faa8cc40f401ccb253e4a0bd1c9cc9e
+  metadata.gz: 74f36dc3deb8f323b037c217c8507484c3d3d128e9e94f9e744974494a93692423613a7a2fe1ba7ee800a43ccb7f852272bd383b01e255f9c3f21e6531531041
+  data.tar.gz: 651037f50a9cab9950c680e9f3af964e794699eeb0b427aa61014064f95f738278f183c2196a4467e31bb8fbbdbebf2a2730be2d73561fb2f14b94a21a007e8e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artoo (1.2.0)
+    artoo (1.2.1)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)

data/lib/artoo/ext/numeric.rb

@@ -24,9 +24,28 @@ class Fixnum
   def to_pwm_reverse
     ((255.0 / 1023.0) * (1023 - self.to_f)).round
   end
+end
+
+class Numeric
+  # convert value from old scale (min to max) to (0..1) scale
+  def from_scale(range)
+    (self.to_f - range.min) / (range.max - range.min)
+  end
+
+  # convert value from (0..1) scale to new (min to max) scale
+  def to_scale(range)
+    ((self.to_f * (range.max - range.min) + range.min).ceil).within(range)
+  end
 
-  # convert value from old scale (min to max) to new scale (0 to new_max)
-  def to_scale(min, max, new_scale)
-    (((self.to_f - min) / (max - min)) * new_max).round
+  # keep returned value absolutely within range
+  def within(range)
+    case
+    when self < range.min
+      range.min
+    when self > range.max
+      range.max
+    else
+      self
+    end
   end
 end

data/lib/artoo/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   unless const_defined?('VERSION')
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/test/ext/numeric_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+
+describe Integer do
+  it "#second" do
+    1.second.must_equal 1
+  end
+
+  it "#seconds" do
+    20.seconds.must_equal 20
+  end
+end
+
+describe Numeric do
+  it "#to_scale with Integer" do
+    2.from_scale(1..10).to_scale(1..20).must_equal 4
+  end
+
+  it "#to_scale with angle" do
+    90.from_scale(0..180).to_scale(-90..90).must_equal 0
+  end
+
+  it "#to_scale with angle" do
+    45.from_scale(0..180).to_scale(0..90).must_equal 23
+  end
+
+  it "#to_scale with Float" do
+    x = 2.5
+    x.from_scale(1..10).to_scale(1..20).must_equal 5
+  end
+end
+
+describe Fixnum do
+  it "#to_pwm"
+  it "#to_pwm_reverse"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -251,6 +251,7 @@ files:
 - test/delegator_test.rb
 - test/device_test.rb
 - test/drivers/driver_test.rb
+- test/ext/numeric_test.rb
 - test/master_test.rb
 - test/port_test.rb
 - test/robot_test.rb