increments 0.0.3 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4437c3349327b61ddf3322fa91021884c41a74ec
-  data.tar.gz: 32cc783207051d6e182bb19e87cb5363f19af790
+  metadata.gz: 6753a69fd982992e8d84d6213324fd58fe9f91a6
+  data.tar.gz: 9132459069f13c8c68aebcfcac8fcecb30ac077e
 SHA512:
-  metadata.gz: b133d45ae339118c93eed809d33b2531ef270683bebae6be11741a5ae972a8877e626777e0e6cf4f62f43d4ef4ee8c7f4afbf8cb2dc5ccc6c34bee6d3e1cc463
-  data.tar.gz: 9a37e1eab9e100a04c79ee1db4f7925a2bfc9e51fafec09a8728ce5b663181a93ce3dabfec37c22a23e333af43177233f7724bab28ceb57a7fcb65942ae2f610
+  metadata.gz: 00fe7fc4f2a22ee7159ce8fe0ca9b195130d6a65b7bfacb11358814695a18d636a36e7fb57ebc8a110c9eca6849818f60ef8dc6e8b647162a1bfdb845f247458
+  data.tar.gz: 43dd4a84c97ef6e5932aa9dee2b8a65343b244ab974226f1946a578dd72c113b5812b0b8d0003aae9ba32b0feafcf8f4c70f3b0c28fdce07a6fa6c071f34b0cf

data/lib/increments.rb

@@ -1,39 +1,42 @@
 module Increments
-	def self.increment(opts={})
+	def self.increment(opts={},&block)
 		options = defaults.merge(opts)
-        validate(options)
-        min, max = options[:min], [options[:min] + options[:increment]-1, options[:max]].min
-    	loop do
-    		yield(min,max)
-    		break if max == options[:max]
-			min = [min + options[:increment], options[:max]].min
-			max = [max + options[:increment], options[:max]].min
-    	end
+        validate(options,&block)
+        step_enum(options).each do |min|
+			yield(min,range_max(min,options))
+		end
 	end
 
-	def self.decrement(opts={})
+	def self.decrement(opts={},&block)
 		options = defaults.merge(opts)
-		validate(options)
+		validate(options,&block)
 		min, max = [options[:min], options[:max] - options[:increment]+1].max, options[:max]
 		loop do
 			yield(min,max)
 			break if min == options[:min]
 			min = [min - options[:increment], options[:min]].max
-    		max = [max - options[:increment], options[:min]].max
+			max = [max - options[:increment], options[:min]].max
 		end
 	end
 
 	private
 
+		def self.range_max(min,options)
+			[min + options[:increment]-1,options[:max]].min
+		end
+
+		def self.step_enum(options)
+			(options[:min]..options[:max]).step(options[:increment])
+		end
+
 		def self.defaults
-			{
-				:min => 0, 
-				:max => 4294967295, 
-	            :increment => 100000 
-	        }
+			{ :min 		 => 0, 
+			  :max 		 => 4294967295, 
+	          :increment => 100000 }
 		end
 
 		def self.validate(options)
 			raise ArgumentError, "Invalid Options: #{options}" if options[:min] > options[:max] || options[:increment] <= 0
+			raise LocalJumpError, "no block given (yield)" unless block_given?
 		end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.3
 platform: ruby
 authors:
 - Garren Staubli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies: []
 description: Range bound incrementing and decrementing by a specified amount
 email: gstaubli@demandbase.com
@@ -18,7 +18,8 @@ extra_rdoc_files: []
 files:
 - lib/increments.rb
 homepage: https://github.com/gstaubli/increments
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []