time_chunk 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/time_chunk.rb

@@ -17,19 +17,29 @@ module TimeChunk
   end
 
   def self.iterate(range, step_size)
-    begin_time = range.first.is_a?(Time) ? range.first : Time.parse(range.first)
-    end_time = range.last.is_a?(Time) ? range.last : Time.parse(range.last)
-    raise ArgumentError, "Given range's begin (#{begin_time.iso8601}) is after its end (#{end_time.iso8601})." if begin_time > end_time
-
-    current_end_time = begin_time - 1
+    if range.first.is_a?(Time)
+      begin_at = range.first
+      end_at = range.last.is_a?(Time) ? range.last : Time.parse(range.last.to_s)
+    elsif range.first.is_a?(Date)
+      begin_at = range.first
+      end_at = range.last.is_a?(Date) ? range.last : Date.parse(range.last.to_s)
+      # step size is always seconds, regardless of whether range is Time or Date instances
+      step_size = step_size/86400
+    else
+      begin_at = Time.parse(range.first.to_s)
+      end_at = Time.parse(range.last.to_s)
+    end
+
+    raise ArgumentError, "Given range's begin (#{begin_at.to_time.utc.iso8601}) is after its end (#{end_at.to_time.utc.iso8601})." if begin_at > end_at
+
+    current_end = begin_at - 1
 
     begin
-      current_begin_time = current_end_time + 1
-      current_end_time = current_begin_time + step_size - 1
-      current_end_time = [current_end_time, end_time].min
+      current_begin = current_end + 1
+      current_end = current_begin + step_size - 1
+      current_end = [current_end, end_at].min
 
-      yield current_begin_time..current_end_time
-    end while current_end_time < end_time
+      yield current_begin..current_end
+    end while current_end < end_at
   end
-
 end

data/spec/time_chunk_spec.rb

@@ -88,6 +88,21 @@ describe TimeChunk do
         (t('2013-01-01T02:00:00Z')..t('2013-01-01T02:59:59Z')),
       ]
     end
+
+    it "should handle date arguments" do
+      TimeChunk.iterate(
+        Date.parse('2013-02-27')..Date.parse('2013-03-05'), 86400*2
+      ) do |range|
+        @calls << range
+      end
+
+      @calls.map(&:to_s).should eq [
+        '2013-02-27..2013-02-28',
+        '2013-03-01..2013-03-02',
+        '2013-03-03..2013-03-04',
+        '2013-03-05..2013-03-05'
+      ]
+    end
   end
 
   it "should iterate over each_day" do

data/time_chunk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "time_chunk"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Dean"]
-  s.date = "2013-02-04"
+  s.date = "2013-03-08"
   s.description = "Iterate over time ranges in discrete chunks."
   s.email = "alex@crackpot.org"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_chunk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 446086649663897477
+      hash: -3932107950510678518
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: