lps 0.1.1 → 0.1.2

data/lib/lps.rb

@@ -1,54 +1,39 @@
 require "lps/version"
+require 'option_initializer'
 
 class LPS
-  # @param [Numeric] freq Frequency of loop execution (loops/sec)
-  # @return [LPS]
-  def self.freq freq
-    LPS.new.freq freq
-  end
-
-  # @param [Numeric] intv Loop execution interval
-  # @return [LPS]
-  def self.interval intv
-    LPS.new.interval intv
-  end
-
-  # @param [Proc] &cond Loop condition
-  # @return [LPS]
-  def self.while &cond
-    LPS.new.while &cond
-  end
-
-  # @param [Numeric] freq Frequency of loop execution (loops/sec)
-  # @return [LPS]
-  def freq freq
-    LPS.new(:freq => freq, :cond => @cond)
-  end
-
-  # @param [Numeric] intv Loop execution interval
-  # @return [LPS]
-  def interval intv
-    freq(intv == 0 ? nil : (1.0 / intv))
-  end
-
-  # @param [Proc] &cond Loop condition
-  # @return [LPS]
-  def while &cond
-    LPS.new(:freq => @freq, :cond => cond)
+  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
   end
 
   # @param [Proc] &block Loop
   def loop &block
     ret = nil
+    always = @while.nil?
     if @freq.nil?
-      while @cond.call
+      while always || @while.call
         ret = block.call
       end
     else
       sleep_interval = 1.0 / @freq
 
       nt = Time.now
-      while @cond.call
+      while always || @while.call
         nt += sleep_interval
         ret = block.call
 
@@ -69,16 +54,20 @@ class LPS
   # @option opts [Numeric] :freq Frequency of loop execution (loops/sec)
   # @option opts [#call] :cond Loop condition
   def initialize opts = {}
-    raise ArgumentError, 'Not a Hash' unless opts.is_a?(Hash)
+    validate_options opts
 
-    @freq = opts[:freq]
+    freq, intv, @while = opts.values_at :freq, :interval, :while
     raise ArgumentError,
-      'Frequency must be a positive number (or nil)' unless
-          @freq.nil? || (@freq.is_a?(Numeric) && @freq > 0)
+      "can't have both frequency and interval" if freq && intv
 
-    @cond = opts[:cond] || proc { true }
-    raise ArgumentError, 'Invalid condition block' unless
-        @cond.respond_to?(:call)
+    @freq =
+      if freq
+        freq
+      elsif intv
+        (intv == 0) ? nil : 1.0 / intv
+      else
+        nil
+      end
   end
 end
 

data/lib/lps/version.rb

@@ -1,3 +1,3 @@
 class LPS
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lps.gemspec

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

data/test/test_lps.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
+$VERBOSE = true
 require 'rubygems'
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
 require 'lps'
 require 'test-unit'
 
@@ -34,12 +34,19 @@ class TestLPS < Test::Unit::TestCase
     assert_raise(ArgumentError) { LPS.freq(-1) }
   end
 
-  def test_non_number_frequency
-    assert_raise(ArgumentError) { LPS.freq('freq') }
+  def test_invalid_interval
+    assert_raise(ArgumentError) { LPS.interval(-1) }
   end
 
-  def test_non_proc_cond
-    assert_raise(ArgumentError) { LPS.while('freq') }
+  def test_both_freq_and_interval
+    LPS.interval(1).freq(1)
+    assert_raise(ArgumentError) { LPS.interval(1).freq(1).new }
+  end
+
+  def test_non_number_params
+    assert_raise(ArgumentError) { LPS.freq('bad') }
+    assert_raise(ArgumentError) { LPS.interval('bad') }
+    assert_raise(ArgumentError) { LPS.while('bad') }
   end
 
   def test_return_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lps
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: option_initializer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -96,10 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rate-controlled loop execution
 test_files:
 - test/test_lps.rb
-has_rdoc: