dorsale 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d434a4d088da9d112016b8b105a585e3c6ab6d5d
-  data.tar.gz: 8e168b8193bba3d7ed57847a461feebd36b3e0d8
+  metadata.gz: 56df4e99e7f2c43e981701c129cb9f16cd795730
+  data.tar.gz: bf0eccdda5b712abbf01deffc58ae3146daa0499
 SHA512:
-  metadata.gz: c7ab336441e22590d30bc06da433455fddfed6579cce0ab693f59bb243e073ebfd1ec29afdb631373abcea83b3cd650edb05c0a4f0dbc8e99742a03702d380d5
-  data.tar.gz: 8d4c15c6f3adf0c3a0375f451e03643f8a0b415ab33195e0dd862a7da9ae89ed8ba961b9c2bdfcfd7f5fb57fdc9c4241270cd93513aac610ece2d7f8ca14b72d
+  metadata.gz: 2471402877909fd94ad6bb27d0eba98cc362e6cb225c40e73e55e58a7a30654f36f67b2294919f02d3897aafab5a99742b541b733176ee6d66c4ce11d00cd0e4
+  data.tar.gz: 52908cd5f86c3f8b757a6ecc644970e0e727746165cbe1c213d9c9ec5cf91af7f81eb2e7e7f76ef852ce67ad275b8c48f48a0de89a746735c072a84df20fae19

data/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 Nothing.
 
+## 3.4.0
+
+- Delete Flyboy folders
+- Add `link_to_object` helper
+- Change/fix expense states (new -> draft, submited -> submitted)
+- Persist invoice/quotation PDFs after save
+- Add concerns to ApplicationRecord and stop pollute ActiveRecord::Base
+- Replace abandoned gem handles_sortable_columns
+
 ## 3.3.0
 
 - Add download of all invoices in pdf

data/app/assets/stylesheets/dorsale/engines/flyboy.sass

@@ -21,10 +21,6 @@
   td.actions
     width: 5em
 
-  td.folder-status
-    width: 5em
-    white-space: nowrap
-
   td.task-status,
   td.task-snooze,
     width: 3em
@@ -40,7 +36,6 @@
     overflow: hidden
 
   td.task-progress,
-  td.folder-progress,
   td.taskable-progress,
   td.task_comment-progress,
     width: 150px
@@ -53,10 +48,8 @@
       margin: 0
       padding: 0
 
-  td.folder-status,
   td.task-status,
   td.task-snooze,
-  td.folder-status a,
   td.task-status a,
   td.task-snooze a,
   td.task-term,

data/app/controllers/dorsale/alexandrie/attachments_controller.rb

@@ -24,6 +24,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     authorize @attachment, :create?
 
     if @attachment.save
+      notify_attachable
       # flash[:notice] = t("messages.attachments.create_ok")
     else
       flash[:alert] = t("messages.attachments.create_error")
@@ -44,6 +45,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     authorize @attachment, :update?
 
     if @attachment.update(attachment_params_for_update)
+      notify_attachable
       # flash[:notice] = t("messages.attachments.update_ok")
     else
       flash[:alert] = t("messages.attachments.update_error")
@@ -56,6 +58,7 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     authorize @attachment, :delete?
 
     if @attachment.destroy
+      notify_attachable
       # flash[:notice] = t("messages.attachments.delete_ok")
     else
       flash[:alert] = t("messages.attachments.delete_error")
@@ -132,4 +135,8 @@ class Dorsale::Alexandrie::AttachmentsController < ::Dorsale::ApplicationControl
     end
   end
 
+  def notify_attachable
+    @attachment.attachable.send(:try, :after_attachments_changes)
+  end
+
 end

data/app/controllers/dorsale/application_controller.rb

@@ -1,6 +1,7 @@
 class Dorsale::ApplicationController < ::ApplicationController
   include Pundit
   include Dorsale::BackUrlConcern
+  include Dorsale::SortingHelper
 
   after_action :verify_authorized
   after_action :verify_policy_scoped

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

@@ -39,6 +39,7 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     authorize model, :create?
 
     if @invoice.save
+      Dorsale::BillingMachine::PdfFileGenerator.(@invoice)
       flash[:notice] = t("messages.invoices.create_ok")
       redirect_to default_back_url
     else
@@ -78,6 +79,7 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     authorize @invoice, :update?
 
     if @invoice.update(invoice_params_for_update)
+      Dorsale::BillingMachine::PdfFileGenerator.(@invoice)
       flash[:notice] = t("messages.invoices.update_ok")
       redirect_to default_back_url
     else

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

@@ -39,6 +39,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     authorize @quotation, :create?
 
     if @quotation.save
+      Dorsale::BillingMachine::PdfFileGenerator.(@quotation)
       flash[:notice] = t("messages.quotations.create_ok")
       redirect_to default_back_url
     else
@@ -67,6 +68,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     authorize @quotation, :update?
 
     if @quotation.update(quotation_params_for_update)
+      Dorsale::BillingMachine::PdfFileGenerator.(@quotation)
       flash[:notice] = t("messages.quotations.update_ok")
       redirect_to default_back_url
     else

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

@@ -1,8 +1,4 @@
 class Dorsale::CustomerVault::ApplicationController < ::Dorsale::ApplicationController
-  handles_sortable_columns
-
-  helper ::Dorsale::Flyboy::ApplicationHelper
-
   before_action :set_form_variables, only: [
     :new,
     :create,

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

@@ -1,6 +1,4 @@
 class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::ApplicationController
-  handles_sortable_columns
-
   before_action :set_objects
 
   def index

data/app/controllers/dorsale/expense_gun/expenses_controller.rb

@@ -74,8 +74,8 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
   def submit
     authorize @expense, :submit?
 
-    @expense.go_to_submited!
-    flash[:success] = t("expense_gun.expense.messages.submited")
+    @expense.go_to_submitted!
+    flash[:success] = t("expense_gun.expense.messages.submitted")
     redirect_to dorsale.expense_gun_expenses_path
   end
 

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

@@ -1,5 +1,2 @@
 class Dorsale::Flyboy::ApplicationController < ::Dorsale::ApplicationController
-  handles_sortable_columns
-
-  helper ::Dorsale::CustomerVault::ApplicationHelper
 end

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

@@ -23,9 +23,9 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
         %(dorsale_flyboy_tasks.#{column} #{direction})
       when "taskable"
         if direction == :asc
-          proc { |a, b| a.taskable.name.downcase <=> b.taskable.name.downcase }
+          proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
         else
-          proc { |a, b| b.taskable.name.downcase <=> a.taskable.name.downcase }
+          proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
         end
       else
         params["sort"] = "term"
@@ -160,12 +160,6 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
     end
   end
 
-  def back_url
-    url = super
-    url << "#tasks" if url.include?("customer_vault")
-    url
-  end
-
   def notify_owner(author, task)
     return if author == task.owner
     return if task.owner.nil?

data/app/helpers/dorsale/all_helpers.rb

@@ -11,6 +11,7 @@ module Dorsale::AllHelpers
   include ::Dorsale::RoutesHelper
   include ::Dorsale::TextHelper
   include ::Dorsale::BootstrapHelper
+  include ::Dorsale::SortingHelper
 
   include ::Dorsale::Alexandrie::AttachmentsHelper
   include ::Dorsale::BillingMachine::ApplicationHelper

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -1,6 +1,4 @@
 module Dorsale::Flyboy::ApplicationHelper
-  include ::Handles::SortableColumns::InstanceMethods
-
   def tasks_for(taskable)
     @filters = ::Dorsale::Flyboy::SmallData::FilterForTasks.new(cookies)
 
@@ -34,18 +32,11 @@ module Dorsale::Flyboy::ApplicationHelper
     return "onwarning"
   end
 
-  def folder_color(folder)
-    return "onalert"   if ::Dorsale::Flyboy::Task.where(taskable: folder).where('done = ? AND term < ?', false, Time.zone.now.to_date).count > 0
-    return "onwarning" if ::Dorsale::Flyboy::Task.where(taskable: folder).where('done = ? AND term > ? AND reminder < ?', false, Time.zone.now.to_date, Time.zone.now.to_date).count > 0
-    return "finished"  if folder.closed?
-    return "ontime"
-  end
-
   def flyboy_status_for_filters_select
     {
-      Dorsale::Flyboy::Folder.t("status.all")    => "",
-      Dorsale::Flyboy::Folder.t("status.open")   => "open",
-      Dorsale::Flyboy::Folder.t("status.closed") => "closed",
+      Dorsale::Flyboy::Task.t("status.all")    => "",
+      Dorsale::Flyboy::Task.t("status.open")   => "open",
+      Dorsale::Flyboy::Task.t("status.closed") => "closed",
     }
   end
 

data/app/helpers/dorsale/link_helper.rb

@@ -1,4 +1,14 @@
 module Dorsale::LinkHelper
+  def link_to_object(obj, options = {})
+    return if obj.nil?
+
+    if policy(obj).read?
+      link_to(obj.to_s, engine_polymorphic_path(obj), options)
+    else
+      obj.to_s
+    end
+  end
+
   def icon_link_to(icon, name, options = nil, html_options = nil, &block)
     name = "#{icon(icon)} #{name}".html_safe
     link_to(name, options, html_options, &block)

data/app/helpers/dorsale/sorting_helper.rb

@@ -0,0 +1,48 @@
+module Dorsale::SortingHelper
+  def sortable_column(name, column)
+    unless column.is_a?(Symbol)
+      raise ArgumentError, "invalid column, please use symbol"
+    end
+
+    current_column, current_order = sortable_column_order
+
+    if current_column == column.to_s
+      if current_order == :asc
+        name           = "#{name} ↓"
+        new_sort_param = "-#{column}"
+      end
+
+      if current_order == :desc
+        name           = "#{name} ↑"
+        new_sort_param = column
+      end
+
+      klass = "sort #{current_order}"
+    else
+      new_sort_param = column
+      klass          = "sort"
+    end
+
+    link_to(name, params.merge(sort: new_sort_param), class: klass)
+  end
+
+  def sortable_column_order
+    sort_param = params[:sort].to_s
+
+    if sort_param.present?
+      if sort_param.start_with?("-")
+        column = sort_param[1..-1]
+        order  = :desc
+      else
+        column = sort_param
+        order  = :asc
+      end
+    end
+
+    if block_given?
+      yield(column, order)
+    else
+      [column, order]
+    end
+  end
+end

data/app/mailers/dorsale/billing_machine/invoice_mailer.rb

@@ -1,6 +1,6 @@
 class Dorsale::BillingMachine::InvoiceMailer < ::Dorsale::ApplicationMailer
   def send_invoice_to_customer(invoice, subject, body, sender = nil)
-    attachments["#{invoice.t}_#{invoice.tracking_id}.pdf"] = invoice.to_pdf
+    attachments["#{invoice.t}_#{invoice.tracking_id}.pdf"] = invoice.pdf_file.read
 
     mail(
       :to       => invoice.customer.email,

data/app/models/concerns/dorsale/model_i18n.rb

@@ -0,0 +1,25 @@
+module Dorsale::ModelI18n
+  extend ActiveSupport::Concern
+
+  def t(*args)
+    self.class.t(*args)
+  end
+
+  def ts
+    self.class.ts
+  end
+
+  class_methods do
+    def t(*args)
+      if args.any?
+        human_attribute_name(*args)
+      else
+        model_name.human
+      end
+    end
+
+    def ts
+      model_name.human(count: 2)
+    end
+  end # class_methods
+end # Dorsale::ModelI18n

data/app/models/concerns/dorsale/model_to_s.rb

@@ -0,0 +1,9 @@
+module Dorsale::ModelToS
+  def to_s
+    %w(name title label).map do |m|
+      return send(m) if respond_to?(m)
+    end
+
+    super
+  end
+end

data/{lib → app/models/concerns}/dorsale/polymorphic_id.rb

@@ -1,7 +1,7 @@
 module Dorsale::PolymorphicId
   extend ActiveSupport::Concern
-  included do
 
+  included do
     def self.polymorphic_id_for(relation_name)
       module_src = File.read(__FILE__).split("__END__").last
       module_src = module_src.gsub("relation", relation_name.to_s)
@@ -16,8 +16,6 @@ module Dorsale::PolymorphicId
   end # included
 end # module
 
-ActiveRecord::Base.send(:include, Dorsale::PolymorphicId)
-
 # __END__
 
 Module.new do

data/app/models/concerns/dorsale/search.rb

@@ -0,0 +1,30 @@
+module Dorsale::Search
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def default_search_fields
+      fields = columns.map do |column|
+        "#{table_name}.#{column.name}"
+      end
+    end # def default_search_fields
+
+    def search(q, *fields)
+      words  = q.to_s.parameterize.split("-")
+      fields = default_search_fields if fields.empty?
+
+      sql_query = words.map.with_index do |word, index|
+        fields.map do |field|
+          "(LOWER(CAST(#{field} AS TEXT)) LIKE :w#{index})"
+        end.join(" OR ")
+      end.map{ |e| "(#{e})" }.join(" AND ")
+
+      sql_params_a = words.map.with_index do |word, index|
+        ["w#{index}".to_sym, "%#{word}%"]
+      end
+
+      sql_params_h = Hash[sql_params_a]
+
+      self.where(sql_query, sql_params_h)
+    end # def search
+  end # class_methods
+end # class Dorsale::Search

data/app/models/dorsale/alexandrie/attachment.rb

@@ -11,18 +11,12 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
 
   mount_uploader :file, ::Dorsale::Alexandrie::FileUploader
 
-  before_save :assign_default_name
-
   default_scope -> {
     all
       .order(created_at: :desc, id: :desc)
       .preload(:attachment_type)
   }
 
-  def assign_default_name
-    self.name = file_identifier if name.blank?
-  end
-
   def download_filename
     if File.extname(file_identifier) == File.extname(name)
       name
@@ -31,4 +25,11 @@ class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
     end
   end
 
+  private
+
+  before_save :assign_default_name
+
+  def assign_default_name
+    self.name = file_identifier if name.blank?
+  end
 end

data/app/models/dorsale/application_record.rb

@@ -1,8 +1,14 @@
+require "dorsale/search"
+
 class Dorsale::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
   include Dorsale::ActiveRecordUUIDConcern
   include Dorsale::DefaultValuesConcern
+  include Dorsale::ModelToS
+  include Dorsale::ModelI18n
+  include Dorsale::PolymorphicId
+
   nilify_blanks
 
   def self.last_created

data/app/models/dorsale/billing_machine/invoice.rb

@@ -11,6 +11,8 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
 
   polymorphic_id_for :customer
 
+  mount_uploader :pdf_file, ::Dorsale::PdfUploader
+
   validates :id_card, presence: true
   validates :date,    presence: true
 
@@ -138,10 +140,4 @@ class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   def balance=(*); super; end
   private :balance=
 
-  def to_pdf
-    ::Dorsale::BillingMachine.invoice_pdf_model.new(self)
-      .tap(&:build)
-      .render
-  end
-
 end