houston-core 0.8.4 → 0.9.0.rc1

data/app/controllers/errors_controller.rb

@@ -2,9 +2,9 @@ class ErrorsController < ApplicationController
 
   def index
     authorize! :read, Action
-    @actions = Action.reorder(finished_at: :desc).where.not(error_id: nil).preload(:error).limit(50)
-    @actions = @actions.where(Action.arel_table[:finished_at].lt(params[:before])) if params[:before]
-    render partial: "errors/actions" if request.xhr?
+    @actions = Action.where.not(error_id: nil).preload(:error).limit(50)
+    @actions = @actions.where(Action.arel_table[:created_at].lt(params[:before])) if params[:before]
+    render partial: "actions/actions" if request.xhr?
   end
 
 end

data/app/controllers/project_follows_controller.rb

@@ -0,0 +1,23 @@
+class ProjectFollowsController < ApplicationController
+  attr_reader :project
+  before_action :find_project
+
+
+  def create
+    current_user.follow! project
+    redirect_to :back, notice: "You are now following #{project.name}"
+  end
+
+  def destroy
+    current_user.unfollow! project
+    redirect_to :back, notice: "You are no longer following #{project.name}"
+  end
+
+
+private
+
+  def find_project
+    @project = Project.find_by_slug!(params[:project_id])
+  end
+
+end

data/app/controllers/project_options_controller.rb

@@ -4,7 +4,7 @@ class ProjectOptionsController < ApplicationController
 
 
   def update
-    project.props.merge! params[:options]
+    project.props.merge! params[:options].to_unsafe_hash # <-- TODO: should props be declared and then permitted?
     project.save!
     head :ok
   end

data/app/controllers/user_options_controller.rb

@@ -3,7 +3,7 @@ class UserOptionsController < ApplicationController
 
 
   def update
-    current_user.props.merge! params[:options]
+    current_user.props.merge! params[:options].to_unsafe_hash # <-- TODO: should props be declared and then permitted?
     current_user.save!
     head :ok
   end

data/app/helpers/actions_helper.rb

@@ -45,4 +45,16 @@ module ActionsHelper
     output
   end
 
+  def format_action_state(action)
+    if !action.started?
+      '—'.html_safe
+    elsif action.in_progress?
+      '<i class="fa fa-spinner fa-pulse"></i>'.html_safe
+    elsif action.succeeded?
+      '<i class="fa fa-check success"></i>'.html_safe
+    else
+      '<i class="fa fa-times failure"></i>'.html_safe
+    end
+  end
+
 end

data/app/helpers/application_helper.rb

@@ -86,16 +86,6 @@ module ApplicationHelper
     end
   end
 
-  def format_action_state(job)
-    if job.in_progress?
-      '<i class="fa fa-spinner fa-pulse"></i>'.html_safe
-    elsif job.succeeded?
-      '<i class="fa fa-check success"></i>'.html_safe
-    else
-      '<i class="fa fa-times failure"></i>'.html_safe
-    end
-  end
-
   MINUTE = 60
   HOUR = MINUTE * 60
   DAY = HOUR * 24

data/app/helpers/layout_helper.rb

@@ -0,0 +1,20 @@
+module LayoutHelper
+
+  def layout_show_navigation?
+    return true unless instance_variable_defined?(:@_layout_show_navigation)
+    @_layout_show_navigation
+  end
+
+  def layout_container_fluid?
+    return true unless instance_variable_defined?(:@_layout_container_fluid)
+    @_layout_container_fluid
+  end
+
+
+
+  def render_layout_extensions(layout, type)
+    partials = Houston.layout.extensions_by_layout[layout].public_send(type)
+    partials.map { |block| instance_eval(&block) }.inject(&:+)
+  end
+
+end

data/app/helpers/markdown_helper.rb

@@ -1,21 +1,13 @@
 module MarkdownHelper
   include EmojiHelper
 
-  def markdown
-    @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-      autolink: true,             # parse and identify links
-      lax_spacing: true,          # don't require extra line breaks
-      space_after_headers: false, # don't require there to be a space between # and a header
-      no_intra_emphasis: true)    # don't italicize bar in foo_bar_baz
-  end
-
   def mdown(text)
     return "" if text.blank?
-    emojify markdown.render(text).html_safe
+    emojify Kramdown::Document.new(text).to_html.html_safe
   end
 
   def slackdown(text)
-    Slackdown.new(text).convert
+    Slackdown.convert(text)
   end
 
 end

data/app/helpers/navigation_helper.rb

@@ -1,10 +1,10 @@
 module NavigationHelper
 
   def render_navigation(key)
-    renderer = Houston.get_navigation_renderer(key)
-    return unless renderer.permitted?(current_ability)
+    link = Houston.navigation[key]
+    return unless link.permitted?(current_ability)
 
-    render_nav_link renderer.name, renderer.path
+    render_nav_link link.name, link.path
   rescue KeyError
     Rails.logger.error "\e[31;1mThere is no navigation renderer named #{key.inspect}\e[0m"
     nil
@@ -18,10 +18,10 @@ module NavigationHelper
   end
 
   def render_nav_for_feature(feature)
-    feature = Houston.get_project_feature feature
+    feature = Houston.project_features[feature]
     return unless feature.permitted?(current_ability, current_project)
 
-    render_nav_link feature.name, feature.project_path(current_project)
+    render_nav_link feature.name, feature.path(current_project)
   rescue KeyError
     Rails.logger.error "\e[31;1mThere is no project feature named #{feature.inspect}\e[0m"
     nil

data/app/helpers/project_helper.rb

@@ -5,4 +5,10 @@ module ProjectHelper
     "<b class=\"label #{project.color}\">#{h project.slug.gsub("_", " ")}</b>".html_safe
   end
 
+  def project_banner(project, &block)
+    content_for :title do
+      content_tag :h1, class: "project-banner #{project.color} space-below", "data-project-slug" => project.slug, "data-project-color" => project.color, &block
+    end
+  end
+
 end

data/app/helpers/url_helper.rb

@@ -1,13 +1,13 @@
 module UrlHelper
 
   def feature_path(project, feature)
-    feature = Houston.get_project_feature feature
-    feature.project_path project
+    feature = Houston.project_features[feature]
+    feature.path project
   end
 
   def link_to_project_feature(project, feature)
-    feature = Houston.get_project_feature feature
-    link_to feature.name, feature.project_path(project)
+    feature = Houston.project_features[feature]
+    link_to feature.name, feature.path(project)
   end
 
 end

data/app/helpers/view_extensions_helper.rb

@@ -0,0 +1,20 @@
+module ViewExtensionsHelper
+
+  def render_props_fields(form, view_name)
+    form.fields_for :props, form.object.props do |f|
+      Houston.view[view_name].fields.map do |field|
+        <<~HTML
+          <hr />
+
+          <div class="control-group">
+            <label class="control-label" for="#{field.id}">#{field.label}</label>
+            <div class="controls">
+              #{field.render(self, f)}
+            </div>
+          </div>
+        HTML
+      end.join.html_safe
+    end
+  end
+
+end

data/app/models/action.rb

@@ -1,13 +1,12 @@
 class Action < ActiveRecord::Base
 
-  validates :name, :started_at, presence: true
+  validates :name, presence: true
   belongs_to :error
 
-  default_scope -> { order(started_at: :desc) }
+  default_scope -> { order(created_at: :desc) }
 
   serialize :params, Houston::ParamsSerializer.new
 
-
   @ignored_exceptions = [
     SocketError,
     Errno::ECONNREFUSED,
@@ -31,52 +30,66 @@ class Action < ActiveRecord::Base
       where arel_table[:started_at].lteq time
     end
 
-    def record(action_name, params, trigger)
-      action = create!(name: action_name, started_at: Time.now, trigger: trigger, params: params)
-      begin
-        exception = nil
-
-        Houston.reconnect do
-          yield
-        end
-
-      rescue *ignored_exceptions
-
-        # Note that the action failed, but do not report _these_ exceptions
-        exception = $!
-
-      rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
-
-        # Report all other exceptions
-        exception = $!
-        Houston.report_exception($!, parameters: {
-          action_id: action.id,
-          action_name: action_name,
-          trigger: trigger,
-          params: params
-        })
-
-      ensure
-        begin
-          Houston.reconnect do
-            action.finish! exception
-          end
-        rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
-          Houston.report_exception($!, parameters: {
-            action_id: action.id,
-            action_name: action_name,
-            trigger: trigger,
-            params: params
-          })
-        end
-      end
+    def running
+      where.not(started_at: nil).where(finished_at: nil)
+    end
+
+    def unqueued
+      where(started_at: nil)
+    end
+
+    def run!(action_name, params, trigger)
+      action = create!(name: action_name, trigger: trigger, params: params)
+      action.run!
     end
   end
 
 
 
+  def run!
+    exception = nil
+
+    Houston.reconnect do
+      touch :started_at
+      Houston.actions.fetch(name).execute(params)
+    end
+
+  rescue *::Action.ignored_exceptions
+
+    # Note that the action failed, but do not report _these_ exceptions
+    exception = $!
+
+  rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
+
+    # Report all other exceptions
+    exception = $!
+    Houston.report_exception($!, parameters: {
+      action_id: id,
+      action_name: name,
+      trigger: trigger,
+      params: params
+    })
+
+  ensure
+    begin
+      Houston.reconnect do
+        finish! exception
+      end
+    rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
+      Houston.report_exception($!, parameters: {
+        action_id: id,
+        action_name: name,
+        trigger: trigger,
+        params: params
+      })
+    end
+  end
+
   def retry!
-    Houston.actions.run name, params
+    update_attributes! started_at: Time.now, finished_at: nil, succeeded: nil, exception: nil
+    Houston.async do
+      run!
+    end
   end
 
   def exception=(exception)
@@ -92,12 +105,16 @@ class Action < ActiveRecord::Base
     finished_at - started_at
   end
 
+  def started?
+    started_at.present?
+  end
+
   def finished?
     finished_at.present?
   end
 
   def in_progress?
-    finished_at.nil?
+    started_at.present? && finished_at.nil?
   end
 
 end

data/app/models/authorization.rb

@@ -1,21 +1,56 @@
 class Authorization < ActiveRecord::Base
+  include Houston::Props
 
-  belongs_to :provider, class_name: "Oauth::Provider"
+  belongs_to :user
 
-  validates :name, :provider_id, presence: true
+  validates :user_id, presence: true
 
-  def self.[](name)
-    find_by(name: name)
+  after_destroy do
+    next unless granted?
+    Houston.observer.fire "authorization:revoke", authorization: self
   end
 
-  def self.set_access_token!(params)
-    Authorization.find(params.fetch(:state)).tap do |authorization|
-      authorization.get_access_token! params.fetch(:code)
+
+
+  class << self
+    def for(user)
+      where(user_id: user.id)
+    end
+
+    def granted
+      where.not(access_token: nil)
+    end
+
+    def with_scope(*scopes)
+      where("regexp_split_to_array(scope, '[,\\s]+') @> ARRAY[?]", scopes)
+    end
+    alias :with_scopes :with_scope
+
+
+
+    def providers
+      Houston.config.oauth_providers.map(&:classify)
+    end
+
+    def provider
+      @provider ||= Houston.oauth.get_provider(name.underscore)
     end
+
+    def set_access_token!(params)
+      Authorization.find(params.fetch(:state)).tap do |authorization|
+        authorization.get_access_token! params.fetch(:code)
+      end
+    end
+  end
+
+
+
+  def provider
+    self.class.provider
   end
 
   def granted?
-    expires_in.present?
+    access_token.present?
   end
 
   def authorize_url(params={})
@@ -36,19 +71,29 @@ class Authorization < ActiveRecord::Base
   end
 
   def expired?
-    return false unless granted?
+    return false if expires_in.nil?
     Time.now >= expires_at
   end
 
+  def url
+    "#{Houston.root_url}/auth/#{id}"
+  end
+
 private
 
   def merge!(new_token)
     self.access_token = new_token.token
     self.expires_in = new_token.expires_in
-    self.expires_at = expires_in.seconds.from_now
+    self.expires_at = expires_in.seconds.from_now if expires_in
     self.refresh_token = new_token.refresh_token if new_token.respond_to?(:refresh_token)
     self.secret = new_token.secret if new_token.respond_to?(:secret)
     save!
+
+    Houston.observer.fire "authorization:grant", authorization: self
   end
 
 end
+
+Houston.config.oauth_providers.each do |provider|
+  require_dependency provider
+end