qcourses 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/db/migrations/003_add_closed_state_and_max_participants_to_event.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+  up do
+    alter_table(:events) do
+      add_column :open, :boolean, default: true
+      add_column :max_participants, :integer, default: 14
+      add_index :open
+    end
+  end
+  down do
+    alter_table(:events) do
+      drop_column :max_participants
+      drop_column :open
+    end
+  end
+end

data/lib/qcourses/configuration.rb

@@ -15,6 +15,9 @@ module Qcourses
         raise Error.new("please configure root first") if @root.nil?
         @root
       end
+      def file(path)
+        File.expand_path(path, root)
+      end
     end
     def self.new
       Instance.new

data/lib/qcourses/controllers/events_controller.rb

@@ -5,7 +5,7 @@ module Qcourses
     get request_url do
       begin
         CourseRepository.all
-        @events = Event.all
+        @events = Event.planned
         haml :'events/index', layout: false
       rescue Exception => e
         haml :'trainings/error', locals: { message: e.message } 
@@ -15,8 +15,8 @@ module Qcourses
     get admin_request_url do
       begin
         CourseRepository.all
-        @events = Event.all
-        haml :'events/index', layout: :admin
+        @events = Event.order(:from)
+        haml :'events/admin_index', layout: :admin
       rescue Exception => e
         haml :'trainings/error', locals: { message: e.message } 
       end
@@ -25,7 +25,7 @@ module Qcourses
     get admin_new_request_url do
       begin
         @event = Event.new
-        @events = Event.all
+        @events = Event.order(:from)
         haml :'events/new', layout: :admin
       rescue Exception => e
         haml :'trainings/error', locals: { message: e.message } 
@@ -45,6 +45,19 @@ module Qcourses
       @event = Event.create(event_params)
       redirect admin_new_request_url
     end
+
+    put admin_request_url(:id) do
+      begin
+        @event = Event.find(params[:id])
+        if @event.update event_params
+          redirect admin_request_url
+        else
+          haml :'events/edit', layout: :admin
+        end
+      rescue Exception => e
+        haml :'trainings/error', locals: { message: e.message } 
+      end
+    end
     
     private 
     def event_params

data/lib/qcourses/models/event.rb

@@ -8,6 +8,10 @@ module Qcourses
       first{ ({id => object_id}) & (from > Time.now) }
     end
 
+    def self.planned
+      order(:from).filter { from > Time.now }
+    end
+
     def validate
       super
       validates_presence :from

data/lib/qcourses/models.rb

@@ -1,7 +1,7 @@
 require 'sequel'
 require 'sequel/extensions/migration'
 require 'yaml'
-
+require 'logger'
 module Qcourses
   def self.db
     @@db ||= create_connection 
@@ -9,6 +9,7 @@ module Qcourses
   def self.create_connection(environment = Qcourses.env)
     environment = environment.to_s
     connection = Sequel.connect(YAML::load(File.read(File.join(config.root, 'config', 'database.yml')))[environment])
+    connection.logger = Logger.new(Qcourses.log_file())
     schema_definition.apply(connection, :up) if environment == 'test'
     connection
   end

data/lib/qcourses/resource_paths.rb

@@ -22,8 +22,8 @@ module Qcourses
       def edit_request_url(param = nil)
         [basepath,'edit', param_symbol(param)].compact.join('/')
       end
-      def admin_request_url
-        adminprefix + request_url
+      def admin_request_url(param = nil)
+        adminprefix + request_url(param)
       end
       def admin_new_request_url
         adminprefix + new_request_url

data/lib/qcourses/view_helpers.rb

@@ -44,6 +44,7 @@ module Qcourses
       tag_classes << 'error' if object.errors.on(attribute_name)
       tag_classes << klass if klass
       tag_attributes[:class] = tag_classes.join(' ') unless tag_classes.empty?
+      tag_attributes.merge! options
       result = haml("%input#{tag_attributes.inspect}")
       result += haml("%span{:class => 'error'} #{object.errors.on(attribute_name).first}" ) if object.errors.on(attribute_name) && !suppress_error_messages
       result
@@ -52,12 +53,14 @@ module Qcourses
     def textarea_for(object, attribute_name, options={})
       object = instance_variable_get("@#{object}") if object.is_a?(Symbol)
       return '' unless object
+      klass = options.delete :class
       tag_attributes = {:name => input_name(object, attribute_name, options[:array_element])}
       value = object.send(attribute_name) || ''
       tag_classes = []
       tag_classes << 'error' if object.errors.on(attribute_name)
-      tag_classes << options[:class] if options[:class]
+      tag_classes << klass if klass
       tag_attributes[:class] = tag_classes.join(' ') unless tag_classes.empty?
+      tag_attributes.merge! options
       "<textarea #{text_hash(tag_attributes)}>#{value}</textarea>"
     end
 
@@ -71,7 +74,7 @@ module Qcourses
       tag_classes << klass if klass
       tag_attributes = {:name => input_name(object, attribute_name, array_element)}
       tag_attributes[:class] = tag_classes.join(' ') unless tag_classes.empty?
-
+      tag_attributes.merge! options
       %Q{<select #{text_hash(tag_attributes)}>
           #{options_for_select(opts_for_select, object.send(attribute_name).to_s)}
          </select>}

data/lib/qcourses.rb

@@ -6,6 +6,9 @@ module Qcourses
   def self.config
     @@config
   end
+  def self.log_file
+    config.file("log/#{env}.log")
+  end
   def self.configure(&configuration_block)
     @@config = Configuration.instance
     @@config.local_root = File.expand_path('..', File.dirname(__FILE__))

data/spec/qcourses/controllers/events_controller_spec.rb

@@ -76,8 +76,9 @@ module Qcourses
         event.update :course_id => course1.identification
         get url
         last_response.should be_ok
-        last_body.should have_selector("form#events[@method='put']")
+        last_body.should have_selector("form#events[@method='post']")
         last_body.find("form#events")['action'].should match("/admin/events/#{event.id}")
+        last_body.should have_selector("form#events input[@type='hidden'][@name='_method'][@value='put']")
         last_body.should have_selector("form#events input[@name='event[from]'][@value='#{event.from.strftime("%d-%m-%Y")}']")
         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}']")
@@ -113,6 +114,36 @@ module Qcourses
       end
     end
 
+    describe 'put admin' do 
+      let!(:course1) { courses.create_course identification: 'agile_engineering', name: 'Agile Engineering' }
+      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' } }
+
+      context "on valid parameters" do
+        it "should create an event" do
+          expect { 
+            put url, event: event_parameters
+          }.to change {Event.count}.from(0).to(1)
+        end
+
+        it "should redirect back to list"  do
+          put url, event: event_parameters
+          last_response.should be_redirect
+          follow_redirect!
+          last_request.url.should include('/admin/events')
+        end
+
+        it "uses an existing location when location id is not '0'" do
+          location = Location.create(name:"Tilburg")
+          event_parameters[:location_id] = location.id.to_s
+          event_parameters[:location] = ''
+          put url, event: event_parameters
+          Event.order(:id).last.location.should == location
+        end
+
+      end
+    end
   end
 
 end

data/spec/qcourses/view_helpers_spec.rb

@@ -105,8 +105,9 @@ module Qcourses
           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' do
+        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
       end
       describe "on an array object" do

data/views/events/admin_index.haml

@@ -0,0 +1,4 @@
+%h2 Events
+%h3 
+  %a{:href => "#{url "/admin/events/new"}"} plan new events
+= haml :'/events/admin_list', :layout => false

data/views/events/admin_list.haml

@@ -0,0 +1,21 @@
+%section.list
+  -if @events.empty?
+    .events no events planned
+  - else
+    .events
+      - @events.each do |event|
+        %div(id="event_#{event.id}" class='event')
+          .event_name 
+            = event.name
+          .event_subtitle 
+            = event.subtitle
+          .event_registration
+            %a{ :href=> url("/admin/events/edit/#{event.id}") } edit
+            %br
+            %a{ :href=> url("/admin/events/participants/#{event.id}") } participants
+          .event_date_location
+            = human_period event.from, event.to 
+            %br
+            = event.location_name
+          .clear
+

data/views/events/edit.haml

@@ -1,5 +1,7 @@
+%h2 Edit event
 %section.form
-  %form(id='events' action= "#{url admin_request_url}/#{@event.id}" method ='put')
+  %form(id='events' action= "#{url admin_request_url}/#{@event.id}" method ='post')
+    %input(type="hidden" name="_method" value="put")
     .label
       %label(for="event[course_id]") Course:
     .input 
@@ -12,11 +14,15 @@
       %label(for="event[to]") To:
     .input
       = input_for :event, :to, :time_format => "%d-%m-%Y", :class => "date"
+    .label
+      %label(for="event[max_participants]") Max participants:
+    .input
+      = input_for :event, :max_participants
     #location_selector{ :style => display_if_locations  }
       .label
         %label(for="event[location_id]") Where
       .input 
-        = select_for :event, :location_id, location_options
+        = select_for :event, :location_id, location_options, :id => :event_location
     #location_name{ :style => display_unless_locations }
       .label
         %label(for="event[location]") New location name
@@ -25,6 +31,6 @@
 
     .label
     .input
-      %input{:type => "submit", :value => "plan event" }
+      %input{:type => "submit", :value => "update event" }
     %span.clear
 

data/views/events/new.haml

@@ -1,11 +1,10 @@
-
+%h2 Planning events
 %section.form
   %form(id='events' action= "#{admin_request_url}" method ='post')
     .label
       %label(for="event[course_id]") Course:
     .input 
-      %select{:name => "event[course_id]"}
-        = course_options
+      = select_for :event, :course_id, course_options
     .label
       %label(for="event[from]") From:
     .input 
@@ -14,12 +13,15 @@
       %label(for="event[to]") To:
     .input
       %input{:type => "text", :name => "event[to]", :class => "date"}
+    .label
+      %label(for="event[max_participants]") Max participants:
+    .input
+      = input_for :event, :max_participants
     #location_selector{ :style => display_if_locations  }
       .label
         %label(for="event[location_id]") Where
       .input 
-        %select#event_location{:name => "event[location_id]"}
-          = location_options
+        = select_for :event, :location_id, location_options, :id => :event_location
     #location_name{ :style => display_unless_locations }
       .label
         %label(for="event[location]") New location name
@@ -31,4 +33,4 @@
       %input{:type => "submit", :value => "plan event" }
     %span.clear
 
-= haml :'/events/index', :layout => false
+= haml :'/events/admin_list', :layout => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qcourses
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -239,6 +239,7 @@ files:
 - config.ru
 - db/migrations/001_initial_database.rb
 - db/migrations/002_create_registrations.rb
+- db/migrations/003_add_closed_state_and_max_participants_to_event.rb
 - demo_app.rb
 - lib/factories.rb
 - lib/qcourses.rb
@@ -284,6 +285,8 @@ files:
 - spec/support/request_specs.rb
 - spec/support/test_files.rb
 - views/admin.haml
+- views/events/admin_index.haml
+- views/events/admin_list.haml
 - views/events/edit.haml
 - views/events/index.haml
 - views/events/new.haml
@@ -329,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 342118163
+      hash: 12649459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: