punchcard 0.2.9 → 0.3.0

data/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 
 .bundle
+Gemfile.lock
 .sass-cache
 *.sqlite*
 

data/README.rdoc

@@ -26,11 +26,11 @@ Create a config.ru for rack:
 
   # You'll surely want to secure your punch card from general web access. The simplest way to do so is by
   # using the rack auth middleware, defining it somewhere in your config.ru:
-  Punchcard.use Rack::Auth::Basic do |username, password|
+  Punchcard::App.use Rack::Auth::Basic do |username, password|
     [username, password] == ['someuser', 'secret']
   end
 
-  run Punchcard
+  run Punchcard::App
   
 To run locally, make sure you have a proper ENV['DATABASE_URL'] configured or the sqlite3 gem installed
 with your bundle. Then:
@@ -41,6 +41,10 @@ with your bundle. Then:
 
 Open http://localhost:9292
 
+== Supported Ruby versions
+
+Punchcard is tested against MRI 1.8.7, 1.9.1, 1.9.2 and Ruby Enterprise Edition.
+
 == Hosting on Heroku
 
 Starting from the initial bootstrap above, make sure you have the pg gem in your bundle and did run

data/Rakefile

@@ -1,32 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "punchcard"
-    gem.summary = %Q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
-    gem.description = %Q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
-    gem.email = "christoph at olszowka de"
-    gem.homepage = "http://github.com/colszowka/punchcard"
-    gem.authors = ["Christoph Olszowka"]
-    gem.add_dependency 'sinatra', ">= 1.0.0"
-    gem.add_dependency 'bson_ext', '>= 0'
-    gem.add_dependency 'haml', '>= 3.0.24'
-    gem.add_dependency 'sass', '>= 3.0.0'
-    gem.add_dependency 'activerecord', '~> 3.0.0'
-    gem.add_dependency 'gravtastic', '>= 0'
-    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.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
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -35,29 +8,11 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "punchcard #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/lib/punchcard.rb

@@ -21,25 +21,8 @@ end
 require 'punchcard/person'
 require 'punchcard/punch'
 
-class Punchcard < Sinatra::Base
-  set :views,  File.join(File.dirname(__FILE__), 'views')
-  set :public, File.join(File.dirname(__FILE__), 'public')
-  
-  get '/' do
-    haml :index
-  end
-  
-  get '/status.json' do
-    {:people => Person.order('name ASC').map(&:payload)}.to_json
-  end
-  
-  post '/punch/:id' do
-    @person = Person.find(params[:id])
-    @person.punch!
-    @person.to_json
-  end
-  
-  get '/css/screen.css' do
-    sass :screen
-  end
-end
+module Punchcard
+end
+
+require 'punchcard/app'
+require 'punchcard/version'

data/lib/punchcard/app.rb

@@ -0,0 +1,22 @@
+class Punchcard::App < Sinatra::Base
+  set :views,  File.join(File.dirname(__FILE__), '../views')
+  set :public, File.join(File.dirname(__FILE__), '../public')
+  
+  get '/' do
+    haml :index
+  end
+  
+  get '/status.json' do
+    {:people => Person.order('name ASC').map(&:payload)}.to_json
+  end
+  
+  post '/punch/:id' do
+    @person = Person.find(params[:id])
+    @person.punch!
+    @person.to_json
+  end
+  
+  get '/css/screen.css' do
+    sass :screen
+  end
+end

data/lib/punchcard/version.rb

@@ -0,0 +1,3 @@
+module Punchcard
+  VERSION = '0.3.0'
+end

data/punchcard.gemspec

@@ -1,101 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "punchcard/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{punchcard}
-  s.version = "0.2.9"
+  s.name        = "punchcard"
+  s.version     = Punchcard::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Christoph Olszowka"]
+  s.email       = ["christoph at olszowka de"]
+  s.homepage    = "https://github.com/capita/punchcard"
+  s.summary     = %Q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
+  s.description = %Q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christoph Olszowka"]
-  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 = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "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",
-     "lib/public/js/jquery.timeago.js",
-     "lib/punchcard.rb",
-     "lib/punchcard/person.rb",
-     "lib/punchcard/punch.rb",
-     "lib/punchcard/tasks.rb",
-     "lib/views/index.haml",
-     "lib/views/layout.haml",
-     "lib/views/screen.sass",
-     "punchcard.gemspec",
-     "test/helper.rb",
-     "test/test_database.rb",
-     "test/test_punchcard.rb"
-  ]
-  s.homepage = %q{http://github.com/colszowka/punchcard}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple sinatra/activerecord based app for tracking time when people have been in the office}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_database.rb",
-     "test/test_punchcard.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.24"])
-      s.add_runtime_dependency(%q<sass>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<gravtastic>, [">= 0"])
-      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"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 3.0.24"])
-      s.add_dependency(%q<sass>, [">= 3.0.0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_dependency(%q<gravtastic>, [">= 0"])
-      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"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 3.0.24"])
-    s.add_dependency(%q<sass>, [">= 3.0.0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-    s.add_dependency(%q<gravtastic>, [">= 0"])
-    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"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
+  s.rubyforge_project = "punchcard"
+  
+  s.add_dependency 'sinatra', "~> 1.1.0"
+  s.add_dependency 'haml', '~> 3.0.24'
+  s.add_dependency 'sass', '>= 3.0.0'
+  s.add_dependency 'activerecord', '~> 3.0.0'
+  s.add_dependency 'gravtastic', '~> 3.1.0'
+  s.add_dependency 'json', '~> 1.5.0'
+  s.add_development_dependency "shoulda", "2.10.3"
+  s.add_development_dependency "rack-test", ">= 0.5.6"
+  s.add_development_dependency 'sqlite3', '>= 0'
+  s.add_development_dependency 'timecop', '>= 0'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/helper.rb

@@ -1,15 +1,13 @@
 ENV['RACK_ENV'] = 'test'
 require 'rubygems'
-require 'bundler'
-Bundler.require
+require 'bundler/setup'
+require 'punchcard'
+
 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__))
-require 'punchcard'
+require 'json'
 
 # DB setup
 require 'logger'

data/test/test_punchcard.rb

@@ -1,5 +1,75 @@
 require 'helper'
 
 class TestPunchcard < Test::Unit::TestCase
-  # TODO
+  include Rack::Test::Methods
+
+  def app
+    Punchcard::App
+  end
+  
+  context "With 3 users set up" do
+    setup do
+      @people = ["Christoph", "Sebastian", "Andrea"].map {|name| Person.create!(:name => name, :email => name.downcase + '@example.com')}
+    end
+    
+    should "GET /" do
+      get '/'
+      assert last_response.ok?
+      assert last_response.body.include?('Punchcard')
+    end
+    
+    context "GET /status.json" do
+      setup { get '/status.json' }
+      should("respond with success") { assert last_response.ok? }
+
+      context "the JSON body" do
+        setup { @json = JSON.parse(last_response.body) }
+        should("be a Hash") { assert_equal Hash, @json.class }
+        should("have 3 people") { assert_equal 3, @json["people"].length }
+        should "have all ids, names and emails in people array" do
+          @people.each do |person|
+            assert @json["people"].any? {|p| p["name"] == person.name && p["email"] == person.email && p["_id"] == person.id }
+          end
+        end
+        
+        should "have all people punched out" do
+          assert @json["people"].all? {|p| @json["checked_in_at"] == nil }
+        end
+      end
+    end
+    
+    context "POST /punch/:id" do
+      setup do
+        post "/punch/#{@people.first.id}"
+      end
+      should("respond with success") { assert last_response.ok? }
+      should "include the person details in response as JSON" do
+        json = JSON.parse(last_response.body)
+        person = @people.first.reload
+        assert_equal person.name, json["name"]
+        assert_equal person.email, json["email"]
+        assert_equal person.id, json["_id"]
+        assert Time.xmlschema(json["checked_in_at"]) > 10.seconds.ago
+      end
+      
+      context "GET /status.json" do
+        setup { get '/status.json' }
+        should("respond with success") { assert last_response.ok? }
+
+        context "the JSON body" do
+          setup { @json = JSON.parse(last_response.body) }
+
+          should "have 1 person punched in" do
+            assert_equal 1, @json["people"].reject {|p| p["checked_in_at"] == nil}.count
+          end
+        end
+      end
+    end
+    
+    should "GET /css/screen.css" do
+      get '/css/screen.css'
+      assert last_response.ok?
+      assert last_response.body.include?('font-family')
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +01:00
+date: 2011-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,30 +23,32 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 24
+        version: 3.0.24
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: sass
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,17 +58,17 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 24
-        version: 3.0.24
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sass
+  name: activerecord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -76,7 +78,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: gravtastic
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -85,22 +87,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: gravtastic
+  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 5
         - 0
-        version: "0"
+        version: 1.5.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -159,37 +163,22 @@ 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
+email: 
+- christoph at olszowka de
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/db/migrate/01_create_people.rb
 - lib/db/migrate/02_create_punches.rb
 - lib/db/migrate/03_add_minutes_to_punches.rb
@@ -198,9 +187,11 @@ files:
 - lib/public/js/app.js
 - lib/public/js/jquery.timeago.js
 - lib/punchcard.rb
+- lib/punchcard/app.rb
 - lib/punchcard/person.rb
 - lib/punchcard/punch.rb
 - lib/punchcard/tasks.rb
+- lib/punchcard/version.rb
 - lib/views/index.haml
 - lib/views/layout.haml
 - lib/views/screen.sass
@@ -209,12 +200,12 @@ files:
 - test/test_database.rb
 - test/test_punchcard.rb
 has_rdoc: true
-homepage: http://github.com/colszowka/punchcard
+homepage: https://github.com/capita/punchcard
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -235,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: punchcard
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/Gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    punchcard (0.2.5)
-      activerecord (~> 3.0.0)
-      bson_ext
-      gravtastic
-      haml (>= 3.0.24)
-      sass (>= 3.0.0)
-      sinatra (>= 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    bson_ext (1.1.4)
-    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)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    sqlite3 (0.1.1)
-      ffi (>= 0.6.3)
-    tilt (1.1)
-    timecop (0.3.5)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0.0)
-  bson_ext
-  gravtastic
-  haml (>= 3.0.24)
-  jeweler
-  punchcard!
-  rack-test (>= 0.5.6)
-  sass (>= 3.0.0)
-  shoulda (= 2.10.3)
-  sinatra (>= 1.0.0)
-  sqlite3
-  timecop

data/VERSION

@@ -1 +0,0 @@
-0.2.9