time_distribution 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c080fc58f25088d05f155ce39623ac9c2e3fe478
-  data.tar.gz: 7725aa3312d2d3150d2c81cfc41f39887f512125
+  metadata.gz: dccb31c666eb18ba4851cada37bb34f75e7bf3f7
+  data.tar.gz: dd41ba2827bbc35cb11615438c281eeec6b177fc
 SHA512:
-  metadata.gz: 2dca2300f821cc40577f766f0a6d857ac4aad9c1a5e645896fd2ff2f9f4a8ce9fcbe46d8101dc86acbe797f79096fa69e8f168f9e439b824e66126d7a04e6ac9
-  data.tar.gz: 020146a4fbe9ed8008d39baecc586d54b49f22a0160b0a0ee0ac10d22a1388c2f242257e9468a673a5dac65c30b3c3212e80876003c0f912e0771c851f564ef1
+  metadata.gz: 64d466ee3beeaf7163d5dce34952d5ef69cce65f968aeb20e6ed57c3ef5676c3757b57763ecbc49c6578b674d942281afff1bcf2e3a48ad73b9018f1cc928eab
+  data.tar.gz: 80e798da6b384012b3c6f448ab9a19c4c6ef49bc692cf95fd890837d9837321d487d87ea4baeadd8c1f2fdb8e5d43e7c7e1fdef4431ed418931a7318819cf4b3

data/lib/time_distribution/version.rb

@@ -1,3 +1,3 @@
 module TimeDistribution
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/time_distribution/work_day.rb

@@ -19,13 +19,27 @@ module TimeDistribution
       self
     end
 
-    def time_worked
+    def time_worked(*subjects)
+      subjects.flatten!
       times = {}
-      @tasks.inject({}) do |times, t|
-        times[t.subject] = Duration.new(0) unless times[t.subject]
-        times[t.subject] += t.time_taken
+      unless subjects.empty? || subjects.kind_of?(Set)
+        subjects = Set.new(subjects) # To take advantage of Set's faster include? check
+      end
+
+      times_to_return = @tasks.inject({}) do |times, t|
+        t_subject = t.subject
+        next times unless subjects.empty? || subjects.include?(t_subject)
+
+        times[t_subject] = Duration.new(0) unless times[t_subject]
+        times[t_subject] += t.time_taken
         times
       end
+
+      if times_to_return.length == 1
+        times_to_return.values.first
+      else
+        times_to_return
+      end
     end
   end
 end

data/spec/support/spec_helper.rb

@@ -2,30 +2,32 @@ require 'simplecov'
 SimpleCov.start
 
 require 'minitest/spec'
-require 'minitest/pride'
 require 'minitest/mock'
 
-require 'turn'
-Turn.config do |c|
-  # use one of output formats:
-  # :outline  - turn's original case/test outline mode [default]
-  # :progress - indicates progress with progress bar
-  # :dotted   - test/unit's traditional dot-progress mode
-  # :pretty   - new pretty reporter
-  # :marshal  - dump output as YAML (normal run mode only)
-  # :cue      - interactive testing
-  c.format  = :dotted
-  # use humanized test names (works only with :outline format)
-  c.natural = true
-end
+begin
+  require 'turn/autorun'
+  Turn.config do |c|
+    # use one of output formats:
+    # :outline  - turn's original case/test outline mode [default]
+    # :progress - indicates progress with progress bar
+    # :dotted   - test/unit's traditional dot-progress mode
+    # :pretty   - new pretty reporter
+    # :marshal  - dump output as YAML (normal run mode only)
+    # :cue      - interactive testing
+    c.format  = :dotted
+    # use humanized test names (works only with :outline format)
+    c.natural = true
+  end
 
-require 'awesome_print'
-module Minitest::Assertions
-  def mu_pp(obj)
-    obj.awesome_inspect
+  require 'awesome_print'
+  module Minitest::Assertions
+    def mu_pp(obj)
+      obj.awesome_inspect
+    end
   end
-end
 
-require 'pry-rescue/minitest'
+  require 'pry-rescue/minitest'
+rescue LoadError
+end
 
 require 'ruby-duration'

data/spec/work_day_spec.rb

@@ -22,16 +22,94 @@ describe WorkDay do
     end
   end
   describe 'time_worked' do
-    it 'works' do
+    describe 'returns a hash of duration sums without arguments' do
+      it 'when all tasks have the same subject' do
+        time_taken_for_each_task = 23
+        x_subject = 'my subject'
+        @x_tasks.each do |mock_task|
+          mock_task.expect(:subject, x_subject)
+          mock_task.expect(:time_taken, time_taken_for_each_task)
+        end
+        @patient.time_worked.must_equal (Duration.new(@x_tasks.length * time_taken_for_each_task))
+      end
+      it 'when more than one subject is present' do
+        time_taken_for_each_task = 23
+        subject_1 = 'subject 1'
+        @x_tasks.each do |mock_task|
+          mock_task.expect(:subject, subject_1)
+          mock_task.expect(:time_taken, time_taken_for_each_task)
+        end
+        num_subject_1_tasks = @x_tasks.length
+        t3 = MiniTest::Mock.new
+        subject_2 = 'subject 2'
+        t3.expect(:subject, subject_2)
+        t3.expect(:time_taken, time_taken_for_each_task)
+        @x_tasks << t3
+        t4 = MiniTest::Mock.new
+        subject_3 = 'subject 3'
+        t4.expect(:subject, subject_3)
+        t4.expect(:time_taken, time_taken_for_each_task)
+        @x_tasks << t4
+
+        @patient.time_worked.must_equal (
+          {
+            subject_1 => Duration.new(num_subject_1_tasks * time_taken_for_each_task),
+            subject_2 => Duration.new(time_taken_for_each_task),
+            subject_3 => Duration.new(time_taken_for_each_task)
+          }
+        )
+      end
+    end
+    it 'returns a hash of duration sums when given a list of subjects' do
       time_taken_for_each_task = 23
-      x_subject = 'my subject'
+      subject_1 = 'subject 1'
       @x_tasks.each do |mock_task|
-        mock_task.expect(:subject, x_subject)
-        mock_task.expect(:subject, x_subject)
-        mock_task.expect(:subject, x_subject)
+        mock_task.expect(:subject, subject_1)
         mock_task.expect(:time_taken, time_taken_for_each_task)
       end
-      @patient.time_worked.must_equal ({x_subject => Duration.new(@x_tasks.length * time_taken_for_each_task)})
+      num_subject_1_tasks = @x_tasks.length
+      t3 = MiniTest::Mock.new
+      subject_2 = 'subject 2'
+      t3.expect(:subject, subject_2)
+      t3.expect(:time_taken, time_taken_for_each_task)
+      @x_tasks << t3
+      t4 = MiniTest::Mock.new
+      subject_3 = 'subject 3'
+      t4.expect(:subject, subject_3)
+      @x_tasks << t4
+
+      @patient.time_worked([subject_1, subject_2]).must_equal (
+        {
+          subject_1 => Duration.new(num_subject_1_tasks * time_taken_for_each_task),
+          subject_2 => Duration.new(time_taken_for_each_task)
+        }
+      )
+    end
+    describe 'returns a single sum given a subject' do
+      it 'as a scalar' do
+        time_taken_for_each_task = 23
+        subject_1 = 'subject 1'
+        @x_tasks.each do |mock_task|
+          mock_task.expect(:subject, subject_1)
+          mock_task.expect(:time_taken, time_taken_for_each_task)
+        end
+        num_subject_1_tasks = @x_tasks.length
+        t3 = MiniTest::Mock.new
+        subject_2 = 'subject 2'
+        t3.expect(:subject, subject_2)
+        t3.expect(:time_taken, time_taken_for_each_task)
+        @x_tasks << t3
+        t4 = MiniTest::Mock.new
+        subject_3 = 'subject 3'
+        t4.expect(:subject, subject_3)
+        @x_tasks << t4
+
+        @patient.time_worked(subject_1).must_equal (
+          Duration.new(num_subject_1_tasks * time_taken_for_each_task)
+        )
+      end
+      it 'as a single element list' do
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_distribution
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dustin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic