dorsale 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf39d83e50a2963807161d6cc2896f269947da7
-  data.tar.gz: 06d508c738ad9c9361995e9d726a83d6ecf1874e
+  metadata.gz: a2ce58fec961cacf7e83f9b5ea1034a7db88d21c
+  data.tar.gz: d8d7488a371a24c098c84803df4aeb5be9add404
 SHA512:
-  metadata.gz: 9efee4dff01582b2cae6a99200d02df2334fc278ac1772668b71f5ccf518c1c53108d939ba04ba6b1db232c1dc8873edb1cedc73d2789a103478953d06dfdc30
-  data.tar.gz: ca3c27fff0fda94b76be45d8936e851a1b54ff936f1f23f1991be945b02fc42e7838a481de1458752fc936a444b22b1a72e2f52164378d16b146f92142600896
+  metadata.gz: 725615666707ce827f2d2437fcd233edc031a0b5fff7449841cdbf3147714201e70de2401ed29b2f8db8e6700deac717f60f113f8ff3fefd13ee57173d4e4d04
+  data.tar.gz: 2a109068d2b0695d1205ab6ce504c6d1245c3f23a136cb1eeee8e3810c4d044f036d3abbd3fed8632118c88385d9c1d6ad9493f792f1ce2854f5f63dd63b6f3e

data/Rakefile

@@ -22,10 +22,17 @@ load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
 
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-require 'rspec/core'
-require 'rspec/core/rake_task'
 
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task :default => :spec
+if Rails.env.test?
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
+
+  desc "Run all specs in spec directory (excluding plugin specs)"
+  RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+
+  task :default => :spec
+else
+  require File.expand_path('../spec/dummy/config/application', __FILE__)
+  Rails.application.load_tasks
+end

data/app/assets/javascripts/dorsale/forms.coffee

@@ -2,8 +2,8 @@ $(document).on "ready page:load", ->
   $("button.reset").click ->
     form = $(this).parents("form")
 
-    form.find("option").map ->
-      this.selected = true if this.value == ""
+    form.find("select option:first-child").map ->
+      this.selected = true
 
     form.find("input").map ->
       this.value = "" unless this.type.match(/submit|hidden|button/)

data/app/controllers/dorsale/application_controller.rb

@@ -1,4 +1,7 @@
 module Dorsale
   class ApplicationController < ::ApplicationController
+    def current_user_scope
+      @current_user_scope ||= UserScope.new(current_user)
+    end
   end
 end

data/app/controllers/dorsale/billing_machine/application_controller.rb

@@ -1,6 +1,6 @@
 module Dorsale
   module BillingMachine
-    class ApplicationController < ::ApplicationController
+    class ApplicationController < ::Dorsale::ApplicationController
       before_filter :set_common_variables
 
       private

data/app/controllers/dorsale/comments_controller.rb

@@ -2,7 +2,7 @@ module Dorsale
   class CommentsController < ApplicationController
     def create
       @comment = Comment.new(comment_params)
-      @comment.user = try(:current_user)
+      @comment.author = try(:current_user)
 
       authorize! :create, @comment
 

data/app/controllers/dorsale/customer_vault/application_controller.rb

@@ -1,6 +1,6 @@
 module Dorsale
   module CustomerVault
-    class ApplicationController < ::ApplicationController
+    class ApplicationController < ::Dorsale::ApplicationController
       handles_sortable_columns
 
       helper ::Dorsale::Flyboy::ApplicationHelper

data/app/controllers/dorsale/customer_vault/corporations_controller.rb

@@ -15,7 +15,7 @@ module Dorsale
       def new
         authorize! :create, ::Dorsale::CustomerVault::Corporation
 
-        @corporation ||= ::Dorsale::CustomerVault::Corporation.new
+        @corporation ||= current_user_scope.new_corporation
 
         @corporation.build_address if @corporation.address.nil?
       end
@@ -23,7 +23,7 @@ module Dorsale
       def create
         authorize! :create, ::Dorsale::CustomerVault::Corporation
 
-        @corporation ||= ::Dorsale::CustomerVault::Corporation.new(corporation_params)
+        @corporation ||= current_user_scope.new_corporation(corporation_params)
 
         if @corporation.save
           flash[:notice] = t("messages.corporations.create_ok")

data/app/controllers/dorsale/customer_vault/individuals_controller.rb

@@ -15,7 +15,7 @@ module Dorsale
       def new
         authorize! :create, ::Dorsale::CustomerVault::Individual
 
-        @individual ||= ::Dorsale::CustomerVault::Individual.new
+        @individual ||= current_user_scope.new_individual
         @individual.build_address if @individual.address.nil?
 
         @tags ||= customer_vault_tag_list
@@ -32,7 +32,7 @@ module Dorsale
       def create
         authorize! :create, ::Dorsale::CustomerVault::Individual
 
-        @individual ||= ::Dorsale::CustomerVault::Individual.new(individual_params)
+        @individual ||= current_user_scope.new_individual(individual_params)
 
         if @individual.save
           flash[:notice] = t("messages.individuals.create_ok")

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -12,8 +12,8 @@ module Dorsale
 
         @filters      ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(cookies)
         @tags         ||= customer_vault_tag_list
-        @individuals  ||= ::Dorsale::CustomerVault::Individual.search(params[:q])
-        @corporations ||= ::Dorsale::CustomerVault::Corporation.search(params[:q])
+        @individuals  ||= current_user_scope.individuals.search(params[:q])
+        @corporations ||= current_user_scope.corporations.search(params[:q])
 
         if params[:q].blank?
           @individuals  = @filters.apply(@individuals)
@@ -30,7 +30,7 @@ module Dorsale
       def activity
         authorize! :list, Person
 
-        @comments ||= Dorsale::Comment
+        @comments ||= current_user_scope.comments
           .where("commentable_type LIKE ?", "%CustomerVault%")
           .order("created_at DESC, id DESC")
 

data/app/controllers/dorsale/flyboy/application_controller.rb

@@ -1,6 +1,6 @@
 module Dorsale
   module Flyboy
-    class ApplicationController < ::ApplicationController
+    class ApplicationController < ::Dorsale::ApplicationController
       handles_sortable_columns
 
       helper ::Dorsale::CustomerVault::ApplicationHelper

data/app/controllers/dorsale/flyboy/folders_controller.rb

@@ -13,7 +13,7 @@ module Dorsale
       def index
         authorize! :list, Folder
 
-        @folders ||= Folder.all
+        @folders ||= current_user_scope.folders
 
         @order ||= sortable_column_order do |column, direction|
           case column
@@ -40,13 +40,13 @@ module Dorsale
       end
 
       def new
-        @folder ||= Folder.new
+        @folder ||= current_user_scope.new_folder
 
         authorize! :create, @folder
       end
 
       def create
-        @folder ||= Folder.new(folder_params)
+        @folder ||= current_user_scope.new_folder(folder_params)
 
         authorize! :create, @folder
 
@@ -86,6 +86,8 @@ module Dorsale
       end
 
       def open
+        authorize! :open, @folder
+
         if @folder.open!
           flash[:success] = t("messages.folders.open_ok")
         else
@@ -96,6 +98,8 @@ module Dorsale
       end
 
       def close
+        authorize! :close, @folder
+
         if @folder.close!
           flash[:success] = t("messages.folders.close_ok")
         else

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -3,6 +3,8 @@ module Dorsale
     class TaskCommentsController < ::Dorsale::Flyboy::ApplicationController
       def create
         @task_comment ||= TaskComment.new(task_comment_params)
+        @task_comment.author = current_user
+
         @task = @task_comment.task
 
         authorize! :update, @task

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -13,7 +13,7 @@ module Dorsale
       def index
         authorize! :list, Task
 
-        @tasks ||= Task.all.includes(:taskable)
+        @tasks ||= current_user_scope.tasks
 
         @order ||= sortable_column_order do |column, direction|
           case column
@@ -38,11 +38,13 @@ module Dorsale
         @tasks = @filters.apply(@tasks)
         @tasks = @tasks.search(params[:q])
 
-        if @order.is_a?(Proc)
+        if @order.is_a?(Proc) # when sorting by a polymorphic attribute
           @tasks = @tasks.sort(&@order)
+          @tasks_without_pagination = @tasks
           @tasks = Kaminari.paginate_array(@tasks).page(params[:page])
         else
           @tasks = @tasks.order(@order)
+          @tasks_without_pagination = @tasks
           @tasks = @tasks.page(params[:page])
         end
 
@@ -50,7 +52,7 @@ module Dorsale
           format.html
 
           format.csv do
-            send_data @tasks.to_csv,
+            send_data @tasks_without_pagination.to_csv,
               filename:    "feuille_de_route_#{Date.today}.csv",
               disposition: "attachment"
           end
@@ -58,7 +60,7 @@ module Dorsale
           format.xls
 
           format.pdf do
-            pdf = Roadmap.new(@tasks)
+            pdf = Roadmap.new(@tasks_without_pagination)
             pdf.build
             send_data pdf.render,
               filename:    "feuille_de_route_#{Date.today}.pdf",
@@ -75,18 +77,20 @@ module Dorsale
       end
 
       def new
-        @task = Task.new
+        @task = current_user_scope.new_task
         @task.taskable_guid = params[:taskable_guid]
+        @owners ||= current_user_scope.colleagues(@task.taskable)
 
         authorize! :create, @task
       end
 
       def edit
         authorize! :update, @task
-       end
+        @owners ||= current_user_scope.colleagues(@task.taskable)
+      end
 
       def create
-        @task ||= Task.new(task_params)
+        @task ||= current_user_scope.new_task(task_params)
 
         authorize! :create, @task
 
@@ -127,7 +131,8 @@ module Dorsale
         @task_comment ||= @task.comments.new(
           :progress    => 100,
           :description => t("messages.tasks.complete_ok"),
-          :date        => DateTime.now
+          :date        => DateTime.now,
+          :author      => current_user
         )
 
         if @task_comment.save
@@ -159,7 +164,7 @@ module Dorsale
       end
 
       def permitted_params
-        [:taskable_id, :taskable_type, :name, :description, :progress, :term, :reminder]
+        [:taskable_id, :taskable_type, :name, :description, :progress, :term, :reminder, :owner_guid]
       end
 
       def task_params

data/app/models/dorsale/comment.rb

@@ -1,8 +1,9 @@
 module Dorsale
   class Comment < ActiveRecord::Base
-    belongs_to :user
+    belongs_to :author, polymorphic: true
     belongs_to :commentable, polymorphic: true
 
+    validates :author,      presence: true
     validates :commentable, presence: true
     validates :text,        presence: true
 

data/app/models/dorsale/flyboy/small_data/filter_for_tasks.rb

@@ -3,7 +3,8 @@ module Dorsale
     module SmallData
       class FilterForTasks < ::Dorsale::SmallData::Filter
         STRATEGIES = {
-          'status' => FilterStrategyByDone.new("tasks")
+          'status' => FilterStrategyByDone.new("tasks"),
+          'owner' => FilterStrategyByOwner.new("tasks")
         }
 
         def strategy key

data/app/models/dorsale/flyboy/small_data/filter_strategy_by_owner.rb

@@ -0,0 +1,11 @@
+module Dorsale
+  module Flyboy
+    module SmallData
+      class FilterStrategyByOwner < Dorsale::SmallData::FilterStrategy
+        def do_apply(query)
+          query.where(owner_id: @value)
+        end
+      end
+    end
+  end
+end

data/app/models/dorsale/flyboy/task.rb

@@ -11,8 +11,16 @@ module Dorsale
       paginates_per 50
 
       belongs_to :taskable, polymorphic: true
+      belongs_to :owner, polymorphic: true
       has_many :comments, class_name: ::Dorsale::Flyboy::TaskComment, inverse_of: :task, dependent: :destroy
       polymorphic_id_for :taskable
+      polymorphic_id_for :owner
+
+      scope :delayed, -> { where('term < ?', Date.today).where(done: false)}
+      scope :today, -> { where('term = ?', Date.today).where(done: false)}
+      scope :tomorrow, -> { where('term = ?', Date.tomorrow).where(done: false)}
+      scope :this_week, -> { where('term > ?', Date.tomorrow).where('term <= ?', Date.today.end_of_week).where(done: false)}
+      scope :next_week, -> { where('term > ?', Date.today.end_of_week).where('term <= ?', (Date.today.end_of_week+1).end_of_week).where(done: false)}
 
       validates :taskable, presence: true
       validates :name,    presence: true

data/app/models/dorsale/flyboy/task_comment.rb

@@ -4,11 +4,13 @@ module Dorsale
       self.table_name = "dorsale_flyboy_task_comments"
 
       belongs_to :task
+      belongs_to :author, polymorphic: true
 
+      validates :author,      presence: true
       validates :task,        presence: true
       validates :date,        presence: true
       validates :description, presence: true
-      validates :progress, inclusion: {in: 0..100}
+      validates :progress,    inclusion: {in: 0..100}
 
       default_scope -> { order("created_at DESC") }
 

data/app/models/dorsale/user_scope.rb

@@ -0,0 +1,54 @@
+class Dorsale::UserScope
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+
+  # Common
+
+  def colleagues(context = nil)
+    raise NotImplementedError
+  end
+
+  def comments
+    raise NotImplementedError
+  end
+
+  # Flyboy
+
+  def folders
+    raise NotImplementedError
+  end
+
+  def new_folder(attributes = {})
+    raise NotImplementedError
+  end
+
+  def tasks
+    raise NotImplementedError
+  end
+
+  def new_task(attributes = {})
+    raise NotImplementedError
+  end
+
+  # Customer Vault
+
+  def individuals
+    raise NotImplementedError
+  end
+
+  def new_individual(attributes = {})
+    raise NotImplementedError
+  end
+
+  def corporations
+    raise NotImplementedError
+  end
+
+  def new_corporation(attributes = {})
+    raise NotImplementedError
+  end
+
+end

data/app/views/dorsale/billing_machine/invoices/_list.html.slim

@@ -1,12 +1,23 @@
 table.default.invoices
-  thread
+  thead
     tr
-      th = ::Dorsale::BillingMachine::Invoice.t(:date)
-      th = ::Dorsale::BillingMachine::Invoice.t(:tracking_id)
-      th = ::Dorsale::BillingMachine::Invoice.t(:customer)
-      th = ::Dorsale::BillingMachine::Invoice.t(:total_duty)
-      th = ::Dorsale::BillingMachine::Invoice.t(:total_all_taxes)
-      th = t("actions.actions")
+      th.hidden-sm.hidden-xs.date
+        = ::Dorsale::BillingMachine::Invoice.t(:date)
+
+      th.hidden-sm.hidden-md.hidden-xs
+        = ::Dorsale::BillingMachine::Invoice.t(:tracking_id)
+
+      th
+        = ::Dorsale::BillingMachine::Invoice.t(:customer)
+
+      th
+        = ::Dorsale::BillingMachine::Invoice.t(:total_duty)
+
+      th.hidden-xs
+        = ::Dorsale::BillingMachine::Invoice.t(:total_all_taxes)
+
+      th
+        = t("actions.actions")
 
   tbody
     - invoices.each do |invoice|