one_inch_punch 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.2 2008-12-01
+
+* 1 enhancement:
+  * Getting list or total for a punched-in project and using the :before option no longer causes an exception
+    (thanks to Rick Bradley for finding this problem)
+
 == 0.2.1 2008-11-20
 
 * 1 enhancement:

data/lib/punch.rb

@@ -125,8 +125,8 @@ class Punch
     
     def do_list_single(project, options)
       return nil unless project_data = data[project]
-      project_data = project_data.select { |t|  t['in']  > options[:after] }  if options[:after]
-      project_data = project_data.select { |t|  t['out'] < options[:before] } if options[:before]
+      project_data = project_data.select { |t|  t['in']                > options[:after] }  if options[:after]
+      project_data = project_data.select { |t|  (t['out'] || Time.now) < options[:before] } if options[:before]
       project_data
     end
     

data/lib/punch/version.rb

@@ -2,7 +2,7 @@ class Punch
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/punch_spec.rb

@@ -700,6 +700,25 @@ describe Punch do
       it 'should restrict returned data to times only within a time range' do
         Punch.list(@project, :after => @now - 2001, :before => @now - 999).should == Punch.data[@project][1, 1]
       end
+      
+      describe 'and is punched in' do
+        before :each do
+          @data[@project].push({ 'in' => @now - 25 })
+          Punch.data = @data
+        end
+        
+        it 'should restrict returned data to times only after a certain time' do
+          Punch.list(@project, :after => @now - 501).should == Punch.data[@project].last(2)
+        end
+
+        it 'should restrict returned data to times only before a certain time' do
+          Punch.list(@project, :before => @now - 2499).should == Punch.data[@project].first(1)
+        end
+
+        it 'should restrict returned data to times only within a time range' do
+          Punch.list(@project, :after => @now - 2001, :before => @now - 999).should == Punch.data[@project][1, 1]
+        end
+      end
     end
 
     describe 'when the project does not exist' do
@@ -804,6 +823,18 @@ describe Punch do
         it 'give the time spent until now' do
           Punch.total(@project).should == 3925
         end
+        
+        it 'should restrict returned amount to times only after a certain time' do
+          Punch.total(@project, :after => @now - 501).should == 425
+        end
+
+        it 'should restrict returned amount to times only before a certain time' do
+          Punch.total(@project, :before => @now - 2499).should == 2500
+        end
+
+        it 'should restrict returned amount to times only within a time range' do
+          Punch.total(@project, :after => @now - 2001, :before => @now - 999).should == 1000
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one_inch_punch
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-20 00:00:00 -06:00
+date: 2008-12-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency