beggar 0.0.2.alpha → 0.0.3.alpha

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beggar (0.0.1.alpha)
+    beggar (0.0.2.alpha)
       basecamp
 
 GEM
@@ -42,7 +42,6 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    timecop (0.3.5)
     xml-simple (1.1.1)
 
 PLATFORMS
@@ -51,4 +50,3 @@ PLATFORMS
 DEPENDENCIES
   beggar!
   rspec
-  timecop

data/README.md

@@ -7,3 +7,6 @@ Tool for generating time reports from Basecamp
 
 ## Usage
   TODO
+
+## Changelog
+  TODO

data/beggar.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_development_dependency "timecop"
   s.add_runtime_dependency "basecamp"
 end

data/lib/beggar/current_month.rb

@@ -9,16 +9,16 @@ module Beggar
         first_day.next_month - 1
       end
 
-      def working_days(last_day = last_day)
-        (first_day..last_day).reject { |d| [0,6].include? d.wday }.size
+      def working_days(range)
+        range.reject { |d| [0,6].include? d.wday }.size
       end
 
       def working_days_up_today
-        working_days(Date.today)
+        working_days(first_day..Date.today)
       end
 
       def to_s
-        %[#{(working_days_up_today.to_f / working_days * 100).round}%]
+        %[#{(working_days_up_today.to_f / working_days(first_day..last_day) * 100).round}%]
       end
     end
   end

data/lib/beggar/hours.rb

@@ -5,20 +5,20 @@ module Beggar
     class << self
       attr_accessor :project_id
 
-      def from_basecamp
-        @@from_basecamp ||= Basecamp::TimeEntry.report(project_id: project_id, from: CurrentMonth.first_day, to: Date.today).map(&:hours).inject(&:+)
+      def worked
+        @@worked ||= Basecamp::TimeEntry.report(project_id: project_id, from: CurrentMonth.first_day, to: Date.today).map(&:hours).inject(&:+)
       end
 
-      def up_today
+      def max_up_today
         CurrentMonth.working_days_up_today * 8
       end
 
       def difference
-        up_today - from_basecamp
+        max_up_today - worked
       end
 
       def to_s
-        %[#{from_basecamp}h ± #{difference}h]
+        %[#{worked}h ± #{difference}h]
       end
     end
   end

data/lib/beggar/salary.rb

@@ -5,20 +5,20 @@ module Beggar
     class << self
       attr_accessor :rate
 
-      def from_basecamp
-        Hours.from_basecamp * rate
+      def today
+        Hours.worked * rate
       end
 
-      def up_today
-        Hours.up_today * rate
+      def max_up_today
+        Hours.max_up_today * rate
       end
 
       def difference
-        up_today - from_basecamp
+        max_up_today - today
       end
 
       def to_s
-        %[#{from_basecamp} PLN ± #{difference} PLN]
+        %[#{today} PLN ± #{difference} PLN]
       end
     end
   end

data/lib/beggar/version.rb

@@ -1,3 +1,3 @@
 module Beggar
-  VERSION = "0.0.2.alpha"
+  VERSION = "0.0.3.alpha"
 end

data/spec/current_month_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 
 describe Beggar::CurrentMonth do
   context 'today is the 24th December 2011' do
-    before(:all) { Timecop.travel(Date.new(2011, 12, 24)) }
-    after(:all) { Timecop.return }
+    before { Date.stub(today: Date.new(2011, 12, 24)) }
+
+    let(:first_day) { Date.new(2011, 12, 1) }
+    let(:last_day) { Date.new(2011, 12, 31) }
 
     subject { Beggar::CurrentMonth }
 
-    its(:first_day) { should == Date.new(2011, 12, 1) }
-    its(:last_day) { should == Date.new(2011, 12, 31) }
-    its(:working_days) { should == 22 }
+    its(:first_day) { should == first_day }
+    its(:last_day) { should == last_day }
+    it { subject.working_days(first_day..last_day).should == 22 }
     its(:working_days_up_today) { should == 17 }
     its(:to_s) { should == '77%' }
   end

data/spec/hours_spec.rb

@@ -12,8 +12,8 @@ describe 'Beggar::Hours' do
 
     subject { Beggar::Hours }
 
-    its(:from_basecamp) { should == 14.0 }
-    its(:up_today) { should == 16.0 }
+    its(:worked) { should == 14.0 }
+    its(:max_up_today) { should == 16.0 }
     its(:difference) { should == 2.0 }
     its(:to_s) { should == '14.0h ± 2.0h' }
   end

data/spec/salary_spec.rb

@@ -5,14 +5,14 @@ require 'spec_helper'
 describe 'Beggar::Salary' do
   context 'user was working 10h (max: 40h) in current month and his rate per h amount 100.0 PLN' do
     before do
-      Beggar::Hours.stub(from_basecamp: 10, up_today: 40)
+      Beggar::Hours.stub(worked: 10, max_up_today: 40)
       Beggar::Salary.stub(rate: 100.0)
     end
 
     subject { Beggar::Salary }
 
-    its(:from_basecamp) { should == 1000.0 }
-    its(:up_today) { should == 4000.0 }
+    its(:today) { should == 1000.0 }
+    its(:max_up_today) { should == 4000.0 }
     its(:difference) { should == 3000.0 }
     its(:to_s) { should == '1000.0 PLN ± 3000.0 PLN' }
   end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
 require 'beggar'
-require 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beggar
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2011-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164495032580 !ruby/object:Gem::Requirement
+  requirement: &70210180152260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164495032580
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: &70164495032040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70164495032040
+  version_requirements: *70210180152260
 - !ruby/object:Gem::Dependency
   name: basecamp
-  requirement: &70164495031520 !ruby/object:Gem::Requirement
+  requirement: &70210180151220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164495031520
+  version_requirements: *70210180151220
 description: Tool for generating time reports from Basecamp. You can specify rate
   for each project and get value of your month salary.
 email:
@@ -56,7 +45,6 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE

data/CHANGELOG.md

@@ -1 +0,0 @@
-TODO