stagger 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae0c775f963616a18e2b349a55dac219f0fd3d6
-  data.tar.gz: 8b7a47c160c80a30ef5f3919aea666baa93d0e13
+  metadata.gz: aea07a97eb08adfb0b987354b8146f2178595f7a
+  data.tar.gz: e2afd6e33044f41c77075429e71f0cb447c3a42f
 SHA512:
-  metadata.gz: e0d494d9034fa8b520391e16be318a79bdd97869bca734aed9807b896dcfe2057c63b98ecabfbfbd78d7cae4075caa359783144ff7826a1e73f35f2237e43e14
-  data.tar.gz: fc9c1c277be8e4764e0f19a1d767aaa5490f0e08c58647525ac9da9808f20e2239f88d1b37371641f98b1247ffe84eb73be80b4dcf67ad08eba936a68ed83820
+  metadata.gz: 543a5bc36e6b6c59224d3cd8f14075e4874d88ab7bbfe99989ec8114ffcd9cdd8ad4fc9d5924e72fd14efbcf264890e2cb723e6306285797d4dd0bd000fd542c
+  data.tar.gz: d0942f54379748f62cb77dc54e8e72347ba3467631195d3ea86f4681e8f4696ef1a50e547197f9a06142f997dbfcda1e66c8533c1477f0d5c6959adbb53c8de2

data/README.md

@@ -1,6 +1,8 @@
 # Stagger
 
 [![Build Status](https://travis-ci.org/Valve/stagger.svg?branch=master)](https://travis-ci.org/Valve/stagger)
+[![Gem Version](https://badge.fury.io/rb/stagger.svg)](http://badge.fury.io/rb/stagger)
+[![Code Climate](https://codeclimate.com/github/Valve/stagger.png)](https://codeclimate.com/github/Valve/stagger)
 
 Stagger is a simple gem that evenly distributes items across business
 days.

data/lib/stagger/version.rb

@@ -1,3 +1,3 @@
 module Stagger
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/lib/stagger.rb

@@ -7,7 +7,7 @@ module Stagger
       return [] if Array(items).empty? || number_of_days.to_i < 1
       time = get_starting_time
       period_in_seconds = get_period_in_seconds(items.size, number_of_days, time)
-      items = items.reduce [] do |arr, item|
+      items.reduce [] do |arr, item|
         if business_day?(time)
           arr << [item, time]
           time = time + period_in_seconds
@@ -17,11 +17,6 @@ module Stagger
           redo
         end
       end
-      if active_support_time?
-        items.map{|i,t| [i, t.in_time_zone(Time.zone)]}
-      else
-        items
-      end
     end
 
     private
@@ -35,7 +30,7 @@ module Stagger
     end
 
     def get_starting_time
-      tc = Time.now
+      tc = current_time
       if tc.saturday?
         at_beginning_of_day(tc) + SECONDS_IN_DAY * 2
       elsif tc.sunday?
@@ -46,7 +41,7 @@ module Stagger
     end
 
     def get_period_in_seconds(items_size, number_of_days, starting_time)
-      now = Time.now
+      now = current_time
       total_period = number_of_days * SECONDS_IN_DAY
       if business_day?(now)
         total_period -= (now - at_beginning_of_day(now))
@@ -55,11 +50,20 @@ module Stagger
     end
 
     def at_beginning_of_day(time)
-      Time.new(time.year, time.month, time.day)
+      active_support_time? ? time.at_beginning_of_day : Time.new(time.year, time.month, time.day)
     end
 
     def at_end_of_day(time)
-      at_beginning_of_day(time) + SECONDS_IN_DAY - 0.000000000001
+      if active_support_time?
+        time.at_end_of_day
+      else
+        at_beginning_of_day(time) + SECONDS_IN_DAY - 0.000000000001
+      end
+    end
+
+
+    def current_time
+      active_support_time? ? Time.zone.now : Time.now
     end
 
     def active_support_time?

data/spec/stagger_spec.rb

@@ -254,13 +254,23 @@ RSpec.describe Stagger do
         end
 
         context 'active support integration' do
+          before do
+            require 'active_support/all'
+            Time.zone = 'Asia/Tokyo'
+          end
           it 'returns ActiveSupport::TimeWithZone when ActiveSupport is available' do
-            fork do 
-              require 'active_support/all'
-              Time.zone = 'Moscow'
-              pair = Stagger.distribute([1], 1).first
-              expect(pair.first).to eq(1)
-              expect(pair.last).to be_a ::ActiveSupport::TimeWithZone
+            pair = Stagger.distribute([1], 1).first
+            expect(pair.first).to eq(1)
+            expect(pair.last).to be_a ::ActiveSupport::TimeWithZone
+          end
+
+          it 'schedules three items in two days if today is Friday' do
+            t = Time.zone.local(2014, 6, 27, 14) # - 2pm, Friday
+            Timecop.freeze(t) do
+              results = Stagger.distribute([1, 2, 3], 2)
+              expect(results[0][1]).to eq(t) # Friday
+              expect(results[1][1]).to eq Time.zone.local(2014, 6, 30, 1, 20) # Monday
+              expect(results[2][1]).to eq Time.zone.local(2014, 6, 30, 12, 40) # Monday
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stagger
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Valentin Vasilyev