punchcard 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    punchcard (0.1.4)
+    punchcard (0.2.4)
       activerecord (~> 3.0.0)
       bson_ext
       gravtastic
@@ -42,6 +42,7 @@ GEM
     sqlite3 (0.1.1)
       ffi (>= 0.6.3)
     tilt (1.1)
+    timecop (0.3.5)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -58,3 +59,4 @@ DEPENDENCIES
   shoulda (= 2.10.3)
   sinatra (>= 1.0.0)
   sqlite3
+  timecop

data/Rakefile

@@ -19,6 +19,7 @@ begin
     gem.add_development_dependency "shoulda", "2.10.3"
     gem.add_development_dependency "rack-test", ">= 0.5.6"
     gem.add_development_dependency 'sqlite3', '>= 0'
+    gem.add_development_dependency 'timecop', '>= 0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/punchcard/person.rb

@@ -18,7 +18,7 @@ class Person < ActiveRecord::Base
     if punch = pending?
       punch.punch_out!
     else
-      if recently_finished = punches.recently_finished.first
+      if recently_finished = punches.finished.first and recently_finished.checked_out_at > 30.minutes.ago
         recently_finished.reopen!
       else
         punches.create!

data/lib/punchcard/punch.rb

@@ -5,7 +5,6 @@ class Punch < ActiveRecord::Base
   
   scope :pending, where("checked_out_at IS NULL").order("checked_in_at ASC")
   scope :finished, where("checked_in_at IS NOT NULL AND checked_out_at IS NOT NULL").order('checked_out_at DESC')
-  scope :recently_finished, where("checked_out_at > ?", 30.minutes.ago).order('checked_out_at DESC')
   
   before_validation do |p|
     p.checked_in_at ||= Time.now

data/lib/views/layout.haml

@@ -15,9 +15,7 @@
         <li id="${_id}">
           <img src="${gravatar_url}" title="${name}" class="gravatar {{if pending == true}}pending{{/if}} ${pending}"/>
           <div class="person">${name}</div>
-          {{if checked_in_at}}
-            <abbr class="timeago" title="${checked_in_at}"></abbr>
-          {{/if}}
+          <abbr class="timeago" title="{{if checked_in_at}}${checked_in_at}{{/if}}">&nbsp;</abbr>
         </li>
       </script>
       

data/lib/views/screen.sass

@@ -14,6 +14,7 @@ $yellow: #fc0
   background: #eadab6
   border-top: 10px solid #f8bba6 
   -moz-box-shadow: 3px 3px 0px #d2bd8e
+  -moz-border-radius: 20px
 
 .clear
   clear: both

data/punchcard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{punchcard}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.6"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
@@ -79,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_dependency(%q<rack-test>, [">= 0.5.6"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 1.0.0"])
@@ -90,6 +92,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
     s.add_dependency(%q<rack-test>, [">= 0.5.6"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -5,6 +5,7 @@ Bundler.require
 require 'test/unit'
 require 'shoulda'
 require 'rack/test'
+require 'timecop'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_database.rb

@@ -23,10 +23,12 @@ class TestDatabase < Test::Unit::TestCase
     
     context "that got punched 2 hours ago" do
       setup do
-        assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
-        punch = @person.pending?
-        punch.checked_in_at = 2.hours.ago
-        punch.save!
+        Timecop.freeze(2.hours.ago) do
+          assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
+          punch = @person.pending?
+          punch.checked_in_at = 2.hours.ago
+          punch.save!
+        end
       end
       
       should "have one pending punch" do
@@ -41,13 +43,15 @@ class TestDatabase < Test::Unit::TestCase
         end
       end
       
-      context "and gets punched again" do
+      context "and checked out 25 minutes ago" do
         setup do
-          assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
+          Timecop.freeze(25.minutes.ago) do
+            assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
+          end
         end
         
         should "have finished the pending punch" do
-          assert @person.punches.first.checked_out_at > 5.seconds.ago
+          assert @person.punches.first.checked_out_at < 24.minutes.ago and @person.punches.first.checked_out_at > 26.minutes.ago
         end
         
         should "not be pending" do
@@ -60,7 +64,7 @@ class TestDatabase < Test::Unit::TestCase
           assert_equal 1, @person.punches.finished.count
         end
         
-        context "and gets punched yet again" do
+        context "and punches in again now" do
           setup do
             assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
           end
@@ -76,15 +80,12 @@ class TestDatabase < Test::Unit::TestCase
           end
         end
         
-        context "and gets punched yet again 2 hours later" do
+        context "and gets punched yet again 1 hour later" do
           setup do
-            # Fake the timestamp so reopening does not get triggered
-            punch = @person.punches.finished.first
-            punch.checked_in_at = 3.hours.ago
-            punch.checked_out_at = 2.hours.ago
-            punch.save!
-            assert_nil @person.pending?
-            assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
+            Timecop.freeze(1.hour.from_now) do
+              assert_nil @person.pending?
+              assert @person.punch!.instance_of?(Punch), "Should have been able to get punched and have returned a Punch"
+            end
           end
           
           should "be pending" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -146,6 +146,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Simple sinatra/activerecord based app for tracking time when people have been in the office
 email: christoph at olszowka de
 executables: []