qcourses 0.1.8 → 0.1.9

data/.autotest

@@ -1,5 +1,5 @@
 Autotest.add_hook(:initialize) { |at| 
-  at.add_exception %r{^\.git}
-  at.add_exception %r{^log}
+  at.add_exception %r{^\./\.git}
+  at.add_exception %r{^\./log}
   nil
 }

data/.rspec

@@ -1,2 +1 @@
 --color
---backtrace

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    qcourses (0.1.7)
+    qcourses (0.1.8)
       haml (~> 3.1.4)
+      pony (~> 1.4)
       sequel (~> 3.33.0)
-      sinatra (~> 1.2.6)
+      sinatra (~> 1.3)
       sqlite3 (~> 1.3.5)
 
 GEM
@@ -22,14 +23,27 @@ GEM
     childprocess (0.3.2)
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
+    email_spec (1.2.1)
+      mail (~> 2.2)
+      rspec (~> 2.0)
     ffi (1.0.11)
     haml (3.1.4)
+    i18n (0.6.0)
     libwebsocket (0.1.3)
       addressable
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.18)
     multi_json (1.3.2)
     nokogiri (1.5.2)
+    polyglot (0.3.3)
+    pony (1.4)
+      mail (> 2.0)
     rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rspec (2.9.0)
@@ -48,11 +62,17 @@ GEM
       multi_json (~> 1.0)
       rubyzip
     sequel (3.33.0)
-    sinatra (1.2.8)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    shotgun (0.9)
+      rack (>= 1.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     sqlite3 (1.3.6)
     tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -62,6 +82,8 @@ PLATFORMS
 DEPENDENCIES
   ZenTest
   capybara
+  email_spec
   qcourses!
   rack-test
   rspec (~> 2.8)
+  shotgun

data/lib/factories.rb

@@ -2,14 +2,14 @@ module Rubory
   def self.define(name, &definition)
     factories.define(name, &definition)
   end
-  def self.create(name)
+  def self.create(name, attribute_overrides = {})
     factories.create(name)
   end
-  def self.build(name)
-    factories.build(name)
+  def self.build(name, attribute_overrides = {})
+    factories.build(name, attribute_overrides)
   end
-  def self.attributes_for(name)
-    factories.attributes_for(name)
+  def self.attributes_for(name, attribute_overrides = {})
+    factories.attributes_for(name, attribute_overrides)
   end
   def self.use_default_module(default_module)
     factories.use_default_module(default_module)
@@ -31,16 +31,16 @@ module Rubory
     def define(name, &definition)
       factories[name] = CreationDsl.create_factory(name, self, &definition)
     end
-    def create(name)
-      object = build(name)
+    def create(name, attribute_overrides = {})
+      object = build(name, attribute_overrides)
       object.save
       object
     end
-    def build(name)
-      factory(name).build
+    def build(name, attribute_overrides={})
+      factory(name).build(attribute_overrides)
     end
-    def attributes_for(name)
-      object = build(name)
+    def attributes_for(name, attribute_overrides = {})
+      object = build(name, attribute_overrides)
       object.values || object.attributes || raise(NotSupportedException.new(":attributes_for is not supported as your model does not support :values or :attributes methods"))
     end
     def factory(name)
@@ -68,7 +68,7 @@ module Rubory
     end
     def self.create_factory(name,context, &definition)
       f = Factory.new(name, context)
-      new(f,context).instance_eval(&definition)
+      definition.call(new(f,context))
       return f
     end
     def method_missing(method, *args, &creation_block)
@@ -92,8 +92,8 @@ module Rubory
     def value_for(attribute, &block)
       @attributes[attribute] = block;
     end
-    def build
-      @context.create_instance class_name, Hash[ @attributes.to_a.collect{|attribute| [attribute[0], attribute[1].call(count)]} ]
+    def build(attribute_overrides)
+      @context.create_instance class_name, Hash[ attributes(attribute_overrides) ]
     end
     private
     def count
@@ -105,6 +105,14 @@ module Rubory
     def camelize(str)
       str.to_s.split("_").map {|w| w.capitalize}.join
     end
+    def attributes(attribute_overrides) 
+      @attributes.merge(attribute_overrides).to_a.map do |attribute| 
+        [attribute[0], attribute_value(attribute[1])]
+      end
+    end
+    def attribute_value(value)
+      value.is_a?(Proc) ? value.call(count) : value
+    end
   end
   class NoSuchFactoryException < Exception; end
   class NotSupportedException  < Exception; end

data/lib/qcourses.rb

@@ -17,6 +17,7 @@ module Qcourses
     require 'qcourses/date_ex'
     require 'qcourses/string_ex'
     require 'qcourses/models'
+    Postman.allow_delivery_failure if env == 'development'
   end
 end
 require 'qcourses/renderers'

data/lib/qcourses/controllers/base.rb

@@ -1,14 +1,33 @@
 require 'sinatra/base'
+require 'sinatra/showexceptions'
 require 'qcourses/resource_paths'
 require 'haml'
+
+
 module Qcourses
-  class BaseController < Sinatra::Application
+  class BaseController < Sinatra::Base
     include ResourcePaths
     include Configuration
     set :root, Proc.new { Qcourses.config.root }
     set :public_folder, File.expand_path('../../../public/', File.dirname(__FILE__))
     resource_admin_on '/admin'
 
+    configure :development do 
+      use Rack::Logger, ::Logger::DEBUG
+    end
+
+    configure :production do
+      use Rack::Logger, ::Logger::INFO
+    end
+
+    configure :test do
+      disable :logging
+    end
+
+    before do
+      logger.info request.path
+    end
+
     helpers do
       include ViewHelpers
       include Renderers

data/lib/qcourses/controllers/events_controller.rb

@@ -47,13 +47,12 @@ module Qcourses
     end
 
     put admin_request_url(:id) do
+      @event = Event.find(params[:id])
       begin
-        @event = Event.find(params[:id])
-        if @event.update event_params
-          redirect admin_request_url
-        else
-          haml :'events/edit', layout: :admin
-        end
+        @event.update event_params
+        redirect admin_request_url
+      rescue ValidationFailed
+        haml :'events/edit', layout: :admin
       rescue Exception => e
         haml :'trainings/error', locals: { message: e.message } 
       end
@@ -65,7 +64,7 @@ module Qcourses
     end
     def filter_event_params
       result = params[:event]
-      valid_parameters = ["course_id", "from", "to", "location"]
+      valid_parameters = ["course_id", "from", "to", "location", "max_participants"]
       if (result[:location_id] && result[:location_id] != '0')
         valid_parameters << "location_id"
         valid_parameters.delete 'location'

data/lib/qcourses/controllers/registrations_controller.rb

@@ -18,14 +18,17 @@ module Qcourses
 
 
       begin
+        registration = nil
         Registration.db.transaction do
           @company.save
           @employees.each do |employee|
             employee.company = @company
             employee.save
-            Registration.create(event: @event, employee:employee)
+            registration = Registration.create(event: @event, employee:employee)
           end
         end
+        Postman.deliver_registration_notification(RegistrationNotification.new(@employees.first, @event))
+        Postman.deliver_registration_confirmation(@employees.first.email, RegistrationNotification.new(@employees.first, @event))
         redirect "/registrations/success"
       rescue Sequel::ValidationFailed 
         haml :'/registrations/new', layout: :registration

data/lib/qcourses/models.rb

@@ -21,7 +21,7 @@ module Qcourses
 end
 
 Qcourses.create_connection
-
+require_relative 'models/postman'
 require_relative 'models/course_repository'
 require_relative 'models/course'
 require_relative 'models/location'

data/lib/qcourses/models/event.rb

@@ -3,7 +3,11 @@ module Qcourses
   class Event < Sequel::Model
     plugin :validation_helpers
     many_to_one :location
+    one_to_many :registrations
 
+    def initialize(attributes = {})
+      super({:open => true}.merge attributes)
+    end
     def self.opens(object_id)
       first{ ({id => object_id}) & (from > Time.now) }
     end
@@ -12,6 +16,10 @@ module Qcourses
       order(:from).filter { from > Time.now }
     end
 
+    def self.find(id)
+      self[id]
+    end
+
     def validate
       super
       validates_presence :from
@@ -31,6 +39,10 @@ module Qcourses
       course.name
     end
 
+    def open?
+      max_participants > registrations.size
+    end
+
     def subtitle
       return '' unless course
       course.subtitle

data/lib/qcourses/models/postman.rb

@@ -0,0 +1,50 @@
+require 'pony'
+module Qcourses
+
+  class RegistrationNotification
+    def initialize(employee, event)
+      @employee = employee
+      @event = event
+    end
+    def event_name
+      @event.name
+    end
+    def inspect
+      "RegistrationNotification(for: #{employee.name}, about: #{event.name})"
+    end
+    def ==(other)
+      return false unless other.is_a? RegistrationNotification
+      return other.employee.email == employee.email && other.event == event
+    end
+    protected
+    attr_reader :employee, :event
+  end
+
+  class Postman
+    FROM_ADDRESS = "info@qwan.it"
+    NOTIFICATION_ADDRESS = "info@qwan.it"
+    @@allow_delivery_failure = false
+    def self.allow_delivery_failure
+      @@allow_delivery_failure = true
+    end
+    def self.dont_allow_delivery_failure
+      @@allow_delivery_failure = false
+    end
+    def self.deliver_registration_notification(registration_confirmation)
+      deliver(from: FROM_ADDRESS, to: NOTIFICATION_ADDRESS,
+               subject: "Course Registration for #{registration_confirmation.event_name}")
+    end
+    def self.deliver_registration_confirmation(addressee, registration_confirmation)
+      deliver(from: FROM_ADDRESS,
+                to: addressee, 
+                subject: "Thank you for your registration for #{registration_confirmation.event_name}")
+    end
+    def self.deliver(options)
+      begin
+      Pony.mail(options)
+      rescue Exception => e
+        raise e unless @@allow_delivery_failure
+      end
+    end
+  end
+end

data/lib/qcourses/qcourses.rake.rb

@@ -6,7 +6,6 @@ end
 
 desc "project environment"
 task :environment do
-  p "setting environment"
   ENV['RACK_ENV'] ||= 'development'
 end
 

data/lib/qcourses/version.rb

@@ -1,3 +1,3 @@
 module Qcourses
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/qcourses/view_helpers.rb

@@ -4,7 +4,7 @@ module Qcourses
       return '' unless options
       options.collect do |option| 
         tag_attributes = {:value => option[0]}
-        tag_attributes[:selected] = "selected" if value == option[0]
+        tag_attributes[:selected] = "selected" if value.to_s == option[0].to_s
         haml "%option#{tag_attributes.inspect} #{option[1]}", :layout => false
       end.join
     end
@@ -32,7 +32,7 @@ module Qcourses
     end
 
     def event_registration_link(event)
-      return "closed" unless event.open
+      return "closed" unless event.open?
       haml "%a{ :href=> url('/registrations/new/#{event.id}') } register"
     end
 

data/qcourses.gemspec

@@ -20,13 +20,16 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "sinatra", "~> 1.2.6"
+  s.add_runtime_dependency "sinatra", "~> 1.3"
   s.add_runtime_dependency "haml", "~> 3.1.4"
   s.add_runtime_dependency "sequel", "~> 3.33.0"
   s.add_runtime_dependency "sqlite3", "~> 1.3.5"
+  s.add_runtime_dependency "pony", "~> 1.4"
 
   s.add_development_dependency "rspec", "~> 2.8"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "ZenTest"
   s.add_development_dependency "capybara"
+  s.add_development_dependency "shotgun"
+  s.add_development_dependency "email_spec"
 end

data/spec/factories_spec.rb

@@ -18,9 +18,9 @@ module Rubory
     let(:factories) { Factories.new("Rubory") }
 
     before do
-      factories.define(:person) do
-        name "name"
-        email { "email" }
+      factories.define(:person) do |f|
+        f.name "name"
+        f.email { "email" }
       end
     end
 
@@ -34,14 +34,26 @@ module Rubory
           person = factories.build(:person)
           person.email.should == 'email'
         end
+        it "can override attributes" do
+          person = factories.build(:person, :name => "overridden name")
+          person.name.should == 'overridden name'
+        end
+        it "can override attributes with string key" do
+          person = factories.build(:person, "name" => "overridden name")
+          person.name.should == 'overridden name'
+        end
+        it "can specify an attribute  missing in the factory definition" do
+          person = factories.build(:person, sirname: "sirname") 
+          person.sirname.should == 'sirname'
+        end
         it "throws no such factory if factory does not exist" do
           expect { factories.build(:bogus) }.to raise_exception Rubory::NoSuchFactoryException
         end
       end
       context "when attribute has n as block param" do
         it "generates a unique object" do
-          factories.define(:person) do
-            name {|n| "name_#{n}" }
+          factories.define(:person) do |f|
+            f.name {|n| "name_#{n}" }
           end
           factories.build(:person).name.should == "name_1"
           factories.build(:person).name.should == "name_2"
@@ -49,9 +61,9 @@ module Rubory
       end
       context "when an object has dependencies" do
         before do
-          factories.define(:address) do
-            city "city"
-            associate :person
+          factories.define(:address) do |f|
+            f.city "city"
+            f.associate :person
           end
         end
         let(:address) { factories.build :address } 
@@ -64,6 +76,16 @@ module Rubory
           address.person.should be_saved
         end
       end
+      describe "attribute" do
+        it "of type boolean supported" do
+          factories.define(:person) { |f| f.male true }
+          factories.build(:person).male.should be_true
+        end
+        it "with name open supported" do
+          factories.define(:person) { |f| f.open {true} }
+          factories.build(:person).open.should be_true
+        end
+      end
       context "when the module is overridden" do
         before do
           factories.use_default_module "MyModule"
@@ -90,6 +112,11 @@ module Rubory
         person = factories.create(:person)
         person.should be_saved
       end
+      it "can override params" do
+        person = factories.create(:person, :name => "overridden")
+        person.should be_saved
+        person.name.should == "overridden"
+      end
     end
 
     describe "valid attributes" do
@@ -100,12 +127,18 @@ module Rubory
           end
         end
         it "returns the attributes from the definition" do
-          factories.define :sequel_person do
-            name "name"
+          factories.define :sequel_person do |f|
+            f.name "name"
           end
           factories.attributes_for(:sequel_person).should == {:name => 'name'}
         end
 
+        it "returns the attributes from the definition" do
+          factories.define :sequel_person do |f|
+            f.name "name"
+          end
+          factories.attributes_for(:sequel_person, :name => 'overridden').should == {:name => 'overridden'}
+        end
       end
       context "object responds to :attributes" do
         class ArPerson < Model
@@ -114,8 +147,8 @@ module Rubory
           end
         end
         it "returns the attributes from the definition" do
-          factories.define :ar_person do
-            name "name"
+          factories.define :ar_person do |f|
+            f.name "name"
           end
           factories.attributes_for(:ar_person).should == {:name => 'name'}
         end

data/spec/qcourses/controllers/courses_controller_spec.rb

@@ -13,6 +13,7 @@ module Qcourses
     describe "get trainings" do 
 
       context "when no repository contigured" do
+        before(:each) { CourseRepository.configure nil } 
         it "shows error" do
           get url
           last_response.should be_ok
@@ -21,8 +22,7 @@ module Qcourses
       end
 
       context "when repository configured" do
-        let!(:courses) { CourseRepository.in_memory }
-
+        attr_reader :courses
         it "shows the list of trainings" do
           courses.create_course identification: 'training1', name: 'training 1'
           courses.create_course identification: 'training2', name: 'training 2'

data/spec/qcourses/controllers/events_controller_spec.rb

@@ -4,8 +4,8 @@ require 'capybara/rspec'
 module Qcourses 
 
   describe EventsController, :type => :request do
+    attr_reader :courses
     let(:app) { Capybara.app = EventsController } 
-    let!(:courses) { CourseRepository.in_memory }
 
     shared_examples_for "an_event_lister" do
       context "when course repository not configured" do
@@ -22,7 +22,7 @@ module Qcourses
         let!(:course1) { courses.create_course identification: 'agile_engineering', name: 'Agile Engineering' }
 
         describe "get '/events'" do
-          context "when events available" do
+          context "when events planned" do
             let!(:planned) { Event.create(course_id: 'agile_engineering', from: Date.tomorrow, to: Date.tomorrow, :location => "Tilburg") }
             it "renders events" do
               get url
@@ -69,12 +69,11 @@ module Qcourses
 
     describe 'get admin edit' do 
       let!(:course1) { courses.create_course identification: 'agile_engineering', name: 'Agile Engineering' }
-      let (:event) { Rubory.create :event }
-      let (:url) { "/admin/events/edit/#{event.id}" }
+      let!(:event) { Rubory.create :event }
 
       it "should render a form" do
         event.update :course_id => course1.identification
-        get url
+        get "/admin/events/edit/#{event.id}"
         last_response.should be_ok
         last_body.should have_selector("form#events[@method='post']")
         last_body.find("form#events")['action'].should match("/admin/events/#{event.id}")
@@ -83,12 +82,18 @@ module Qcourses
         last_body.should have_selector("form#events input[@name='event[to]'][@value='#{event.to.strftime("%d-%m-%Y")}']")
         last_body.should have_selector("form#events select[@name='event[course_id]'] option[@value='#{event.course_id}']")
       end
+      it "should renders a form for the correct event" do
+        event = Rubory.create :event
+        event.update :course_id => course1.identification
+        get "/admin/events/edit/#{event.id}"
+        last_body.find("form#events")['action'].should match("/admin/events/#{event.id}")
+      end
     end
 
     describe 'post admin' do 
       let (:url) { '/admin/events' }
       let (:last_body) { last_response.body }
-      let (:event_parameters) { {from: Date.a_month_from_now.as_date_string, to: Date.a_month_from_now.as_date_string, location: 'Tilburg' } }
+      let (:event_parameters) { Rubory.attributes_for(:event) } 
 
       context "on valid parameters" do
         it "should create an event" do
@@ -116,15 +121,16 @@ module Qcourses
 
     describe 'put admin' do 
       let!(:course1) { courses.create_course identification: 'agile_engineering', name: 'Agile Engineering' }
-      let (:event) { Rubory.create :event }
+      let!(:event) { Rubory.create :event }
       let (:url) { "/admin/events/#{event.id}" }
-      let (:event_parameters) { {from: Date.a_month_from_now.as_date_string, to: Date.a_month_from_now.as_date_string, location: 'Tilburg' } }
+      let (:event_parameters) { Rubory.attributes_for(:event).merge(:max_participants => 1) } 
 
       context "on valid parameters" do
-        it "should create an event" do
+        it "should update the event" do
           expect { 
             put url, event: event_parameters
-          }.to change {Event.count}.from(0).to(1)
+          }.not_to change {Event.count}
+          event.reload.max_participants.should == 1
         end
 
         it "should redirect back to list"  do

data/spec/qcourses/controllers/registrations_controller_spec.rb

@@ -4,9 +4,9 @@ module Qcourses
 
   describe RegistrationsController, :type => :request do
     include Sinatra::Helpers
+    attr_reader :courses
     let(:app) { Capybara.app = RegistrationsController } 
     let(:event) { Rubory.create :event }
-    let!(:courses) { CourseRepository.in_memory }
 
     describe 'get new' do
       def get_url(id)
@@ -52,6 +52,7 @@ module Qcourses
         end
         it "creates a registration" do
           expect { post post_url(event.id), valid_registration }.to change { Registration.count }.by(1)
+          Registration.order(:id).last.event.should == event
         end
         it "creates a company" do
           expect { post post_url(event.id), valid_registration }.to change { Company.count }.by(1)
@@ -59,11 +60,17 @@ module Qcourses
         it "creates an employee" do
           expect { post post_url(event.id), valid_registration }.to change { Employee.count }.by(1)
         end
+        it "sends a confirmation to emloyee" do
+          Postman.should_receive(:deliver_registration_notification).with(RegistrationNotification.new(Employee.new(valid_participant), event)) 
+          Postman.should_receive(:deliver_registration_confirmation).with(valid_participant[:email], RegistrationNotification.new(Employee.new(valid_participant), event)) 
+          post post_url(event.id), valid_registration
+        end
         context "with more employees" do
           let!(:another_participant) { Rubory.attributes_for :employee }
           let(:participants) { [valid_participant, another_participant] }
           it "creates more registrations" do
             expect { post post_url(event.id), valid_registration }.to change { Registration.count }.by(2)
+            Registration.order(:id).last.event.should == event
           end
           it "creates a company" do
             expect { post post_url(event.id), valid_registration }.to change { Company.count }.by(1)

data/spec/qcourses/models/course_repository_spec.rb

@@ -39,6 +39,7 @@ module Qcourses
 
     describe 'class methods' do
       it "can't be used when not configured yet" do
+        CourseRepository.configure nil
         expect { CourseRepository.all }.to raise_exception CourseRepository::Error
       end
     end

data/spec/qcourses/models/event_spec.rb

@@ -23,16 +23,32 @@ module Qcourses
       end
     end
 
+    describe "querying" do
+      context "on id" do 
+        it "returns the event if it exists" do
+          existing = Rubory.create :event
+          Event.find(existing.id).should == existing
+        end
+      end
+    end
+
     describe "attributes" do
 
-      let(:subject) {Event.new(course_id: 'ae', from: "10-04-2012", to: "12-04-2012") }
+      let(:event_attributes) { Rubory.attributes_for :event, course_id: 'ae', location_id: nil }
+      let(:subject) { Event.new event_attributes }
       its(:from) { should be_a(Time) }
-      its(:from) { should == Time.parse("10-04-2012") }
+      its(:from) { should == event_attributes[:from]  }
       its(:to) { should be_a(Time) }
+      its(:open?) { should be_true } 
+      its(:registrations) { should be_empty }
 
+      context "when no more participants allowed" do
+        before { subject.max_participants = 0 }
+        its(:open?) { should be_false } 
+      end
 
       describe "from course" do
-        let(:course_repository) { CourseRepository.in_memory }
+        let(:course_repository) { @courses } 
         let!(:course) { course_repository.create_course :identification => 'ae', :name => "AE", :subtitle => 'learn ae' }
         its(:name) { should == course.name }
         its(:subtitle) { should == course.subtitle }
@@ -44,6 +60,7 @@ module Qcourses
         end
       end
 
+
       describe 'location' do
         it "is converted to a location object" do
           subject.location = "Tilburg" 

data/spec/qcourses/models/postman_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module Qcourses
+  describe Postman do
+    before { deliveries.clear }
+
+    let(:employee) { Rubory.build(:employee) }
+    let(:event) { Rubory.build(:event) }
+
+    shared_examples_for "a_problematic_delivery" do 
+      it "throws an exception if pony throws one" do
+        Pony.stub(:mail).and_raise "some exception"
+        expect { 
+          delivery
+        }.to raise_exception RuntimeError
+      end
+      it "swallows exception if set to do so" do
+        Postman.allow_delivery_failure
+        Pony.stub(:mail).and_raise "some exception"
+        expect { 
+          delivery
+        }.to_not raise_exception
+        Postman.dont_allow_delivery_failure
+      end
+    end
+
+    describe "registration confirmation" do
+
+      subject do
+        Postman.deliver_registration_confirmation("rob@blah.nl", RegistrationNotification.new(employee, event))
+        deliveries.last
+      end
+
+      it { should deliver_to("rob@blah.nl") }
+      it { should deliver_from("info@qwan.it") }
+      it { should have_subject(/Thank you.*registration.*#{event.name}/) }
+
+      it_should_behave_like "a_problematic_delivery" do
+        let(:delivery) { subject }
+      end
+    end
+
+    describe "registration notification" do
+
+      subject do
+        Postman.deliver_registration_notification(RegistrationNotification.new(employee, event))
+        deliveries.last
+      end
+
+      it { should deliver_to(Postman::NOTIFICATION_ADDRESS) }
+      it { should deliver_from(Postman::FROM_ADDRESS) }
+      it { should have_subject(/Registration.*#{event.name}/) }
+
+      it_should_behave_like "a_problematic_delivery" do
+        let(:delivery) { subject }
+      end
+
+    end
+
+  end
+end
+

data/spec/qcourses/models/registration_spec.rb

@@ -13,8 +13,14 @@ module Qcourses
         reloaded.should == subject
       end
 
+      it "adds the registration to the event" do
+        subject.save
+        event.registrations.should include(subject)
+      end
+
       it { should reject_values(nil).for(:employee) }
       it { should reject_values(nil).for(:event) }
+
     end
   end
 

data/spec/qcourses/view_helpers_spec.rb

@@ -101,13 +101,19 @@ module Qcourses
           html_for(select_for(:employee, :company_id)).should have_selector("select[name='employee[company_id]']")
           html_for(select_for(@employee, :company_id)).should have_selector("select[name='employee[company_id]']")
         end
-        it 'creates a options' do
+        it 'creates options' do
           options = [["99", "Other Company"]]
           options << [@employee.company_id.to_s, "Company"]
           html_for(select_for(:employee, :company_id, options)).should have_selector("select[name='employee[company_id]'] option[value='99']", :text => "Other Company")
           html_for(select_for(:employee, :company_id, options)).should have_selector("select[name='employee[company_id]'] option[value='#{@employee.company_id}'][selected='selected']", :text => "Company")
         end
-        it 'can have a class and or id ' do
+        it 'accepts integers for option values' do
+          options = [[99, "Other Company"]]
+          options << [@employee.company_id, "Company"]
+          html_for(select_for(:employee, :company_id, options)).should have_selector("select[name='employee[company_id]'] option[value='99']", :text => "Other Company")
+          html_for(select_for(:employee, :company_id, options)).should have_selector("select[name='employee[company_id]'] option[value='#{@employee.company_id}'][selected='selected']", :text => "Company")
+        end
+        it 'can have a class and or id' do
           html_for(select_for(:employee, :company_id, nil, :class => 'short')).should have_selector("select[name='employee[company_id]'][class='short']")
           html_for(select_for(:employee, :company_id, nil, :id => 'my_id')).should have_selector("select#my_id")
         end
@@ -119,7 +125,7 @@ module Qcourses
       end
     end
 
-    describe "event_registration_link", :focus => true do
+    describe "event_registration_link" do
       def html_for(result)
         Capybara.string(result)
       end
@@ -128,11 +134,11 @@ module Qcourses
       end
       let(:event) { Rubory.build :event }
       it "contains a registration link" do
-        p event
-        html_for(event_registration_link(event)).should have_selector("a[href='/registrations/new/#{event.id}']")
+        result = html_for(event_registration_link(event))
+        result.should have_selector("a[href='/registrations/new/#{event.id}']")
       end
       it "contains no registration link if event is closed" do
-        event.open = false
+        event.stub :open? => false
         html_for(event_registration_link(event)).should_not have_selector("a[href='/registrations/new/#{event.id}']")
         html_for(event_registration_link(event)).should have_content("closed")
       end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require 'rspec'
 require 'qcourses'
 require 'rack/test'
 require 'capybara'
+require 'pony'
+require 'email_spec'
 
 Qcourses.configure do |config| 
   config.root = File.expand_path('..',File.dirname(__FILE__))
@@ -24,6 +26,7 @@ class RSpec::Core::ExampleGroup
     super
     subclass.around do |example|
       Qcourses::CourseRepository.destroy
+
       Sequel::Model.db.transaction(:rollback=>:always){example.call}
     end
   end
@@ -32,7 +35,10 @@ end
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include TestFiles
+  config.include EmailSpec::Matchers
+  config.include EmailSpec::Helpers
   config.filter_run_excluding :broken => true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
+  config.before(:each) { @courses = Qcourses::CourseRepository.in_memory } 
 end

data/spec/support/factories.rb

@@ -2,23 +2,25 @@ require 'factories'
 require 'qcourses/date_ex'
 Rubory.use_default_module('Qcourses')
 
-Rubory.define(:company) do
-  name { |n| "company_#{n}" }
-  contact_person "some contact"
-  contact_email { |n| "contact_#{n}@email.com" }
-  invoice_address "some address"
-  postal_code "1234 AA"
-  city "Amsterdam"
+Rubory.define(:company) do |f|
+  f.name { |n| "company_#{n}" }
+  f.contact_person "some contact"
+  f.contact_email { |n| "contact_#{n}@email.com" }
+  f.invoice_address "some address"
+  f.postal_code "1234 AA"
+  f.city "Amsterdam"
 end
 
-Rubory.define(:employee) do
-  name "some employee"
-  email { |n| "email_#{n}@qwan.it" }
-  associate :company
+Rubory.define(:employee) do |f|
+  f.name "some employee"
+  f.email { |n| "email_#{n}@qwan.it" }
+  f.associate :company
 end
 
-Rubory.define(:event) do
-  from { Date.tomorrow }
-  to { Date.tomorrow.tomorrow }
-  location "Tilburg"
+Rubory.define(:event) do |f|
+  f.from { Date.tomorrow }
+  f.to { Date.tomorrow.tomorrow }
+  f.open true
+  f.max_participants 14
+  f.location "Tilburg"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qcourses
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: pony
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: email_spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Small course event moduel for qinatra site - added as middleware
 email:
 - rob@gqwan.it
@@ -179,6 +227,7 @@ files:
 - lib/qcourses/models/course_repository.rb
 - lib/qcourses/models/event.rb
 - lib/qcourses/models/location.rb
+- lib/qcourses/models/postman.rb
 - lib/qcourses/models/registration.rb
 - lib/qcourses/qcourses.rake.rb
 - lib/qcourses/renderers.rb
@@ -201,6 +250,7 @@ files:
 - spec/qcourses/models/course_repository_spec.rb
 - spec/qcourses/models/event_spec.rb
 - spec/qcourses/models/location_spec.rb
+- spec/qcourses/models/postman_spec.rb
 - spec/qcourses/models/registration_spec.rb
 - spec/qcourses/renderers_spec.rb
 - spec/qcourses/string_ex_spec.rb