punchcard 0.2.5 → 0.2.6

data/.gitignore

@@ -16,6 +16,9 @@ tmtags
 ## VIM
 *.swp
 
+## IDEA/Rubymine
+.idea
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    punchcard (0.2.4)
+    punchcard (0.2.5)
       activerecord (~> 3.0.0)
       bson_ext
       gravtastic
@@ -27,13 +27,22 @@ GEM
     builder (2.1.2)
     ffi (1.0.1)
       rake (>= 0.8.7)
+    gemcutter (0.6.1)
+    git (1.2.5)
     gravtastic (3.1.0)
     haml (3.0.24)
     i18n (0.5.0)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
     rack (1.2.1)
     rack-test (0.5.6)
       rack (>= 1.0)
     rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     sass (3.1.0.alpha.200)
     shoulda (2.10.3)
     sinatra (1.1.0)
@@ -53,6 +62,7 @@ DEPENDENCIES
   bson_ext
   gravtastic
   haml (>= 3.0.24)
+  jeweler
   punchcard!
   rack-test (>= 0.5.6)
   sass (>= 3.0.0)

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_development_dependency "rack-test", ">= 0.5.6"
     gem.add_development_dependency 'sqlite3', '>= 0'
     gem.add_development_dependency 'timecop', '>= 0'
+    gem.add_development_dependency 'jeweler', '>= 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.5
+0.2.6

data/lib/db/migrate/03_add_minutes_to_punches.rb

@@ -0,0 +1,12 @@
+class AddMinutesToPunches < ActiveRecord::Migration
+  def self.up
+    add_column :punches, :minutes, :integer, :default => 0
+    Punch.all.each do |p|
+      p.save!
+    end
+  end
+
+  def self.down
+    remove_column :punches, :minutes, :integer
+  end
+end

data/lib/public/js/app.js

@@ -2,7 +2,7 @@
 function update_status() {
   var in_office = [];
   $.getJSON('/status.json', function(json) {
-    $.each(json, function(index, person) {
+    $.each(json.people, function(index, person) {
       update_person(person);
     });
   });
@@ -35,7 +35,7 @@ function update_title() {
 $(document).ready(function() {
   $( "#personTemplate" ).template( "personTemplate" );
   
-  $('#people li').live('dblclick', function() {
+  $('#people li').live('click', function() {
     user_id = $(this).attr('id');
     $.post('/punch/' + user_id, function(data) {
       //$('.result').html(data);

data/lib/punchcard/person.rb

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

data/lib/punchcard/punch.rb

@@ -7,7 +7,8 @@ class Punch < ActiveRecord::Base
   scope :finished, where("checked_in_at IS NOT NULL AND checked_out_at IS NOT NULL").order('checked_out_at DESC')
   
   before_validation do |p|
-    p.checked_in_at ||= Time.now
+    p.checked_in_at ||= Time.now.utc
+    p.minutes = p.difference_in_minutes
   end
   
   validate do |p|
@@ -21,14 +22,25 @@ class Punch < ActiveRecord::Base
     end
   end
   
+  # Return database-saved minutes when already checked out, otherwise calculate based upon time now
+  def minutes
+    checked_out_at.present? ? self["minutes"] : difference_in_minutes
+  end
+  
+  # Calculates the difference between checkin and checkout or time now when pending in minutes
+  def difference_in_minutes
+    base = checked_out_at.present? ? checked_out_at.utc : Time.now.utc
+    ((base - checked_in_at.utc) / 60).round
+  end
+  
   # Punches this punch out when pending
   def punch_out!
     return false if checked_out_at.present?
     # Make sure no one stays the night...
-    if self.checked_in_at.to_date < Date.today
-      self.checked_out_at = self.checked_in_at.end_of_day
+    if self.checked_in_at.utc < Time.now.utc.beginning_of_day
+      self.checked_out_at = self.checked_in_at.utc.end_of_day
     else
-      self.checked_out_at = Time.now
+      self.checked_out_at = Time.now.utc
     end
     save!
     self

data/lib/punchcard.rb

@@ -30,7 +30,7 @@ class Punchcard < Sinatra::Base
   end
   
   get '/status.json' do
-    Person.order('name ASC').map(&:payload).to_json
+    {:people => Person.order('name ASC').map(&:payload)}.to_json
   end
   
   post '/punch/:id' do

data/punchcard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{punchcard}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-12-09}
+  s.date = %q{2010-12-10}
   s.description = %q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
   s.email = %q{christoph at olszowka de}
   s.extra_rdoc_files = [
@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "config.ru",
      "lib/db/migrate/01_create_people.rb",
      "lib/db/migrate/02_create_punches.rb",
+     "lib/db/migrate/03_add_minutes_to_punches.rb",
      "lib/public/cardbg.png",
      "lib/public/css/blueprint.css",
      "lib/public/js/app.js",
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack-test>, [">= 0.5.6"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack-test>, [">= 0.5.6"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 1.0.0"])
@@ -93,6 +95,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack-test>, [">= 0.5.6"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/test_database.rb

@@ -25,9 +25,6 @@ class TestDatabase < Test::Unit::TestCase
       setup do
         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
       
@@ -43,6 +40,10 @@ class TestDatabase < Test::Unit::TestCase
         end
       end
       
+      should "return an appropriate (virtual) amount of minutes while pending" do
+        assert_equal 120, @person.punches.first.minutes
+      end
+      
       context "and checked out 25 minutes ago" do
         setup do
           Timecop.freeze(25.minutes.ago) do
@@ -54,6 +55,10 @@ class TestDatabase < Test::Unit::TestCase
           assert @person.punches.first.checked_out_at < 24.minutes.ago and @person.punches.first.checked_out_at > 26.minutes.ago
         end
         
+        should "have set the proper amount of minutes" do
+          assert_equal 95, @person.punches.first.minutes
+        end
+        
         should "not be pending" do
           assert_nil @person.pending?
         end
@@ -123,10 +128,9 @@ class TestDatabase < Test::Unit::TestCase
     
     context "that punched in yesterday" do
       setup do
-        @person.punch!
-        punch = @person.pending?
-        punch.checked_in_at = 1.day.ago
-        punch.save!
+        Timecop.freeze(1.day.ago) do
+          @person.punch!
+        end
       end
       
       context "and punches out today" do
@@ -136,7 +140,7 @@ class TestDatabase < Test::Unit::TestCase
         
         should "result in the punch out getting moved to the end of yesterday" do
           checkout_time = @person.punches.finished.first.checked_out_at
-          assert_equal 1.day.ago.end_of_day.to_date, checkout_time.to_date
+          assert_equal 1.day.ago.end_of_day.utc.to_date, checkout_time.utc.to_date
           assert_equal 23, checkout_time.hour
           assert_equal 59, checkout_time.min
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,6 +159,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Simple sinatra/activerecord based app for tracking time when people have been in the office
 email: christoph at olszowka de
 executables: []
@@ -177,9 +190,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- config.ru
 - lib/db/migrate/01_create_people.rb
 - lib/db/migrate/02_create_punches.rb
+- lib/db/migrate/03_add_minutes_to_punches.rb
 - lib/public/cardbg.png
 - lib/public/css/blueprint.css
 - lib/public/js/app.js

data/config.ru

@@ -1,11 +0,0 @@
-# Example config.ru for running from direct git clone
-# See README to see how to launch from gem
-require './lib/punchcard'
-
-Punchcard.set :mongo_db, 'punchcard'
-
-Punchcard.use Rack::Auth::Basic do |username, password|
-  [username, password] == ['admin', 'admin']
-end
-
-run Punchcard