timerange 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cebcccddb6b2339e8e86a5bbfd742daf3d693d9
-  data.tar.gz: 2292c5e560b68117b99730a480c09b82675a4ef5
+  metadata.gz: a06b8ee61c99dec515cff3b45778aed0ff303883
+  data.tar.gz: 3fa56d4beafb1ab48cde76da66f122f722875139
 SHA512:
-  metadata.gz: eab154fb90d0fe3e08f256d3fdbd4b8ed90c9dc760dfbf6e8abead7e80d84af9b7d23b484710b7f7fce6ee1e6aad2c05a9468c865d255ad13f01159c947354d7
-  data.tar.gz: ea1c9bfcac179dc9021a33d7780ec7c1e59281ee60746536d177f7db6b981f50fb4df6ac9ea8d2fd843f182bc73b3fd5712a59ef31cbb9979ac4cf6af2f38734
+  metadata.gz: 84e5b5b48c4d20302733ca4b93b5020eaac047ff1ea6556b051ccee821bba459c390372fb5201e89b378ab450035c522713bb61c40496644257dfef8b4c93fce
+  data.tar.gz: de978230ff3be0a8849f2b5e1e30e10ca9a1508812688aa5dff014be938d6669f6bb7a47885604dd148169761644b6baa6c8abdfdaeff2508712ab88f6696aa5

data/README.md

@@ -19,6 +19,7 @@ time_range.expand(:week).step(1.day)
 
 TimeRange.new("2014-06-01", "2014-06-07")
 TimeRange.new("2014-06-01", duration: 1.week)
+TimeRange.new("2014-06-01", within: 5.minutes)
 TimeRange.new(4.weeks.ago).expand_start(:week) # last 4 weeks
 
 TimeRange.today

data/lib/timerange.rb

@@ -8,6 +8,10 @@ class TimeRange < Range
   end
 
   def initialize(b = nil, e = Time.now, exclude_end = false, options = {})
+    if !b
+      raise TypeError, "no implicit conversion of nil into Time"
+    end
+
     if b.is_a?(Range)
       b, e, exclude_end = b.begin, b.end, b.exclude_end?
     end
@@ -18,7 +22,7 @@ class TimeRange < Range
       options, e, exclude_end = e, Time.now, false
     end
 
-    time_zone = options[:time_zone] || TimeRange.time_zone || Time.zone || "Etc/UTC"
+    time_zone = options[:time_zone] || (b.respond_to?(:time_zone) && b.time_zone) || TimeRange.time_zone || Time.zone || "Etc/UTC"
     if time_zone.is_a?(ActiveSupport::TimeZone) or (time_zone = ActiveSupport::TimeZone[time_zone])
       # do nothing
     else
@@ -28,12 +32,17 @@ class TimeRange < Range
     b = time_zone.parse(b) if b.is_a?(String)
     e = time_zone.parse(e) if e.is_a?(String)
     b = b.in_time_zone(time_zone)
+    e = e.in_time_zone(time_zone)
 
     if options[:duration]
       e = b + options[:duration]
       exclude_end = true
     end
-    e = e.in_time_zone(time_zone)
+    if options[:within]
+      e = b + options[:within]
+      b -= options[:within]
+      exclude_end = false
+    end
 
     @options = options.merge(time_zone: time_zone)
 
@@ -110,14 +119,14 @@ class TimeRange < Range
     time + day_start.hours
   end
 
-  def self.today
-    date = Date.today
-    new(date, date).expand(:day)
+  def self.today(options = {})
+    date = Time.now
+    new(date, date, options).expand(:day)
   end
 
-  def self.yesterday
-    date = Date.yesterday
-    new(date, date).expand(:day)
+  def self.yesterday(options = {})
+    date = Time.now - 1.day
+    new(date, date, options).expand(:day)
   end
 
   def +(period)

data/lib/timerange/version.rb

@@ -1,3 +1,3 @@
 class TimeRange < Range
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/time_range_test.rb

@@ -7,12 +7,22 @@ class TestTimeRange < Minitest::Test
     assert_equal 7, TimeRange.new(day..day).expand(:week).step(:day).size
   end
 
+  def test_nil_range
+    assert_raises(TypeError){ TimeRange.new(nil) }
+  end
+
   def test_time_zone
     day = Time.parse("2014-06-01")
     time_zone = "Eastern Time (US & Canada)"
     assert_equal time_zone, TimeRange.new(day, time_zone: time_zone).expand(:week).first.time_zone.name
   end
 
+  def test_default_time_zone
+    time_zone = "Central Time (US & Canada)"
+    day = ActiveSupport::TimeZone[time_zone].parse("2014-06-01")
+    assert_equal time_zone, TimeRange.new(day).expand(:week).first.time_zone.name
+  end
+
   def test_today
     day = Time.now.midnight
     tr = TimeRange.today
@@ -49,4 +59,12 @@ class TestTimeRange < Minitest::Test
     assert_equal TimeRange.yesterday, TimeRange.today - 1.day
   end
 
+  def test_within
+    tr = TimeRange.new("2014-06-01", within: 5.minutes)
+    day = Time.zone.parse("2014-06-01")
+    assert_equal day - 5.minutes, tr.begin
+    assert_equal day + 5.minutes, tr.end
+    assert !tr.exclude_end?
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timerange
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo