dorsale 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54b00176fd73832f860580c1b29c2df10ced1e7
-  data.tar.gz: 54b8d3ab4d7c7313ccbc5d7bff8cde201f0923da
+  metadata.gz: ab35fd3bd7ff911c82f7cf26249d46ec366f7343
+  data.tar.gz: f059076ae48a78dfdaa084a0b98a69a767f5ac50
 SHA512:
-  metadata.gz: 08994ede1ad737173a99aead508f6396f7e9641b239250ba4f9ac7a166ccdb569881a1e84df431fb46b907f7bdbc41e0303b5af9b98386300d70a60f601e803b
-  data.tar.gz: afcda582c1ca6f92f428f49b9542e24a9771c93af65aaf69ab0591530f111e52bc72f2fcfdf6f268f2ff5272c097912e323f8ceb6c5b713a3531fa0cbf5a4438
+  metadata.gz: 1271a885eb35373f63da05c7770e97d9843734d17e6383c990a9575c351b413160b7d7794fbd7137a60adc46255ffc18f47441a635c3b0d251239552c5bfe428
+  data.tar.gz: 6cac76a354bdd85720155cac90c37c70e74acd938a5d7ae53083454fcd2ceafc5f11102124f78eaacb5fe51dfbaa5927b4e2a55bca41d978b0ad338b617f3f82

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1.5
+
+- Move filters to app/filters
+- Tags refactor
+- Rename `person_tags` helper to `tags`
+
 ## 3.1.4
 
 - Add attachment types

data/app/assets/javascripts/dorsale/common/tags.coffee

@@ -0,0 +1,15 @@
+$(document).on "ready turbolinks:load page:load", ->
+  $("form:not([action*=filters]) select[multiple][name*=tag]").not(".select2-hidden-accessible").map ->
+    placeholder = $(this).attr("placeholder")
+
+    $(this).select2
+      tags: true
+      placeholder: placeholder
+
+
+  $(".filters select[multiple][name*=tag]").not(".select2-hidden-accessible").map ->
+    placeholder = $(this).attr("placeholder")
+
+    $(this).select2
+      tags: false
+      placeholder: placeholder

data/app/assets/javascripts/dorsale/engines/customer_vault.coffee

@@ -1,15 +0,0 @@
-$(document).on "ready turbolinks:load page:load", ->
-  $(".customer_vault form:not([action*=filters]) select[name*=tag]").not(".select2-hidden-accessible").map ->
-    placeholder = $(this).attr("placeholder")
-
-    $(this).select2
-      tags: true
-      placeholder: placeholder
-
-
-  $(".customer_vault .filters select[name*=tag]").not(".select2-hidden-accessible").map ->
-    placeholder = $(this).attr("placeholder")
-
-    $(this).select2
-      tags: false
-      placeholder: placeholder

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

@@ -13,7 +13,7 @@ class Dorsale::CustomerVault::ApplicationController < ::Dorsale::ApplicationCont
   private
 
   def customer_vault_tag_list
-    ActsAsTaggableOn::Tag.order(:name).map(&:to_s)
+    Dorsale::TagListForModel.(Dorsale::CustomerVault::Person)
   end
 
   def set_form_variables

data/app/{models → filters}/dorsale/customer_vault/small_data/filter_for_people.rb

@@ -1,6 +1,6 @@
 class Dorsale::CustomerVault::SmallData::FilterForPeople < ::Dorsale::SmallData::Filter
   STRATEGIES = {
     "person_type" => ::Dorsale::SmallData::FilterStrategyByKeyValue.new(:type),
-    "person_tags" => ::Dorsale::CustomerVault::SmallData::FilterStrategyByTags.new,
+    "person_tags" => ::Dorsale::SmallData::FilterStrategyByTags.new,
   }
 end

data/app/{models/dorsale/customer_vault → filters/dorsale}/small_data/filter_strategy_by_tags.rb

@@ -1,4 +1,4 @@
-class Dorsale::CustomerVault::SmallData::FilterStrategyByTags < ::Dorsale::SmallData::FilterStrategy
+class Dorsale::SmallData::FilterStrategyByTags < ::Dorsale::SmallData::FilterStrategy
   def apply(query, value)
     value = [*value].flatten.select{ |v| v.present? }
 

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

@@ -1,14 +1,4 @@
 module Dorsale::CustomerVault::ApplicationHelper
-  def person_tags(person)
-    return "" if person.tag_list.empty?
-
-    person.tag_list.map { |tag|
-      content_tag(:span, class: "tag label label-primary"){
-        "#{icon :tag} #{tag}".html_safe
-      }
-    }.join(" ").html_safe
-  end
-
   def customer_vault_link_form_path(person = @person, link = @link)
     if link.new_record?
       customer_vault_person_links_path(person, link)

data/app/helpers/dorsale/text_helper.rb

@@ -103,4 +103,14 @@ module Dorsale::TextHelper
     end
   end # def info
 
+  def tags(object)
+    return "" if object.tag_list.empty?
+
+    object.tag_list.map { |tag|
+      content_tag(:span, class: "tag label label-primary"){
+        "#{icon :tag} #{tag}".html_safe
+      }
+    }.join(" ").html_safe
+  end
+
 end

data/app/services/dorsale/tag_list_for_model.rb

@@ -0,0 +1,14 @@
+class Dorsale::TagListForModel < ::Dorsale::Service
+  attr_reader :model
+
+  def initialize(model)
+    @model = model
+  end
+
+  def call
+    model
+      .tags_on(:tags)
+      .order(:name)
+      .pluck(:name)
+  end
+end

data/app/views/dorsale/customer_vault/people/_context.html.slim

@@ -10,7 +10,7 @@
   .context-body
     p.text-center = avatar_img(person)
 
-    = info person, :tags,     person_tags(person)
+    = info person, :tags,     tags(person)
     = info person, :email,    helper: :email_link
     = info person, :phone,    helper: :tel_link
     = info person, :mobile,   helper: :tel_link

data/app/views/dorsale/customer_vault/people/_list_item.html.slim

@@ -34,4 +34,4 @@
       = info person, :phone
       = info person, :mobile
       = info person, :email, helper: :email_link
-      = info person, :tags, person_tags(person)
+      = info person, :tags, tags(person)

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -471,6 +471,7 @@ files:
 - app/assets/javascripts/dorsale/common/forms.coffee
 - app/assets/javascripts/dorsale/common/modals.coffee
 - app/assets/javascripts/dorsale/common/tabs_loader.coffee
+- app/assets/javascripts/dorsale/common/tags.coffee
 - app/assets/javascripts/dorsale/common/tooltips.coffee
 - app/assets/javascripts/dorsale/dependencies.coffee
 - app/assets/javascripts/dorsale/engines.coffee
@@ -524,6 +525,25 @@ files:
 - app/controllers/dorsale/flyboy/tasks_controller.rb
 - app/controllers/dorsale/small_data/filters_controller.rb
 - app/controllers/dorsale/users_controller.rb
+- app/filters/dorsale/billing_machine/small_data/filter_for_invoices.rb
+- app/filters/dorsale/billing_machine/small_data/filter_for_quotations.rb
+- app/filters/dorsale/billing_machine/small_data/filter_strategy_by_customer.rb
+- app/filters/dorsale/billing_machine/small_data/filter_strategy_by_payment_status.rb
+- app/filters/dorsale/billing_machine/small_data/filter_strategy_by_state.rb
+- app/filters/dorsale/billing_machine/small_data/filter_strategy_by_time_period.rb
+- app/filters/dorsale/customer_vault/small_data/filter_for_people.rb
+- app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb
+- app/filters/dorsale/flyboy/small_data/filter_for_folders.rb
+- app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb
+- app/filters/dorsale/flyboy/small_data/filter_strategy_by_done.rb
+- app/filters/dorsale/flyboy/small_data/filter_strategy_by_status.rb
+- app/filters/dorsale/small_data/filter.rb
+- app/filters/dorsale/small_data/filter_strategy.rb
+- app/filters/dorsale/small_data/filter_strategy_by_date.rb
+- app/filters/dorsale/small_data/filter_strategy_by_date_begin.rb
+- app/filters/dorsale/small_data/filter_strategy_by_date_end.rb
+- app/filters/dorsale/small_data/filter_strategy_by_key_value.rb
+- app/filters/dorsale/small_data/filter_strategy_by_tags.rb
 - app/helpers/dh.rb
 - app/helpers/dorsale/alexandrie/attachments_helper.rb
 - app/helpers/dorsale/all_helpers.rb
@@ -557,12 +577,6 @@ files:
 - app/models/dorsale/billing_machine/payment_term.rb
 - app/models/dorsale/billing_machine/quotation.rb
 - app/models/dorsale/billing_machine/quotation_line.rb
-- app/models/dorsale/billing_machine/small_data/filter_for_invoices.rb
-- app/models/dorsale/billing_machine/small_data/filter_for_quotations.rb
-- app/models/dorsale/billing_machine/small_data/filter_strategy_by_customer.rb
-- app/models/dorsale/billing_machine/small_data/filter_strategy_by_payment_status.rb
-- app/models/dorsale/billing_machine/small_data/filter_strategy_by_state.rb
-- app/models/dorsale/billing_machine/small_data/filter_strategy_by_time_period.rb
 - app/models/dorsale/comment.rb
 - app/models/dorsale/customer_vault.rb
 - app/models/dorsale/customer_vault/corporation.rb
@@ -572,28 +586,15 @@ files:
 - app/models/dorsale/customer_vault/link.rb
 - app/models/dorsale/customer_vault/person.rb
 - app/models/dorsale/customer_vault/person_data.rb
-- app/models/dorsale/customer_vault/small_data/filter_for_people.rb
-- app/models/dorsale/customer_vault/small_data/filter_strategy_by_tags.rb
 - app/models/dorsale/expense_gun.rb
 - app/models/dorsale/expense_gun/category.rb
 - app/models/dorsale/expense_gun/expense.rb
 - app/models/dorsale/expense_gun/expense_line.rb
-- app/models/dorsale/expense_gun/small_data/filter_for_expenses.rb
 - app/models/dorsale/flyboy.rb
 - app/models/dorsale/flyboy/folder.rb
-- app/models/dorsale/flyboy/small_data/filter_for_folders.rb
-- app/models/dorsale/flyboy/small_data/filter_for_tasks.rb
-- app/models/dorsale/flyboy/small_data/filter_strategy_by_done.rb
-- app/models/dorsale/flyboy/small_data/filter_strategy_by_status.rb
 - app/models/dorsale/flyboy/task.rb
 - app/models/dorsale/flyboy/task_comment.rb
 - app/models/dorsale/small_data.rb
-- app/models/dorsale/small_data/filter.rb
-- app/models/dorsale/small_data/filter_strategy.rb
-- app/models/dorsale/small_data/filter_strategy_by_date.rb
-- app/models/dorsale/small_data/filter_strategy_by_date_begin.rb
-- app/models/dorsale/small_data/filter_strategy_by_date_end.rb
-- app/models/dorsale/small_data/filter_strategy_by_key_value.rb
 - app/models/dorsale/users/active.rb
 - app/models/dorsale/users/avatar.rb
 - app/models/dorsale/users/password_generation.rb
@@ -629,6 +630,7 @@ files:
 - app/services/dorsale/billing_machine/quotation/to_invoice.rb
 - app/services/dorsale/expense_gun/expense/copy.rb
 - app/services/dorsale/service.rb
+- app/services/dorsale/tag_list_for_model.rb
 - app/uploaders/dorsale/alexandrie/file_uploader.rb
 - app/uploaders/dorsale/application_uploader.rb
 - app/uploaders/dorsale/avatar_uploader.rb
@@ -906,6 +908,7 @@ files:
 - spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
+- spec/filters/dorsale/small_data/filter_spec.rb
 - spec/helpers/dorsale/flyboy/application_helper_spec.rb
 - spec/helpers/dorsale/form_helper_spec.rb
 - spec/helpers/dorsale/link_helper_spec.rb
@@ -935,7 +938,6 @@ files:
 - spec/models/dorsale/flyboy/task_spec.rb
 - spec/models/dorsale/i18n_spec.rb
 - spec/models/dorsale/model_i18n_spec.rb
-- spec/models/dorsale/small_data/filter_spec.rb
 - spec/models/dorsale/users_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb
@@ -1016,6 +1018,7 @@ test_files:
 - spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
+- spec/filters/dorsale/small_data/filter_spec.rb
 - spec/helpers/dorsale/flyboy/application_helper_spec.rb
 - spec/helpers/dorsale/form_helper_spec.rb
 - spec/helpers/dorsale/link_helper_spec.rb
@@ -1045,7 +1048,6 @@ test_files:
 - spec/models/dorsale/flyboy/task_spec.rb
 - spec/models/dorsale/i18n_spec.rb
 - spec/models/dorsale/model_i18n_spec.rb
-- spec/models/dorsale/small_data/filter_spec.rb
 - spec/models/dorsale/users_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb
 - spec/pdfs/dorsale/billing_machine/invoice_single_vat_pdf_spec.rb