houston-core 0.8.4 → 0.9.0.rc1

data/app/models/follow.rb

@@ -0,0 +1,6 @@
+class Follow < ActiveRecord::Base
+
+  belongs_to :user
+  belongs_to :project
+
+end

data/app/models/persistent_trigger.rb

@@ -4,11 +4,16 @@ class PersistentTrigger < ActiveRecord::Base
   serialize :value, Houston::Serializer.new
   serialize :params, Houston::ParamsSerializer.new
 
+  belongs_to :user
+
   TYPES = [:on, :every].freeze
+
+  validates :user_id, presence: true
   validates :type, inclusion: { in: TYPES, message: "{value} is not valid Trigger type; use #{TYPES.map(&:inspect).to_sentence(two_words_connector: " or ", last_word_connector: ", or ")}" }
   validate :action_must_be_defined
 
   after_create :register!
+  after_destroy :unregister!
 
 
   TYPES.each do |type|
@@ -31,10 +36,15 @@ class PersistentTrigger < ActiveRecord::Base
 
 
   def register!
-    trigger = Houston.config.triggers.build(type, value, action, params)
+    trigger = Houston.config.triggers.build(type, value, action, params.merge(trigger: self), persistent_trigger_id: id)
     Houston.config.triggers.push(trigger) unless Houston.config.triggers.member?(trigger)
   end
 
+  def unregister!
+    trigger = Houston.config.triggers.detect { |trigger| trigger.persistent_trigger_id == id }
+    Houston.config.triggers.delete(trigger) if trigger
+  end
+
 
 private
 

data/app/models/project.rb

@@ -4,9 +4,10 @@ class Project < ActiveRecord::Base
   include Houston::Props
 
   belongs_to :team
+  has_and_belongs_to_many :followers, join_table: "follows", class_name: "User"
 
   before_validation :generate_default_slug, :set_default_color
-  validates_presence_of :name, :slug, :color
+  validates_presence_of :name, :slug, :color_name
 
   validates :slug, format: { with: /\A[a-z0-9_\-]+\z/ }
 
@@ -16,26 +17,8 @@ class Project < ActiveRecord::Base
     slug
   end
 
-  def color_value
-    Houston.config.project_colors[color]
-  end
-
-
-
-  def extended_attributes
-    raise NotImplementedError, "This feature has been deprecated; use props"
-  end
-
-  def extended_attributes=(value)
-    raise NotImplementedError, "This feature has been deprecated; use props"
-  end
-
-  def view_options
-    raise NotImplementedError, "This feature has been deprecated; use props"
-  end
-
-  def view_options=(value)
-    raise NotImplementedError, "This feature has been deprecated; use props"
+  def color
+    Houston.config.project_colors[color_name]
   end
 
 
@@ -88,11 +71,6 @@ class Project < ActiveRecord::Base
     team.users
   end
 
-  def followers # <-- redefine followers to be everyone who participates in or follows the project
-    puts "DEPRECATED: Project#followers is deprecated; use Project#teammates instead"
-    teammates
-  end
-
   # ------------------------------------------------------------------------- #
 
 
@@ -104,7 +82,7 @@ private
   end
 
   def set_default_color
-    self.color = "default" unless color
+    self.color_name = "default" unless color_name
   end
 
 end

data/app/models/user.rb

@@ -6,10 +6,17 @@ class User < ActiveRecord::Base
 
   has_many :roles, class_name: "TeamUser", dependent: :destroy
   has_and_belongs_to_many :teams
-  has_many :credentials, :class_name => "UserCredentials", dependent: :destroy
+  has_many :authorizations, dependent: :destroy
+  has_many :triggers, class_name: "PersistentTrigger", dependent: :destroy
+  has_and_belongs_to_many :followed_projects, -> { unretired }, join_table: "follows", class_name: "Project"
   belongs_to :current_project, class_name: "Project"
 
-  devise *Houston.config.devise_configuration
+  devise :database_authenticatable,
+         :recoverable,
+         :rememberable,
+         :trackable,
+         :validatable,
+         :invitable
 
   default_scope { order("last_name, first_name") }
 
@@ -35,17 +42,6 @@ class User < ActiveRecord::Base
   end
 
 
-  def developer?
-    puts "DEPRECATED: User#developer? will be removed"
-    legacy_role == "Developer"
-  end
-
-  def tester?
-    puts "DEPRECATED: User#tester? will be removed"
-    legacy_role == "Tester"
-  end
-
-
 
   def self.with_primary_email(email)
     email = email.downcase if email
@@ -86,60 +82,20 @@ class User < ActiveRecord::Base
     "#{first_name} #{last_name}"
   end
 
-  def follows?(project)
-    Role.where(user: self).to_projects.member?(project)
-  end
-
-  def followed_projects
-    Role.where(user: self).to_projects.unretired
-  end
-
-  def view_options
-    raise NotImplementedError, "This feature has been deprecated; use props"
-  end
-
-  def view_options=(value)
-    raise NotImplementedError, "This feature has been deprecated; use props"
-  end
 
-  def unfuddle_id
-    raise NotImplementedError, "This feature has been deprecated; use props[\"unfuddle.id\"]"
-  end
 
-  def unfuddle_id=(value)
-    raise NotImplementedError, "This feature has been deprecated; use props[\"unfuddle.id\"]"
+  def follow!(project)
+    followed_projects << project
   end
 
-
-
-  # LDAP Overrides
-  # ------------------------------------------------------------------------- #
-
-  def self.find_ldap_entry(ldap_connection, auth_key_value)
-    filter = Net::LDAP::Filter.eq(Houston.config.authentication_strategy_configuration[:field], auth_key_value)
-    ldap_connection.ldap.search(filter: filter).first
+  def unfollow!(project)
+    followed_projects.delete project
   end
 
-  def self.find_for_ldap_authentication(attributes, entry)
-    email = entry.mail.first.downcase
-    user = where(email: email).first
-    if user && user.username.nil?
-      user.update_column :username, entry[Houston.config.authentication_strategy_configuration[:field]][0].to_s
-    end
-    user
-  end
-
-  def self.create_from_ldap_entry(attributes, entry)
-    create!(
-      email: entry.mail.first.downcase,
-      username: entry[Houston.config.authentication_strategy_configuration[:field]][0].to_s,
-      password: attributes[:password],
-      first_name: entry.givenname.first,
-      last_name: entry.sn.first )
+  def follows?(project)
+    followed_projects.member?(project)
   end
 
-  # ------------------------------------------------------------------------- #
-
 
 
 private

data/app/presenters/project_presenter.rb

@@ -20,8 +20,8 @@ class ProjectPresenter
       name: project.name,
       slug: project.slug,
       color: {
-        name: project.color,
-        hex: project.color_value.hex },
+        name: project.color.name,
+        hex: project.color.hex },
       props: project.props.to_h }
   end
 

data/app/views/actions/_actions.html.erb

@@ -1,11 +1,14 @@
 <% @actions.each do |action| %>
-  <tr class="action" data-timestamp="<%= action.started_at.iso8601 %>">
+  <tr class="action" data-timestamp="<%= action.created_at.iso8601 %>">
     <td class="table-margin"></td>
-    <td class="action-time"><%= format_time action.started_at %></td>
-    <td class="action-duration"><%= format_duration action.duration %></td>
+    <td class="action-created"><%= format_time action.created_at %></td>
+    <td class="action-name"><%= link_to action[:name], action_path(slug: action[:name]) %></td>
+    <td class="action-started"><%= format_time action.started_at %></td>
+    <td class="action-finished"><%= format_time action.finished_at %></td>
+    <td class="action-duration"><%= format_duration action.duration || (action.started? ? Time.now - action.started_at : nil) %></td>
     <td class="action-trigger"><%= action.trigger %></td>
     <td class="action-params"><%= format_action_params action.params %></td>
-    <td class="action-succeded"><%= format_action_state action %></td>
+    <td class="action-succeeded"><%= format_action_state action %></td>
     <td class="action-exception">
       <% if action.error %>
         <% unless action.error.type.blank? %>
@@ -13,7 +16,7 @@
         <% end %>
         <%= action.error.message %>
       <% end %>
-    <td>
+    </td>
     <td class="action-retry"><%= button_to "Retry", retry_action_path(action), class: "btn-retry btn btn-mini btn-default" %></td>
     <td class="table-margin"></td>
   </tr>

data/app/views/actions/index.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% if $scheduler %>
-  <p><b>Status:</b> <%= $scheduler.up? ? "Up (Started #{format_time $scheduler.started_at})".html_safe : "Down" %></p>
+  <p><b>Status:</b> <%= $scheduler.up? ? "Up (Started #{format_time $scheduler.started_at.to_time})".html_safe : "Down" %></p>
 <% else %>
   <p><b>Status:</b> Unavailable</p>
 <% end %>

data/app/views/actions/running.html.erb

@@ -4,36 +4,30 @@
 </h1>
 <% end %>
 
-<div class="nomargin">
+<div class="nomargin action-running">
   <table id="actions" class="table table-sortable table-striped">
     <thead>
       <tr>
         <td class="table-margin"></td>
-        <th class="action-time">Started</th>
-        <th class="action-duration">Duration</th>
+        <th class="action-created">Queued</th>
         <th class="action-name">Action</th>
+        <th class="action-started">Started</th>
+        <th class="action-finished">Finished</th>
+        <th class="action-duration">Duration</th>
         <th class="action-trigger">Trigger</th>
         <th class="action-params">Params</th>
+        <th class="action-succeeded">Succeeded</th>
+        <th class="action-exception">Exception</th>
+        <th class="action-retry">Retry</th>
         <td class="table-margin"></td>
       </tr>
     </thead>
     <tbody>
-      <% @actions.each do |action| %>
-        <tr class="action">
-          <td class="table-margin"></td>
-          <td class="action-time"><%= format_time action.started_at %></td>
-          <td class="action-duration"><%= format_time_ago action.started_at %></td>
-          <td class="action-name"><%= link_to action[:name], action_path(slug: action[:name]) %></td>
-          <td class="action-trigger"><%= action.trigger %></td>
-          <td class="action-params"><%= format_action_params action.params %></td>
-          <td class="table-margin"></td>
-        </tr>
-      <% end %>
+      <%= render "actions/actions" %>
     </tbody>
   </table>
 </div>
 
-
 <% content_for :javascripts do %>
   <script type="text/javascript">
     $(function() {

data/app/views/actions/show.html.erb

@@ -5,16 +5,19 @@
 </h1>
 <% end %>
 
-<div class="nomargin">
+<div class="nomargin action-show">
   <table id="actions" class="table table-sortable table-striped">
     <thead>
       <tr>
         <td class="table-margin"></td>
-        <th class="action-time">Time</th>
+        <th class="action-created">Queued</th>
+        <th class="action-name">Action</th>
+        <th class="action-started">Started</th>
+        <th class="action-finished">Finished</th>
         <th class="action-duration">Duration</th>
         <th class="action-trigger">Trigger</th>
         <th class="action-params">Params</th>
-        <th class="action-succeded">Succeeded</th>
+        <th class="action-succeeded">Succeeded</th>
         <th class="action-exception">Exception</th>
         <th class="action-retry">Retry</th>
         <td class="table-margin"></td>

data/app/views/actions/unqueued.html.erb

@@ -0,0 +1,41 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Unqueued Actions
+</h1>
+<% end %>
+
+<div class="nomargin action-unqueued">
+  <table id="actions" class="table table-sortable table-striped">
+    <thead>
+      <tr>
+        <td class="table-margin"></td>
+        <th class="action-created">Queued</th>
+        <th class="action-name">Action</th>
+        <th class="action-started">Started</th>
+        <th class="action-finished">Finished</th>
+        <th class="action-duration">Duration</th>
+        <th class="action-trigger">Trigger</th>
+        <th class="action-params">Params</th>
+        <th class="action-succeeded">Succeeded</th>
+        <th class="action-exception">Exception</th>
+        <th class="action-retry">Retry</th>
+        <td class="table-margin"></td>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render "actions/actions" %>
+    </tbody>
+  </table>
+</div>
+
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    $(function() {
+      $('#actions')
+        .tablesorter()
+        .on('click', '.action-params-short', function() {
+          $(this).next().modal();
+        });
+    });
+  </script>
+<% end %>

data/app/views/authorizations/_form.html.erb

@@ -1,33 +1,45 @@
-<%= form_for @authorization, html: {class: "form-horizontal"} do |f| %>
+<%= form_for @authorization, url: {controller: "authorizations"}, html: {class: "form-horizontal"} do |f| %>
   <fieldset>
     <div class="control-group">
-      <%= f.label :name, class: "control-label" %>
+      <%= f.label :type, "Provider", class: "control-label" %>
       <div class="controls">
-        <%= f.text_field :name, class: "text_field" %>
-      </div>
-    </div>
-  </fieldset>
-
-<hr />
-
-  <fieldset>
-    <div class="control-group">
-      <%= f.label :provider_id, class: "control-label" %>
-      <div class="controls">
-        <%= f.collection_select :provider_id, Oauth::Provider.all, :id, :name %>
+        <%= f.select :type, Authorization.providers, {}, disabled: @authorization.persisted? %>
       </div>
     </div>
 
     <div class="control-group">
       <%= f.label :scope, class: "control-label" %>
       <div class="controls">
-        <%= f.text_field :scope, class: "text_field" %>
+        <%= f.text_field :scope, class: "text_field", readonly: @authorization.persisted? %>
       </div>
     </div>
   </fieldset>
 
   <div class="form-actions">
     <%= f.submit nil, class: "btn btn-primary" %>
-    <%= link_to "Cancel", authorizations_path, class: "btn" %>
+    <%= link_to "Cancel", my_authorizations_path, class: "btn" %>
+
+    <% if @authorization.persisted? && can?(:destroy, @authorization) %>
+      <button class="btn btn-delete btn-danger" id="delete_authorization_button">Revoke</button>
+    <% end %>
   </div>
 <% end %>
+
+<% content_for :javascripts do %>
+<script type="text/javascript">
+  $(function() {
+    <% if @authorization.persisted? && can?(:destroy, @authorization) %>
+    $('#delete_authorization_button').click(function(e) {
+      e.preventDefault();
+      App.confirmDelete({
+        resource: 'Authorization',
+        message: 'This will revoke authorization for "<%= @authorization.provider.name %>".',
+        url: <%=raw authorization_path(@authorization).to_json %>
+      });
+    });
+    <% end %>
+
+    $('#authorization_name').select();
+  });
+</script>
+<% end %>

data/app/views/authorizations/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title do %>
 <h1 class="project-banner space-below">
-  Authorizations
+  <%= @title %>
 
   <%= link_to "New Authorization", new_authorization_path, class: "btn btn-primary" if can?(:create, Authorization) %>
 </h1>
@@ -11,7 +11,8 @@
     <thead>
       <tr>
         <td class="table-margin"></td>
-        <th class="authorization-name">Name</th>
+        <td class="user-avatar"></td>
+        <th class="user-name sort-desc">User</th>
         <th class="authorization-name">Provider</th>
         <th class="authorization-status">Satus</th>
         <td class="table-margin"></td>
@@ -21,8 +22,12 @@
       <% @authorizations.each do |authorization| %>
         <tr class="authorization">
           <td class="table-margin"></td>
-          <td class="authorization-name"><%= link_to authorization.name, edit_authorization_path(authorization) %></td>
-          <td class="authorization-provider"><%= authorization.provider.name %></td>
+          <td class="user-avatar"><%= avatar_for(authorization.user, size: 32) %></td>
+          <td class="user-name">
+            <span class="first-name"><%= authorization.user.first_name %></span>
+            <span class="last-name"><%= authorization.user.last_name %></span>
+          </td>
+          <td class="authorization-provider"><%= link_to authorization.provider.name, edit_authorization_path(authorization) %></td>
           <td class="authorization-status">
             <% if authorization.granted? %>
               Granted