From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-351095-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QTK5i-00070A-5y
for garchives@archives.gentoo.org; Sun, 05 Jun 2011 20:38:34 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C72811C0B8;
Sun, 5 Jun 2011 20:37:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 785F31C0AE
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jun 2011 20:37:55 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EAB042AC02B
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jun 2011 20:37:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 282D58003E
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jun 2011 20:37:54 +0000 (UTC)
From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" <betelgeuse@gentoo.org>
Message-ID: <00e319d4e4eec352830d88eb52f90aa6c14d3188.betelgeuse@gentoo>
Subject: [gentoo-commits] proj/council-webapp:master commit in: site/app/views/taglibs/, site/features/support/, site/features/, ...
X-VCS-Repository: proj/council-webapp
X-VCS-Files: site/app/models/agenda.rb site/app/models/guest.rb site/app/models/user.rb site/app/viewhints/agenda_hints.rb site/app/views/taglibs/application.dryml site/app/views/taglibs/cards.dryml site/app/views/users/show.dryml site/features/proxies.feature site/features/step_definitions/proxies_steps.rb site/features/step_definitions/within_steps.rb site/features/support/factories.rb site/features/support/paths.rb
X-VCS-Directories: site/app/views/taglibs/ site/features/support/ site/features/ site/app/models/ site/app/views/users/ site/features/step_definitions/ site/app/viewhints/
X-VCS-Committer: betelgeuse
X-VCS-Committer-Name: Petteri Räty
X-VCS-Revision: 00e319d4e4eec352830d88eb52f90aa6c14d3188
Date: Sun, 5 Jun 2011 20:37:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: b6f27e97717bf9296ae34510dae44483
commit: 00e319d4e4eec352830d88eb52f90aa6c14d3188
Author: Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com=
>
AuthorDate: Tue May 31 13:23:50 2011 +0000
Commit: Petteri R=C3=A4ty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 17:36:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap=
p.git;a=3Dcommit;h=3D00e319d4
Manage proxies with web app
---
site/app/models/agenda.rb | 1 +
site/app/models/guest.rb | 3 ++
site/app/models/user.rb | 7 ++++
site/app/viewhints/agenda_hints.rb | 2 +-
site/app/views/taglibs/application.dryml | 1 +
site/app/views/taglibs/cards.dryml | 8 ++++
site/app/views/users/show.dryml | 10 +++++
site/features/proxies.feature | 43 +++++++++++++++++=
++++++
site/features/step_definitions/proxies_steps.rb | 28 +++++++++++++++
site/features/step_definitions/within_steps.rb | 1 +
site/features/support/factories.rb | 2 +
site/features/support/paths.rb | 6 +++-
12 files changed, 110 insertions(+), 2 deletions(-)
diff --git a/site/app/models/agenda.rb b/site/app/models/agenda.rb
index 44386e3..f1224ff 100644
--- a/site/app/models/agenda.rb
+++ b/site/app/models/agenda.rb
@@ -9,6 +9,7 @@ class Agenda < ActiveRecord::Base
=20
has_many :agenda_items
has_many :participations
+ has_many :proxies
=20
lifecycle do
state :open, :default =3D> true
diff --git a/site/app/models/guest.rb b/site/app/models/guest.rb
index cce1de4..a6b93d5 100644
--- a/site/app/models/guest.rb
+++ b/site/app/models/guest.rb
@@ -8,4 +8,7 @@ class Guest < Hobo::Model::Guest
false
end
=20
+ def can_appoint_a_proxy?
+ false
+ end
end
diff --git a/site/app/models/user.rb b/site/app/models/user.rb
index 738165e..0cb75b4 100644
--- a/site/app/models/user.rb
+++ b/site/app/models/user.rb
@@ -52,4 +52,11 @@ class User < ActiveRecord::Base
def view_permitted?(field)
true
end
+
+ def can_appoint_a_proxy?(user)
+ return false unless council_member?
+ return false if user.council_member?
+ return false unless Proxy.council_member_is(self).agenda_is(Agenda.c=
urrent).count =3D=3D 0
+ true
+ end
end
diff --git a/site/app/viewhints/agenda_hints.rb b/site/app/viewhints/agen=
da_hints.rb
index 46daf34..93635b5 100644
--- a/site/app/viewhints/agenda_hints.rb
+++ b/site/app/viewhints/agenda_hints.rb
@@ -1,5 +1,5 @@
class AgendaHints < Hobo::ViewHints
=20
- children :agenda_items, :participations
+ children :agenda_items, :participations, :proxies
=20
end
diff --git a/site/app/views/taglibs/application.dryml b/site/app/views/ta=
glibs/application.dryml
index 017831f..311631e 100644
--- a/site/app/views/taglibs/application.dryml
+++ b/site/app/views/taglibs/application.dryml
@@ -7,5 +7,6 @@
<include src=3D"taglibs/auto/rapid/forms"/>
=20
<include src=3D"taglibs/main_nav"/>
+<include src=3D"taglibs/cards"/>
=20
<set-theme name=3D"clean"/>
diff --git a/site/app/views/taglibs/cards.dryml b/site/app/views/taglibs/=
cards.dryml
new file mode 100644
index 0000000..cb2a76d
--- /dev/null
+++ b/site/app/views/taglibs/cards.dryml
@@ -0,0 +1,8 @@
+<def tag=3D"card" for=3D"Proxy">
+ <card class=3D"proxy" param=3D"default" merge>
+ <header: param>
+ <h4 param=3D"heading"><a><name:proxy/> for <name:council_member/><=
/a></h4>
+ <delete-button label=3D"Un-appoint proxy" if=3D"&this.council_memb=
er_is?(current_user)"/>
+ </header:>
+ </card>
+</def>
diff --git a/site/app/views/users/show.dryml b/site/app/views/users/show.=
dryml
new file mode 100644
index 0000000..b8ac059
--- /dev/null
+++ b/site/app/views/users/show.dryml
@@ -0,0 +1,10 @@
+<show-page>
+ <append-content-body:>
+ <form action=3D"&create_proxy_path" if=3D"¤t_user.can_appoint_=
a_proxy?(this)">
+ <input type=3D"hidden" name=3D"proxy[council_member_id]" value=3D"=
¤t_user.id"/>
+ <input type=3D"hidden" name=3D"proxy[proxy_id]" value=3D"&this.id"=
/>
+ <input type=3D"hidden" name=3D"proxy[agenda_id]" value=3D"&Agenda.=
current.id"/>
+ <submit label=3D"Appoint as a proxy for next meeting"/>
+ </form>
+ </append-content-body:>
+</show-page>
diff --git a/site/features/proxies.feature b/site/features/proxies.featur=
e
new file mode 100644
index 0000000..a160e6e
--- /dev/null
+++ b/site/features/proxies.feature
@@ -0,0 +1,43 @@
+Feature: Proxies
+ In order to check presence properly
+ I want the web application
+ To support proxies for council members
+
+ Scenario: Appoint then un-appoint proxy
+ Given I am logged in as a council member
+ And an agenda
+ When I view profile of a regular user
+ And I press "Appoint as a proxy for next meeting"
+
+ When I am on the current agenda page
+ Then I should see "User for Example" as proxy
+
+ When I press "Un-appoint proxy"
+ And I confirm
+ And I am on the current agenda page
+ Then I should not see "User for Example"
+
+ Scenario: Don't see useles proxy-management buttons as user who isn't =
a council member
+ Given I am logged in as example user
+ And an agenda
+ When I view profile of a regular user
+ Then I should not see "Appoint as a proxy" button
+
+ Given someone appointed a proxy
+ When I am on the current agenda page
+ Then I should not see "Un-appoint prox" button
+
+ Scenario: Don't see useles proxy-management buttons as user who is a c=
ouncil member
+ Given I am logged in as a council member
+ And an agenda
+ And a regular user
+ And someone appointed a proxy
+
+ When I am on the "Member-who-appointed" show page
+ Then I should not see "Appoint as a proxy" button
+
+ When I am on the current agenda page
+ Then I should not see "Un-appoint prox" button
+
+ When I view old meeting for which I appointed a proxy
+ Then I should not see "Un-appoint prox" button
diff --git a/site/features/step_definitions/proxies_steps.rb b/site/featu=
res/step_definitions/proxies_steps.rb
new file mode 100644
index 0000000..44f27c0
--- /dev/null
+++ b/site/features/step_definitions/proxies_steps.rb
@@ -0,0 +1,28 @@
+Given /^a regular user$/ do
+ Factory(:user, :name =3D> "User")
+end
+
+When /^I view profile of a regular user$/ do
+ Given 'a regular user'
+ When 'I am on the "User" show page'
+end
+
+Then /^I confirm$/ do
+ page.driver.browser.switch_to.alert.accept
+end
+
+Then /^I should not see "([^"]*)" button$/ do |arg1|
+ page.all(:xpath, "//input[@type=3D'submit'][@value=3D'#{arg1}']").shou=
ld be_empty
+end
+
+Given /^someone appointed a proxy$/ do
+ Factory(:user, :council_member =3D> true, :name =3D> 'Member-who-appoi=
nted')
+ Factory(:proxy, :agenda =3D> Agenda.current)
+end
+
+When /^I view old meeting for which I appointed a proxy$/ do
+ a =3D Factory(:agenda, :state =3D> 'old')
+ Factory(:proxy, :council_member =3D> User.council_member_is(true).firs=
t, :agenda =3D> a)
+ When "I am on #{a.id}th agenda page"
+end
+
diff --git a/site/features/step_definitions/within_steps.rb b/site/featur=
es/step_definitions/within_steps.rb
index 57bf030..821eb61 100644
--- a/site/features/step_definitions/within_steps.rb
+++ b/site/features/step_definitions/within_steps.rb
@@ -9,6 +9,7 @@
'in the agendas collection' =3D> '.collection.agendas',
'as empty collection message' =3D> '.empty-collection-message',
'as meeting time' =3D> '.meeting-time-view',
+ 'as proxy' =3D> '.collection.proxies.proxies-collection',
'as the user nick' =3D> '.user-irc-nick',
'as voting option' =3D> '.collection.voting-options',
'as voting option description' =3D> '.voting-option-description'
diff --git a/site/features/support/factories.rb b/site/features/support/f=
actories.rb
new file mode 100644
index 0000000..300fee7
--- /dev/null
+++ b/site/features/support/factories.rb
@@ -0,0 +1,2 @@
+require File.expand_path("../../../spec/factories.rb", __FILE__)
+require File.expand_path("../../../spec/support/users_factory.rb", __FIL=
E__)
diff --git a/site/features/support/paths.rb b/site/features/support/paths=
.rb
index 6f8dad8..18d72ca 100644
--- a/site/features/support/paths.rb
+++ b/site/features/support/paths.rb
@@ -29,7 +29,11 @@ module NavigationHelpers
when /the current items page/
current_items_path
=20
- # Add more mappings here.
+ when /the "([^\"]*)" show page/
+ user_path(User.find_by_name($1))
+
+ when /([1-9]*)th agenda page/
+ agenda_path(Agenda.find $1)
# Add more mappings here.
# Here is an example that pulls values out of the Regexp:
#