flyboy 1.0.7 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d93bfafbdb91bb4352f71be2aeabb56dd8787e3d
+  data.tar.gz: cedbdd47162424e9cc12c2faa1c1ba2d23c614aa
+SHA512:
+  metadata.gz: 84d522de31c4d217b6405823a30e90f25ea79e5c5fe878cb61822de83f13c4e1278c5832b1f7d04c4362384a91c042282423043b7aa689dced2cbca4c5e9f45f
+  data.tar.gz: e965d5044ef9c060bf978098e5b985c5d755954dec325421a386d445528de579827802bc6efdeada89d1e9ac5065f084a4745db25b4f768fd21acc74ba677764

data/app/controllers/flyboy/application_controller.rb

@@ -1,11 +1,26 @@
 module Flyboy
   class ApplicationController < ::ApplicationController
-    def current_ability
-      ::Flyboy::Ability.new
-    end
-
     layout "application"
 
     helper Dorsale::AllHelpers
+
+    # Cross-engine polymorphic_path
+    # TODO : Export to Dorsale ?
+    def engine_polymorphic_path(obj)
+      if obj.class.parent == Object
+        routes = main_app
+      else
+        routes = obj.class.parent::Engine.routes
+      end
+
+      routes.url_for(
+        :controller => obj.class.model_name.collection,
+        :action     => :show,
+        :id         => obj.to_param,
+        :only_path  => true
+      )
+    end
+
+    helper_method :engine_polymorphic_path
   end
 end

data/app/controllers/flyboy/goals_controller.rb

@@ -14,7 +14,7 @@ module Flyboy
 
       @order ||= sortable_column_order do |column, direction|
         case column
-        when "title", "status"
+        when "name", "status"
           %(LOWER(flyboy_goals.#{column}) #{direction})
         when "progress"
           %(flyboy_goals.#{column} #{direction})
@@ -37,7 +37,7 @@ module Flyboy
 
       @order ||= sortable_column_order do |column, direction|
         case column
-        when "title", "status"
+        when "name", "status"
           %(LOWER(flyboy_tasks.#{column}) #{direction})
         when "progress", "term"
           %(flyboy_tasks.#{column} #{direction})
@@ -123,7 +123,7 @@ module Flyboy
     end
 
     def permitted_params
-      [:title, :description]
+      [:name, :description]
     end
 
     def goal_params

data/app/controllers/flyboy/tasks_controller.rb

@@ -8,17 +8,20 @@ module Flyboy
     def index
       authorize! :list, Task
 
-      @tasks ||= Task.all
+      @tasks ||= Task.all.includes(:taskable)
 
       @order ||= sortable_column_order do |column, direction|
         case column
-        when "title", "status"
+        when "name", "status"
           %(LOWER(flyboy_tasks.#{column}) #{direction})
         when "progress", "term"
           %(flyboy_tasks.#{column} #{direction})
-        when "goal"
-          @tasks = @tasks.joins(:goal)
-          %(LOWER(flyboy_goals.title) #{direction})
+        when "taskable"
+          if direction == :asc
+            proc { |a, b| a.taskable.name.downcase <=> b.taskable.name.downcase }
+          else
+            proc { |a, b| b.taskable.name.downcase <=> a.taskable.name.downcase }
+          end
         else
           params["sort"] = "term"
           "term ASC"
@@ -27,10 +30,16 @@ module Flyboy
 
       @filters ||= SmallData::FilterForTasks.new(cookies)
 
-      @tasks = @tasks.order(@order)
       @tasks = @filters.apply(@tasks)
       @tasks = @tasks.search(params[:q])
-      @tasks = @tasks.page(params[:page])
+
+      if @order.is_a?(Proc)
+        @tasks = @tasks.sort(&@order)
+        @tasks = Kaminari.paginate_array(@tasks).page(params[:page])
+      else
+        @tasks = @tasks.order(@order)
+        @tasks = @tasks.page(params[:page])
+      end
 
       respond_to do |format|
         format.html
@@ -61,8 +70,8 @@ module Flyboy
     end
 
     def new
-      @goal ||= Goal.find(params[:goal_id])
-      @task ||= @goal.tasks.new
+      @task = Task.new
+      @task.taskable_guid = params[:taskable_guid]
 
       authorize! :create, @task
     end
@@ -141,11 +150,11 @@ module Flyboy
 
     def set_objects
       @task = Task.find params[:id]
-      @goal = @task.goal
+      @taskable = @task.taskable
     end
 
     def permitted_params
-      [:goal_id, :title, :description, :progress, :term, :reminder]
+      [:taskable_id, :taskable_type, :name, :description, :progress, :term, :reminder]
     end
 
     def task_params

data/app/helpers/flyboy/application_helper.rb

@@ -2,8 +2,8 @@ module Flyboy
   module ApplicationHelper
 
     def goal_color(goal)
-      return "onalert"   if Flyboy::Task.where('goal_id = ? AND done = ? AND term < ?', goal.id, false, Date.today).count > 0
-      return "onwarning" if Flyboy::Task.where('goal_id = ? AND done = ? AND term > ? AND reminder < ?', goal.id , false, Date.today, Date.today).count > 0
+      return "onalert"   if Flyboy::Task.where(taskable: goal).where('done = ? AND term < ?', false, Date.today).count > 0
+      return "onwarning" if Flyboy::Task.where(taskable: goal).where('done = ? AND term > ? AND reminder < ?', false, Date.today, Date.today).count > 0
       return "finished"  if goal.closed?
       return "ontime"
     end

data/app/models/flyboy/{ability.rb → ability_helper.rb}

@@ -1,8 +1,6 @@
 module Flyboy
-  class Ability
-    include ::CanCan::Ability
-
-    def initialize(user = nil)
+  module AbilityHelper
+    def define_flyboy_abilities
       # Allowed actions (all by default)
       can [:list, :create, :read, :update, :delete, :open, :close], Flyboy::Goal
       can [:list, :create, :read, :update, :delete, :complete, :snooze], Flyboy::Task
@@ -21,8 +19,12 @@ module Flyboy
         not goal.may_open?
       end
 
+      cannot :create, Flyboy::Task do |task|
+        task.taskable.present? && cannot?(:show, task.taskable)
+      end
+
       cannot [:create, :update, :delete], Flyboy::Task do |task|
-        task.goal.closed?
+        task.taskable.is_a?(Flyboy::Goal) && task.taskable.closed?
       end
 
       cannot :complete, Flyboy::Task do |task|
@@ -32,7 +34,6 @@ module Flyboy
       cannot :snooze, Flyboy::Task do |task|
         task.done? || task.reminder >= Date.today
       end
-
     end
   end
 end

data/app/models/flyboy/goal.rb

@@ -1,9 +1,8 @@
-require "dorsale/search"
-
 module Flyboy
   class Goal < ActiveRecord::Base
     include AASM
     include Dorsale::Search
+    include Dorsale::PolymorphicId
 
     paginates_per 50
 
@@ -20,9 +19,9 @@ module Flyboy
       end
     end
 
-    has_many :tasks, dependent: :destroy
+    has_many :tasks, dependent: :destroy, as: :taskable
 
-    validates :title, presence: true
+    validates :name, presence: true
     validates :status, inclusion: {
       in: proc { Flyboy::Goal.aasm.states.map(&:to_s) }
     }

data/app/models/flyboy/task.rb

@@ -1,17 +1,18 @@
 #encoding: utf-8
-require "dorsale/search"
 
 module Flyboy
   class Task < ActiveRecord::Base
     include Dorsale::Search
+    include Dorsale::PolymorphicId
 
     paginates_per 50
 
-    belongs_to :goal
+    belongs_to :taskable, polymorphic: true
     has_many :comments, class_name: Flyboy::TaskComment, inverse_of: :task, dependent: :destroy
+    polymorphic_id_for :taskable
 
-    validates :goal,     presence: true
-    validates :title,    presence: true
+    validates :taskable, presence: true
+    validates :name,    presence: true
     validates :term,     presence: true
     validates :reminder, presence: true
 
@@ -32,11 +33,11 @@ module Flyboy
       self.progress = 0                                    if progress.nil?
     end
 
-    after_save    :update_goal_progress!
-    after_destroy :update_goal_progress!
+    after_save    :update_taskable_progress!
+    after_destroy :update_taskable_progress!
 
-    def update_goal_progress!
-      goal.update_progress!
+    def update_taskable_progress!
+      taskable.try(:update_progress!)
     end
 
     def snooze
@@ -64,8 +65,9 @@ module Flyboy
     def self.to_csv(options = {})
       CSV.generate(options) do |csv|
         csv << [
-          "Dossier",
-          "Avancement dossier",
+          "Taskable",
+          "Type",
+          "Avancement taskable",
           "Tâche",
           "Avancement tâche",
           "Echéance"
@@ -73,9 +75,10 @@ module Flyboy
 
         all.each do |task|
           csv << [
-            task.goal.title,
-            "#{task.goal.progress} %",
-            task.title,
+            task.taskable.name,
+            task.taskable.class.model_name.human,
+            "#{task.taskable.try(:progress)} %",
+            task.name,
             "#{task.progress} %",
             I18n.l(task.term),
           ]

data/app/pdfs/flyboy/roadmap.rb

@@ -21,20 +21,22 @@ module Flyboy
 
     def display_tasks(tasks)
       display = [[
-        "Dossier",
-        "Avancement dossier",
+        "Taskable",
+        "Type",
+        "Avancement taskable",
         "Tâche",
         "Avancement tâche",
         "Echéance"
       ]]
 
-      tasks.each do |t|
+      tasks.each do |task|
         display << [
-          t.goal.title,
-          percentage(t.goal.progress),
-          t.title,
-          percentage(t.progress),
-          I18n.l(t.term)
+          task.taskable.name,
+          task.taskable.class.model_name.human,
+          percentage(task.taskable.try(:progress)),
+          task.name,
+          percentage(task.progress),
+          I18n.l(task.term)
         ]
       end
 

data/app/views/flyboy/goals/_actions.html.slim

@@ -3,7 +3,7 @@
     = read_button goal_path(goal)
 
   - if can?(:create, goal.tasks.new)
-    = create_button new_goal_task_path(goal), text: t("actions.goals.new_task")
+    = create_button new_task_path(taskable_guid: goal.guid), text: t("actions.goals.new_task")
 
   - if can?(:update, goal)
     = update_button edit_goal_path(goal)

data/app/views/flyboy/goals/_context.html.slim

@@ -1,6 +1,8 @@
+- goal = goal || taskable
+
 .goal-context: .context
   = context_icon :tasks
-  = context_title goal.title
+  = context_title goal.name
   = render "flyboy/goals/actions", goal: goal
 
   .infos

data/app/views/flyboy/goals/_form.html.slim

@@ -3,7 +3,7 @@
     = context_icon :tasks
 
     - if @goal.persisted?
-      = context_title "Modifier #{@goal.title}"
+      = context_title "Modifier #{@goal.name}"
       - if can?(:delete, @goal)
         = delete_button goal_path(@goal)
 
@@ -14,7 +14,7 @@
 - content_for :main do
   .well
     = horizontal_form_for [flyboy, @goal] do |f|
-      = f.input :title
+      = f.input :name
       = f.input :description
 
       = form_buttons

data/app/views/flyboy/goals/_list.html.slim

@@ -2,7 +2,7 @@ table
   thead
     tr
       th
-        = sortable_column Flyboy::Goal.model_name.human, column: "title"
+        = sortable_column Flyboy::Goal.model_name.human, column: "name"
       th.hidden-xs
         = sortable_column Flyboy::Goal.human_attribute_name(:progress), column: "progress"
       th.hidden-xs
@@ -13,11 +13,11 @@ table
   tbody
     - goals.each do |goal|
       tr.goal class=goal_color(goal)
-        td.title
+        td.name
           - if can? :read, goal
-            = link_to goal.title, goal_path(goal)
+            = link_to goal.name, goal_path(goal)
           - else
-            = goal.title
+            = goal.name
 
         td.goal_progress.hidden-xs
           = progress_bar percentage: goal.progress, label: true
@@ -26,5 +26,5 @@ table
           = t("messages.goals.status.#{goal.status}")
 
         td.actions
-          - if can? :create, Flyboy::Task.new(goal: goal)
-            = create_button flyboy.new_goal_task_path(goal), text: t("actions.goals.new_task")
+          - if can? :create, Flyboy::Task.new(taskable: goal)
+            = create_button flyboy.new_task_path(taskable_guid: goal.guid), text: t("actions.goals.new_task")

data/app/views/flyboy/tasks/_context.html.slim

@@ -1,6 +1,6 @@
 .task-context: .context
   = context_icon :check_square_o
-  = context_title task.title
+  = context_title task.name
   = render "flyboy/tasks/actions", task: task
 
   .infos

data/app/views/flyboy/tasks/_form.html.slim

@@ -3,24 +3,26 @@
     = context_icon :check_square_o
 
     - if @task.persisted?
-      = context_title "Modifier #{@task.title}"
+      = context_title "Modifier #{@task.name}"
       - if can?(:delete, @task)
         = delete_button task_path(@task)
 
     - else
       = context_title "Nouvelle tâche"
 
-  = render "flyboy/goals/context", goal: @task.goal
+  - if can?(:read, @task.taskable)
+    = render "#{@task.taskable.class.to_s.tableize}/context", taskable: @task.taskable
 
 - content_for :main do
   .well
     = horizontal_form_for @task do |f|
-      = f.input :title
+      = f.input :name
       = f.input :description
       = f.input :reminder, html5: true
       = f.input :term,     html5: true
 
-      = f.hidden_field :goal_id
+      = f.hidden_field :taskable_id
+      = f.hidden_field :taskable_type
 
       = form_buttons
 

data/app/views/flyboy/tasks/_list.html.slim

@@ -3,9 +3,9 @@ table
     tr
       - unless nested
         th.hidden-xs
-          = sortable_column Flyboy::Goal.model_name.human, column: "goal"
+          = sortable_column Flyboy::Task.human_attribute_name(:taskable), column: "taskable"
       th
-        = sortable_column Flyboy::Task.model_name.human, column: "title"
+        = sortable_column Flyboy::Task.model_name.human, column: "name"
       th.hidden-xs
         = sortable_column Flyboy::Task.human_attribute_name(:progress), column: "progress"
       th.hidden-xs
@@ -17,17 +17,17 @@ table
     - tasks.each do |task|
       tr.task id="task_#{task.id}" class=task_color(task)
         - unless nested
-          td.goal.hidden-xs
-            - if can?(:read, task.goal)
-              = link_to task.goal.title, goal_path(task.goal)
+          td.taskable.hidden-xs
+            - if can?(:read, task.taskable)
+              = link_to task.taskable.name, engine_polymorphic_path(task.taskable)
             - else
-              = task.goal.title
+              = task.taskable.name
 
-        td.title
+        td.name
           - if can?(:read, task)
-            = link_to task.title, task_path(task)
+            = link_to task.name, flyboy.task_path(task)
           - else
-            = task.title
+            = task.name
 
         td.task_progress.hidden-xs
           = progress_bar percentage: task.progress, label: true
@@ -37,7 +37,7 @@ table
 
         td.actions
           - if can?(:snooze, task)
-            = snooze_button snooze_task_path(task)
+            = snooze_button flyboy.snooze_task_path(task)
 
           - if can?(:complete, task)
-            = complete_button complete_task_path(task)
+            = complete_button flyboy.complete_task_path(task)