timerange 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b671b71b8905bfdd65ac8e0c3f620eb278f51f
-  data.tar.gz: 132d36c026b2da0f57cf3817228647eb74f210b9
+  metadata.gz: 8cebcccddb6b2339e8e86a5bbfd742daf3d693d9
+  data.tar.gz: 2292c5e560b68117b99730a480c09b82675a4ef5
 SHA512:
-  metadata.gz: eb12938aa430be463edff9b7b763406c464677cf3309f2d6b32f0444c75ae04017903fa78275cec1992d99ca671d73ce0553141ffefdea7fae8447a528fc4ac5
-  data.tar.gz: fc04948e87a7d35967f8c0b2cd3aa24e546b5818b163903bfcc5ad6aad0578c327efaaf51b4605238e1eaebfd7fdb4bcd83a034e5bc1555895e00778f03d058d
+  metadata.gz: eab154fb90d0fe3e08f256d3fdbd4b8ed90c9dc760dfbf6e8abead7e80d84af9b7d23b484710b7f7fce6ee1e6aad2c05a9468c865d255ad13f01159c947354d7
+  data.tar.gz: ea1c9bfcac179dc9021a33d7780ec7c1e59281ee60746536d177f7db6b981f50fb4df6ac9ea8d2fd843f182bc73b3fd5712a59ef31cbb9979ac4cf6af2f38734

data/lib/timerange/version.rb

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

data/lib/timerange.rb

@@ -1,11 +1,11 @@
 require "time"
 require "active_support/time"
-require "active_support/core_ext/module/attribute_accessors"
+require "timerange/version"
 
 class TimeRange < Range
-  VERSION = "0.0.2"
-
-  mattr_accessor :time_zone
+  class << self
+    attr_accessor :time_zone
+  end
 
   def initialize(b = nil, e = Time.now, exclude_end = false, options = {})
     if b.is_a?(Range)
@@ -15,26 +15,27 @@ class TimeRange < Range
     if b.is_a?(Hash)
       options, b, e, exclude_end = b, nil, nil, false
     elsif e.is_a?(Hash)
-      options, e, exclude_end = e, nil, false
+      options, e, exclude_end = e, Time.now, false
     end
 
-    time_zone = options[:time_zone] || self.class.time_zone || Time.zone || "Etc/UTC"
+    time_zone = options[: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
       raise "Unrecognized time zone"
     end
+
     b = time_zone.parse(b) if b.is_a?(String)
     e = time_zone.parse(e) if e.is_a?(String)
-    if options[:time_zone]
-      b = b.in_time_zone(b)
-      e = e.in_time_zone(e)
-    end
+    b = b.in_time_zone(time_zone)
 
     if options[:duration]
       e = b + options[:duration]
       exclude_end = true
     end
+    e = e.in_time_zone(time_zone)
+
+    @options = options.merge(time_zone: time_zone)
 
     super(b, e, exclude_end)
   end
@@ -59,21 +60,21 @@ class TimeRange < Range
       else
         bucket(period, self.end + 1.send(period), options)
       end
-    self.class.new(bucket(period, self.begin, options), e, true)
+    self.class.new(bucket(period, self.begin, options), e, true, @options.merge(options))
   end
 
   def expand_start(period, options = {})
     e = self.end
     e = e.in_time_zone(options[:time_zone]) if options[:time_zone]
-    self.class.new(bucket(period, self.begin, options), e, exclude_end?)
+    self.class.new(bucket(period, self.begin, options), e, exclude_end?, @options.merge(options))
   end
 
   def bucket(period, time, options = {})
-    self.class.bucket(period, time, options)
+    self.class.bucket(period, time, @options.merge(options))
   end
 
   def self.bucket(period, time, options = {})
-    time_zone = options[:time_zone] || Time.zone
+    time_zone = options[:time_zone] || TimeRange.time_zone || Time.zone || "Etc/UTC"
     day_start = options[:day_start] || 0
     week_start = options[:week_start] || 6
 
@@ -84,9 +85,8 @@ class TimeRange < Range
 
     time = time.to_time.in_time_zone(time_zone) - day_start.hours
 
-    period = period.to_sym
     time =
-      case period
+      case period.to_sym
       when :second
         time.change(usec: 0)
       when :minute

data/test/time_range_test.rb

@@ -7,6 +7,12 @@ class TestTimeRange < Minitest::Test
     assert_equal 7, TimeRange.new(day..day).expand(:week).step(:day).size
   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_today
     day = Time.now.midnight
     tr = TimeRange.today

data/timerange.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'timerange'
+require 'timerange/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "timerange"
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "tzinfo"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: timerange
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,7 @@ files:
 - README.md
 - Rakefile
 - lib/timerange.rb
+- lib/timerange/version.rb
 - test/test_helper.rb
 - test/time_range_test.rb
 - timerange.gemspec