lps 0.1.3 → 0.2.0

data/lib/lps.rb

@@ -3,22 +3,14 @@ require 'option_initializer'
 
 class LPS
   include OptionInitializer
-  option_initializer! :freq, :interval, :while
-  option_validator do |k, v|
-    case k
-    when :freq
-      raise ArgumentError,
-        'frequency must be a positive number (or nil)' unless
-          v.nil? || (v.is_a?(Numeric) && v > 0)
-    when :interval
-      raise ArgumentError,
-        'interval must be a positive number (or zero)' unless
-          v.is_a?(Numeric) && v >= 0
-    when :while
-      raise ArgumentError,
-        'loop condition must respond to call' unless
-          v.respond_to?(:call)
-    end
+  option_initializer! :freq, :interval => Numeric, :while => :&
+  option_validator :freq do |v|
+    msg = 'frequency must be a positive number (or nil)'
+    raise TypeError, msg unless v.is_a?(Numeric) || v.nil?
+    raise ArgumentError, msg if v.is_a?(Numeric) && v <= 0
+  end
+  option_validator :interval do |v|
+    raise ArgumentError, 'interval must be a non-negative number' if v < 0
   end
 
   # @param [Proc] &block Loop

data/lib/lps/version.rb

@@ -1,3 +1,3 @@
 class LPS
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/lps.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LPS::VERSION
 
-  gem.add_runtime_dependency 'option_initializer', '~> 1.2.0'
+  gem.add_runtime_dependency 'option_initializer', '~> 1.5.0'
   gem.add_development_dependency 'test-unit'
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-test'

data/test/test_lps.rb

@@ -30,12 +30,18 @@ class TestLPS < Test::Unit::TestCase
   end
 
   def test_non_positive_frequency
+    assert_raise(ArgumentError) { LPS.freq {} }
+    assert_raise(ArgumentError) { LPS.freq }
     assert_raise(ArgumentError) { LPS.freq(0) }
     assert_raise(ArgumentError) { LPS.freq(-1) }
+    assert_raise(ArgumentError) { LPS.freq(1, 1) }
   end
 
   def test_invalid_interval
+    assert_raise(ArgumentError) { LPS.interval {} }
+    assert_raise(ArgumentError) { LPS.interval }
     assert_raise(ArgumentError) { LPS.interval(-1) }
+    assert_raise(ArgumentError) { LPS.interval(1, 1) }
   end
 
   def test_both_freq_and_interval
@@ -44,8 +50,8 @@ class TestLPS < Test::Unit::TestCase
   end
 
   def test_non_number_params
-    assert_raise(ArgumentError) { LPS.freq('bad') }
-    assert_raise(ArgumentError) { LPS.interval('bad') }
+    assert_raise(TypeError) { LPS.freq('bad') }
+    assert_raise(TypeError) { LPS.interval('bad') }
     assert_raise(ArgumentError) { LPS.while('bad') }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lps
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: option_initializer
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement