branston 0.6.1 → 0.6.2

data/lib/branston/app/helpers/iterations_helper.rb

@@ -1,50 +1,50 @@
 module IterationsHelper
-  
+
   # TODO: Untested!
   #
   def burndown_chart(iteration, data)
-    
+
     total_points = iteration.velocity
     running_total = 0
-    
+
     unless data.nil? or data.empty?
       points_data = data.map { |d|
         running_total += d.points.to_i
         total_points - running_total
       }
-      
-      
+
+
       points_data = [total_points] + points_data unless points_data.nil?
-      
+
       work_days = [nil]
       (iteration.start_date.to_date..iteration.end_date.to_date).to_a.each do |date|
         work_days.push date.strftime('%d/%m') unless is_weekend(date)
       end
-      
+
       # Keep adding the last value to flatline the chart
       while work_days.length > points_data.length
         points_data.push points_data.last
       end
-      
+
       # Make some gradations for the y axis labels
       y_scale = [0]
       [4, 2, 1.5, 1.25, 1].each do |n|
         unit = (total_points / n).floor
         y_scale.push unit if unit > 0
       end
-      
+
       image_tag Gchart.line(:size => '800x360',
         :title => "Iteration #{iteration.name} burndown",
         :data => points_data, :axis_with_labels => 'x,y',
         :axis_labels => [work_days, y_scale])
-      
+
     end
-    
+
   end
-  
+
   def is_weekend(date)
     date.wday == 0 or date.wday == 5 or date.wday == 6
   end
-  
+
 end
 

data/lib/branston/app/models/iteration.rb

@@ -19,6 +19,7 @@ class Iteration < ActiveRecord::Base
   # Validations
   #
   validates_presence_of :name, :velocity
+  validates_numericality_of :velocity
 
   # Associations
   #
@@ -34,8 +35,9 @@ class Iteration < ActiveRecord::Base
       FROM stories
       WHERE iteration_id = ?
       AND status = 'completed'
+      OR status = 'quality_assurance'
       GROUP BY completed_date
-      ORDER bY completed_date", id
+      ORDER BY completed_date", id
     ]
   end
 

data/lib/branston/app/models/release.rb

@@ -15,7 +15,6 @@
 class Release < ActiveRecord::Base
 
   validates_presence_of :release_date
-
   has_many :iterations, :order => 'end_date'
 
 end

data/lib/branston/app/models/story.rb

@@ -26,7 +26,6 @@ class Story < ActiveRecord::Base
   belongs_to :iteration
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   has_many :scenarios, :dependent => :destroy
-  has_one :user_role
 
   # Named scopes
   #
@@ -34,8 +33,8 @@ class Story < ActiveRecord::Base
   named_scope :in_progress, :conditions => 'status = "in_progress"'
   named_scope :in_quality_assurance, :conditions => 'status = "quality_assurance"'
   named_scope :completed, :conditions => 'status = "completed"'
-  named_scope :for_iteration, lambda { |id| { :conditions => ['iteration_id = ?',
-  id] } }
+  named_scope :for_iteration, lambda { |id| {
+    :conditions => ['iteration_id = ?', id] } }
 
   before_save :set_slug
 
@@ -51,33 +50,36 @@ class Story < ActiveRecord::Base
   # Completed - A story that has been implemented and tested by the development
   # team
   #
-  state_machine :status, :initial => :new do
-    state :new
-    state :in_progress
-    state :quality_assurance
-    state :completed
-
-    event :assign do
-      transition [:new, :quality_assurance, :completed] => :in_progress
-    end
-
-    event :check_quality do
-      transition [:in_progress, :quality_assurance, :completed] => :quality_assurance
-    end
-
-    event :finish do
-      transition [:in_progress, :quality_assurance] => :completed
-    end
-
-    event :back_to_new do
-      transition :in_progress => :new
-    end
-
-    after_transition any => :completed do |story, transition|
-      story.completed_date = Date.today
-    end
+  include AASM
+  aasm_column :status
+  aasm_initial_state :new
+  aasm_state :new
+  aasm_state :in_progress
+  aasm_state :quality_assurance
+  aasm_state :completed, :enter => Proc.new  { |story, transition|
+                                        story.completed_date = Date.today
+                                   }
+
+  aasm_event :assign do
+    transitions :from => [:new, :quality_assurance, :completed], :to => :in_progress
   end
 
+  aasm_event :check_quality do
+    transitions :from => [:in_progress, :quality_assurance, :completed], :to => :quality_assurance
+  end
+
+  aasm_event :finish do
+    transitions :from => [:in_progress, :quality_assurance], :to => :completed
+  end
+
+  aasm_event :back_to_new do
+    transitions :from => :in_progress, :to => :new
+  end
+
+#  after_transition any => :completed do |story, transition|
+#    story.completed_date = Date.today
+#  end
+
   attr_protected :status
 
   def to_param

data/lib/branston/app/models/user.rb

@@ -15,6 +15,9 @@
 require 'digest/sha1'
 
 class User < ActiveRecord::Base
+
+  ROLES = ["admin", "developer", "customer"]
+
   include Authentication
   include Authentication::ByPassword
   include Authentication::ByCookieToken
@@ -32,6 +35,8 @@ class User < ActiveRecord::Base
   validates_uniqueness_of   :email
   validates_format_of       :email,    :with => Authentication.email_regex, :message => Authentication.bad_email_message
 
+  validates_inclusion_of    :role,     :in => ROLES
+
   has_many :participations
   has_many :iterations, :through => :participations
   has_many :stories, :foreign_key => 'author_id'
@@ -41,7 +46,34 @@ class User < ActiveRecord::Base
   # anything else you want your user to change should be added here.
   attr_accessible :login, :email, :name, :password, :password_confirmation
 
+  include AASM
+  aasm_column :state
+  aasm_initial_state :pending
+  aasm_state :pending
+  aasm_state :active,  :enter => :do_activate
+  aasm_state :suspended
+  aasm_state :deleted, :enter => :do_delete
 
+  aasm_event :register do
+    transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
+  end
+
+  aasm_event :activate do
+    transitions :from => [:pending, :suspended], :to => :active
+  end
+
+  aasm_event :suspend do
+    transitions :from => [:pending, :active], :to => :suspended
+  end
+
+  aasm_event :delete do
+    transitions :from => [:pending, :active, :suspended], :to => :deleted
+  end
+
+
+  def has_role?(role_name)
+    self.role == role_name
+  end
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   #
@@ -51,7 +83,7 @@ class User < ActiveRecord::Base
   #
   def self.authenticate(login, password)
     return nil if login.blank? || password.blank?
-    u = find_by_login(login.downcase) # need to get the salt
+    u = find_in_state :first, :active, :conditions => {:login => login.downcase}
     u && u.authenticated?(password) ? u : nil
   end
 
@@ -69,7 +101,20 @@ class User < ActiveRecord::Base
 
   protected
 
+  # Returns true if the user has just been activated.
+  def recently_activated?
+    @activated
+  end
+
+  def do_delete
+    self.deleted_at = Time.now.utc
+  end
 
+  def do_activate
+    @activated = true
+    self.activated_at = Time.now.utc
+    self.deleted_at = self.activation_code = nil
+  end
 
 end
 

data/lib/branston/app/views/layouts/_header.html.erb

@@ -8,9 +8,14 @@
 	<div id="header">
 		<div id="menu">
 			<ul>
-				<li <%= tab_on("overview") %>><a href="/" class="first">Overview</a></li>
-				<li <%= tab_on("releases") %>><a href="/releases">Releases</a></li>
-				<li <%= tab_on("iterations") %>><a href="/iterations">Iterations</a></li>
+			<% if logged_in? -%>
+				<li <%= tab_on("iterations") %>><%= link_to 'Iterations', iterations_path %></li>
+				<li <%= tab_on("releases") %>><%= link_to 'Releases', releases_path %></li>
+				<li <%= tab_on("users") %>><%= link_to 'Users', users_path %></li>
+				<li <%= tab_on("logout") %>><%= link_to 'Log Out', logout_path %></li>
+			<% else -%>
+				<li <%= tab_on("login") %>><%= link_to 'Log In', login_path %></li>
+			<% end -%>
 			</ul>
 		</div>
 		<!-- end #menu -->

data/lib/branston/app/views/layouts/user_roles.html.erb

@@ -9,17 +9,17 @@
   <%= stylesheet_link_tag 'style' %>
   <%= stylesheet_link_tag 'ui-lightness/jquery-ui-1.7.2.custom' %>
   <%= stylesheet_link_tag 'scaffold' %>
-  <script type="text/javascript" src="javascripts/jquery-1.3.2.min.js"></script>
-  <script type="text/javascript" src="javascripts/jquery-ui-1.7.2.custom.min.js"></script>
-  <script type="text/javascript" src="javascripts/jquery.jeditable.mini.js"></script>
-  <script type="text/javascript" src="javascripts/jquery-multiselect-drag-n-drop.js"></script>
+  <%= javascript_include_tag 'jquery-1.3.2.min' %>
+  <%= javascript_include_tag 'jquery-ui-1.7.2.custom.min' %>
+  <%= javascript_include_tag 'jquery.jeditable.mini' %>
+  <%= javascript_include_tag 'jquery-multiselect-drag-n-drop' %>
 </head>
 <body>
   <%= render :partial => "layouts/header" %>
 
   <p style="color: green"><%= flash[:notice] %></p>
 
-	<div id="page">
+	<div id="page">
 		<div id="content">
     <%= yield %>
     </div>

data/lib/branston/app/views/sessions/new.html.erb

@@ -1,33 +1,27 @@
 <h1>Log In</h1>
 
 <div id="login">
-  
+
   <% form_tag session_path do -%>
-  
+
   <p class="form-fields">
     <%= label_tag 'login' %>
     <%= text_field_tag 'login', @login %>
   </p>
-  
+
   <p class="form-fields">
     <%= label_tag 'password' %>
     <%= password_field_tag 'password', nil %>
   </p>
-  
+
   <p class="form-fields">
     <%= label_tag 'remember_me', 'Remember me' %>
     <%= check_box_tag 'remember_me', '1', @remember_me %>
   </p>
-  
- 
+
+
    <p id="login-button" class="form-navigtion"><%= submit_tag 'Log in' %></p>
   <% end -%>
-  
-  
-  
-  <div style="clear:both">
-    <p>If you are lacking a Branston account, 
-    <%=link_to 'click here to register!', signup_path %>
-    </p>
-  </div>
+
 </div>
+

data/lib/branston/app/views/users/_admin_controls.html.erb

@@ -0,0 +1,14 @@
+<%= link_to user.login, edit_user_path(user) %> -
+
+<% if user.state == "active" -%>
+  activate
+<% else %>
+  <%= link_to 'activate', activate_user_path(user) %>
+<% end -%> |
+
+<% if user.state == "pending" || user.state == "suspended" -%>
+  suspend
+<% else -%>
+  <%= link_to 'suspend', suspend_user_path(user)  %>
+<% end -%>
+

data/lib/branston/app/views/users/_form.html.erb

@@ -0,0 +1,27 @@
+<p class="form-fields">
+  <%= label_tag 'login' %>
+  <%= f.text_field :login %>
+</p>
+
+<p class="form-fields">
+  <%= label_tag 'email' %>
+  <%= f.text_field :email %>
+</p>
+
+<p class="form-fields">
+  <%= label_tag 'password' %>
+  <%= f.password_field :password %>
+</p>
+
+<p class="form-fields">
+  <%= label_tag 'password_confirmation', 'Confirm Password' %>
+  <%= f.password_field :password_confirmation %>
+</p>
+
+<% if current_user.has_role?("admin") -%>
+  <p class="form-fields">
+    <%= label_tag 'role' %>
+    <%= f.select :role, ["admin", "client", "developer"] %>
+  </p>
+<% end -%>
+

data/lib/branston/app/views/users/edit.html.erb

@@ -0,0 +1,9 @@
+<h1>Edit user</h1>
+<% @user.password = @user.password_confirmation = nil %>
+
+<%= error_messages_for :user %>
+<% form_for(@user) do |f| -%>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <p class="form-navigation"><%= submit_tag 'Update user' %></p>
+<% end -%>
+

data/lib/branston/app/views/users/index.html.erb

@@ -0,0 +1,14 @@
+<div class="index-head">
+  <h2>Users</h2>
+  <%= link_to 'New user', new_user_path, :class => "add" %>
+</div>
+<% unless @users.blank? -%>
+  <ul>
+    <% @users.each do |user| -%>
+      <li>
+        <%= render :partial => "users/admin_controls", :locals => {:user => user } %>
+      </li>
+    <% end -%>
+  </ul>
+<% end -%>
+

data/lib/branston/app/views/users/new.html.erb

@@ -1,28 +1,9 @@
-<h1>Sign up as a new user</h1>
+<h1>Create a new user</h1>
 <% @user.password = @user.password_confirmation = nil %>
 
 <%= error_messages_for :user %>
 <% form_for :user, :url => users_path do |f| -%>
-<p class="form-fields">
-  <%= label_tag 'login' %>
-  <%= f.text_field :login %>
-</p>
-
-<p class="form-fields">
-  <%= label_tag 'email' %>
-  <%= f.text_field :email %>
-</p>
-
-<p class="form-fields">
-  <%= label_tag 'password' %>
-  <%= f.password_field :password %>
-</p>
-
-<p class="form-fields">
-  <%= label_tag 'password_confirmation', 'Confirm Password' %>
-  <%= f.password_field :password_confirmation %>
-</p>
-
-<p class="form-navigation"><%= submit_tag 'Sign up' %></p>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <p class="form-navigation"><%= submit_tag 'Create user' %></p>
 <% end -%>