time_distribution 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906063f479403bf2f723d670086c78e6707666d7
-  data.tar.gz: 185834218fe90c896548fb965e070b768704d74a
+  metadata.gz: 8a71a5c2af5b49832a2045860f26499d7f4dffe7
+  data.tar.gz: 000bb37d8f5d219162d92e79b3ca7a7b708166ef
 SHA512:
-  metadata.gz: e558b20fb24adb178b18c33690c640e77ec8925374a55d0a1088dee5eaa29d027ba08f199c9613bf53f60897f205d15efbd9cef9584e6fda8befba34abd7a3a2
-  data.tar.gz: ea5f6468b2995476bf196dbf0f16305a8651c4c704a25edef0161976354d83870635858979f281b79c71dd832444125201b2e71a25900cf8e0d7a656b224d943
+  metadata.gz: 1bffa9227b70531563e5a90a34a1c7b39f445061a379d252e4ef5975d42f31e4ae504dd6b925a31a0842d0a6c87b8eee3d98c8729192982a8bbb835971659ff3
+  data.tar.gz: 3833eeb5d729993caef2518de9785b04a1e47b43e0c67af8aae9933c4447e6a6a5cd2a73ff40a14ffc4e46f28924d771f7cbf07a703e654f16c84db696ce11ce

data/lib/time_distribution/task.rb

@@ -30,7 +30,17 @@ module TimeDistribution
     end
 
     def to_ssv
-      format("%-25s%10s", @subject, to_hours_s)
+      format(
+        "%-30s%10s",
+        (
+          if block_given?
+            yield(@subject)
+          else
+            @subject
+          end
+        ),
+        to_hours_s
+      )
     end
   end
 end

data/lib/time_distribution/version.rb

@@ -1,3 +1,3 @@
 module TimeDistribution
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/lib/time_distribution/work_day.rb

@@ -34,8 +34,13 @@ module TimeDistribution
 
     def to_ssv
       (
-        "# #{@date.strftime('%b %-d, %Y')}\n" +
-        @tasks.to_ssv
+        "# #{@date.strftime('%b %-d, %Y')}\n" + (
+          if block_given?
+            @tasks.to_ssv { |key| yield(key) }
+          else
+            @tasks.to_ssv
+          end
+        )
       )
     end
   end

data/lib/time_distribution/work_day_collection.rb

@@ -66,7 +66,91 @@ module TimeDistribution
     end
 
     def to_ssv
-      inject('') { |s, d| s += "#{d.to_ssv}" }
+      inject('') do |s, d|
+        s += if block_given?
+          "#{d.to_ssv { |key| yield(key) }}"
+        else
+          "#{d.to_ssv}"
+        end
+      end
+    end
+
+    def time_worked_to_ssv
+      string = ''
+      time_worked.each do |k,j|
+        string += format(
+          "%-30s%10s\n",
+          (
+            if block_given?
+              yield(k)
+            else
+              k
+            end
+          ),
+          format("%0.2f", j.total / 3600.0)
+        )
+      end
+      string
+    end
+
+    def work_days_by_weeks
+      (0..length / 7).inject([]) do |array, week|
+        week_start = 7*week
+        week_end = week_start+6
+        days = self[week_start..week_end]
+        next array if days.empty?
+
+        array << WorkDayCollection.new(*days)
+        yield array.last if block_given?
+        array
+      end
+    end
+
+    def hours_per_day_by_weeks(*task_types)
+      array = []
+      work_days_by_weeks do |week|
+        array << (
+          week.map do |day|
+            day.to_hours(*task_types)
+          end
+        )
+        yield array.last if block_given?
+      end
+      array
+    end
+
+    def hours_per_week(*task_types)
+      hours = []
+      hours_per_day_by_weeks(*task_types) do |week|
+        hours << week.inject(:+)
+      end
+      hours
+    end
+
+    def subjects
+      map { |day| day.tasks.map { |task| task.subject } }.flatten.sort.uniq
+    end
+
+    def hours_per_week_ssv(*task_types)
+      string = ''
+      hours = []
+      week = 1
+      work_days_by_weeks do |week_collection|
+        string += (
+          "# #{week_collection.first.date.strftime('%b %-d, %Y')}\n" +
+          "# #{week_collection.subjects.join(', ')}\n"
+        )
+        week_hours = week_collection.map do |day|
+          day.to_hours(*task_types)
+        end
+        hours << week_hours.inject(:+)
+        string += (
+          "# " + week_hours.join(', ') + "\n" +
+          format("%-10d%0.2f\n", week + 1, hours.last)
+        )
+        week += 1
+      end
+      string += format("%-10s%0.2f\n", 'Avg', hours.inject(:+) / hours.length)
     end
   end
 end

data/spec/work_day_collection_spec.rb

@@ -146,19 +146,78 @@ END
       patient.to_ssv.must_equal (
 <<-END
 # Mar 14, 2015
-taxes                          2.60
-taxes                          1.50
+taxes                               2.60
+taxes                               1.50
 # Mar 13, 2015
-cmput659                       6.92
-cprg                           1.00
-masters_research               1.00
-cmput659                       0.25
-cmput659                       1.70
+cmput659                            6.92
+cprg                                1.00
+masters_research                    1.00
+cmput659                            0.25
+cmput659                            1.70
 END
 )
     end
   end
 
+  describe '#time_worked_to_ssv' do
+    it 'works' do
+      patient = new_full_patient
+      patient.time_worked_to_ssv do |subject|
+        subject.to_s.split('_').collect(&:capitalize).join
+      end.must_equal (
+<<-END
+Taxes                               4.10
+Cmput659                            8.87
+Cprg                                1.00
+MastersResearch                     1.00
+END
+      )
+    end
+  end
+
+  describe '#work_days_by_weeks' do
+    it 'works' do
+      patient = new_full_patient
+      patient.work_days_by_weeks.flatten.must_equal patient
+    end
+  end
+
+  describe '#hours_per_day_by_weeks' do
+    it 'works' do
+      patient = new_full_patient
+      patient.hours_per_day_by_weeks.must_equal [[4.1, 10.866666666666667]]
+    end
+  end
+
+  describe '#hours_per_week' do
+    it 'works' do
+      patient = new_full_patient
+      patient.hours_per_week.must_equal [4.1 + 10.866666666666667]
+    end
+  end
+
+  describe '#subjects' do
+    it 'works' do
+      patient = new_full_patient
+      patient.subjects.must_equal [:taxes, :cmput659, :cprg, :masters_research].sort
+    end
+  end
+
+  describe '#hours_per_week_ssv' do
+    it 'works' do
+      patient = new_full_patient
+      patient.hours_per_week_ssv.must_equal (
+<<-END
+# Mar 14, 2015
+# cmput659, cprg, masters_research, taxes
+# 4.1, 10.866666666666667
+2         14.97
+Avg       14.97
+END
+      )
+    end
+  end
+
   def new_full_patient
     WorkDayCollection.new(
       WorkDay.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_distribution
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Dustin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic