polling 0.0.5 → 0.0.7

data/lib/polling.rb

@@ -13,6 +13,7 @@ module Polling
     loop do 
       arr.each do |time|
         time = Confirm::check_value(time)
+        time = 0 if args[:start] && time >= 60
         Sleep::exec Target::interval(time,args)
         args[:start] = false
         yield

data/lib/polling/confirm.rb

@@ -10,7 +10,8 @@ module Polling
     def check_arr(arr)
       if arr.count == 1
         time = convert(arr[0])
-        arr = time < 60 ? create_arr(time) : [time]
+        #arr = time < 60 ? create_arr(time) : [time]
+        arr = create_arr(time)
         raise TypeError, "Please set a value that is divisible by 60." if (60 % time != 0) && time < 60
       end
       return arr
@@ -34,11 +35,15 @@ module Polling
 
     def create_arr(time)
       arr = Array.new
-      arr << 0 if time != 0
-      result = time
-      while time < 60
+      if time < 60
+        arr << 0 if time != 0
+        result = time
+        while time < 60
+          arr << time
+          time += result
+        end
+      else
         arr << time
-        time += result
       end
       return arr
     end

data/lib/polling/version.rb

@@ -1,3 +1,3 @@
 module Polling
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/test/test_confirm.rb

@@ -6,16 +6,23 @@ class PollingTest < Test::Unit::TestCase
     assert_equal 0, Polling::Confirm::check_value("0")
     assert_equal 60, Polling::Confirm::check_value(60)
     assert_equal 5, Polling::Confirm::check_value("5")
+  end
 
+  def test_convert
     assert_equal 5, Polling::Confirm::convert(5)
     assert_equal 5, Polling::Confirm::convert("5")
     assert_equal 5, Polling::Confirm::convert("5s")
     assert_equal 300, Polling::Confirm::convert("5m")
     assert_equal 18000, Polling::Confirm::convert("5h")
+  end
 
+  def test_check_arr
     assert_equal ["0","10","20","30","40","50"], Polling::Confirm::check_arr(["0","10","20","30","40","50"])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr([0,10,20,30,40,50])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr(["10s"])
+    assert_equal [60], Polling::Confirm::check_arr(["1m"])
+    assert_equal [120], Polling::Confirm::check_arr(["2m"])
+    assert_equal [1800], Polling::Confirm::check_arr(["30m"])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr(["10"])
     assert_equal [0,10,20,30,40,50], Polling::Confirm::check_arr([10])
     assert_equal [0,30], Polling::Confirm::check_arr([30])

data/test/test_run.rb

@@ -5,7 +5,8 @@ class PollingTest < Test::Unit::TestCase
   #  puts "start: #{Time.now}"
   #  #arr = [5,15,25,35,45,55]
   #  #arr = ["0","10","20","30","40","50"]
-  #  arr = ["10s"]
+  #  #arr = ["10s"]
+  #  arr = ["3m"]
   #  Polling::run(arr,true) do
   #    puts Time.now
   #    sleep 2

data/test/test_target.rb

@@ -23,6 +23,9 @@ class PollingTest < Test::Unit::TestCase
     assert_equal 300, Polling::Target::interval(300,debug)
     assert_equal 300, Polling::Target::interval(300,debug)
     assert_equal 3600, Polling::Target::interval(3600,debug)
+    
+    Time.stubs(:now).returns(Time.parse "2012/11/19 10:16:00")
+    assert_equal 300, Polling::Target::interval(300,debug)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polling
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies: []
 description: polling
 email: