dorsale 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f873a20e46bfa3caee9df65c30c74c9a8451a2e8
-  data.tar.gz: cc19ee4d7718957697d931b30b654569e86f99c2
+  metadata.gz: 4e8255c9d6c9efa78f99a3914f3ca347456faa10
+  data.tar.gz: c4bea5ce3821ec79e4fb8ff96fce60869cb49e2e
 SHA512:
-  metadata.gz: 39bfb09fcf7dabbc4e863cc69d62f7901ef668b1e53f215135cf1414b20058319fb14b89c329ffcfb78d8cf507178e681b66e55c17933340486fdcaa19c0a725
-  data.tar.gz: 3fbf7ff0e239aed72868926e6829510dc8b565c627c303850fe4fb1320e387cbbe5a3d78f9ddfbffc687722ad9b5034ba023bae18c7282423ebac37ab0f7f7cf
+  metadata.gz: 66c316f9221bf01e9b47a8dccc5da0512b3e374c765cf11595104db3189e068df578814219bb2895fecb1b0cdebd13e28395a5161d5362c7b1887f7464340987
+  data.tar.gz: 4a5e092869742218f94c4bcbc126c63f644d41a0dbf130a7370cecddbbaa3e2c27457069ebdacab833d6f1e041190a613a6fd0d7b4a689bd2003365b46ee3626

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1.7
+
+- Filters changes : get/set are now private
+- Add Bullet gem
+- Add ApplicationRecord
+
 ## 3.1.6
 
 - Migrate tests to PhantomJS 2

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

@@ -12,7 +12,7 @@ class Dorsale::BillingMachine::InvoicesController < ::Dorsale::BillingMachine::A
     # callback in BillingMachine::ApplicationController
     authorize model, :list?
 
-    @invoices ||= scope.all
+    @invoices ||= scope.all.preload(:customer)
     @filters  ||= ::Dorsale::BillingMachine::SmallData::FilterForInvoices.new(cookies)
 
     @invoices = @filters.apply(@invoices)

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

@@ -12,7 +12,7 @@ class Dorsale::BillingMachine::QuotationsController < ::Dorsale::BillingMachine:
     # callback in BillingMachine::ApplicationController
     authorize model, :list?
 
-    @quotations ||= scope.all
+    @quotations ||= scope.all.preload(:customer)
     @filters    ||= ::Dorsale::BillingMachine::SmallData::FilterForQuotations.new(cookies)
 
     @quotations = @filters.apply(@quotations)

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

@@ -13,7 +13,9 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
 
     @filters ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(cookies)
     @tags    ||= customer_vault_tag_list
-    @people  ||= policy_scope(model).search(params[:q])
+    @people  ||= policy_scope(model)
+      .search(params[:q])
+      .preload(:taggings)
 
     if params[:q].blank?
       @people = @filters.apply(@people)

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

@@ -15,7 +15,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
   def index
     authorize model, :list?
 
-    @expenses ||= scope.all
+    @expenses ||= scope.all.preload(:user, :expense_lines)
     @filters ||= Dorsale::ExpenseGun::SmallData::FilterForExpenses.new(cookies)
     @expenses = @filters.apply(@expenses)
     @expenses = @expenses.page(params[:page]).per(25)

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

@@ -13,7 +13,7 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
   def index
     authorize model, :list?
 
-    @tasks ||= scope.all
+    @tasks ||= scope.all.preload(:taskable)
 
     @order ||= sortable_column_order do |column, direction|
       case column

data/app/controllers/dorsale/small_data/filters_controller.rb

@@ -3,21 +3,15 @@ class Dorsale::SmallData::FiltersController < ::Dorsale::ApplicationController
     skip_authorization
     skip_policy_scope
 
-    new_filters = params.fetch(:filters, {}).permit!.to_h
-
-    new_filters.each do |key, value|
-      new_filters[key] = "" if value == "0"
-    end
-
     filters = ::Dorsale::SmallData::Filter.new(cookies)
-    new_filters = filters.read.merge(new_filters)
-    filters.store(new_filters)
+    new_filters = params.fetch(:filters, {}).permit!.to_h
+    filters.merge new_filters
 
     # Rewrite cookie with 1 year expiry
     cookies[:filters] = {
-      :value    => cookies[:filters],
+      :value   => cookies[:filters],
       :expires => 1.year.from_now,
-      :path     => "/",
+      :path    => "/",
     }
 
     redirect_to back_url
@@ -32,7 +26,7 @@ class Dorsale::SmallData::FiltersController < ::Dorsale::ApplicationController
       (main_app.root_path rescue "/"),
     ].select(&:present?).first
 
-    # Delete page page
+    # Delete page param
     base, query_string = url.split("?")
     query_string = query_string.to_s.split("&").delete_if { |p| p.include?("page=") }.join("&")
     query_string = "?#{query_string}" if query_string.present?

data/app/filters/dorsale/small_data/filter.rb

@@ -1,26 +1,10 @@
 class Dorsale::SmallData::Filter
-  def initialize(jar)
-    @jar = jar
-  end
-
-  def store(filters)
-    @jar["filters"] = filters.to_json
-  end
-
-  def read
-    JSON.parse @jar["filters"].to_s
-  rescue JSON::ParserError
-    {}
-  end
+  STRATEGIES = {}
 
-  def get(key)
-    read[key.to_s]
-  end
+  attr_reader :jar
 
-  def set(key, value)
-    array           = read
-    array[key.to_s] = value
-    store(array)
+  def initialize(jar)
+    @jar = jar
   end
 
   def strategies
@@ -40,12 +24,45 @@ class Dorsale::SmallData::Filter
   end
 
   def method_missing(method, *args)
-    key = method.to_s
+    if method.to_s.end_with?("=")
+      key    = method.to_s[0..-2]
+      value  = args.first
+      action = :write
+    else
+      key    = method.to_s
+      action = :read
+    end
 
-    if strategies.key?(key)
+    if strategies.key?(key) && action == :read
       get(key)
+    elsif strategies.key?(key) && action == :write
+      set(key, value)
     else
       super
     end
   end
+
+  def read
+    JSON.parse jar["filters"].to_s
+  rescue JSON::ParserError
+    {}
+  end
+
+  def write(filters)
+    jar["filters"] = filters.to_json
+  end
+
+  def merge(new_filters)
+    write read.merge(new_filters)
+  end
+
+  private
+
+  def get(key)
+    read[key.to_s]
+  end
+
+  def set(key, value)
+    merge(key.to_s => value)
+  end
 end

data/app/models/dorsale/address.rb

@@ -1,4 +1,4 @@
-class Dorsale::Address < ActiveRecord::Base
+class Dorsale::Address < ::Dorsale::ApplicationRecord
   belongs_to :addressable, polymorphic: true, inverse_of: :address
 
   validates :addressable, presence: true

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

@@ -1,4 +1,4 @@
-class Dorsale::Alexandrie::Attachment < ActiveRecord::Base
+class Dorsale::Alexandrie::Attachment < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_alexandrie_attachments"
 
   belongs_to :attachable, polymorphic: true
@@ -14,7 +14,9 @@ class Dorsale::Alexandrie::Attachment < ActiveRecord::Base
   before_save :set_default_name
 
   default_scope -> {
-    order(id: :desc)
+    all
+      .order(id: :desc)
+      .preload(:attachment_type)
   }
 
   def set_default_name

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

@@ -1,4 +1,4 @@
-class Dorsale::Alexandrie::AttachmentType < ActiveRecord::Base
+class Dorsale::Alexandrie::AttachmentType < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_alexandrie_attachment_types"
 
   has_many :attachments, dependent: :nullify

data/app/models/dorsale/application_record.rb

@@ -0,0 +1,3 @@
+class Dorsale::ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::IdCard < ActiveRecord::Base
+class Dorsale::BillingMachine::IdCard < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_id_cards"
 
   has_many :invoices

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::Invoice < ActiveRecord::Base
+class Dorsale::BillingMachine::Invoice < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_invoices"
 
   belongs_to :customer, polymorphic: true

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::InvoiceLine < ActiveRecord::Base
+class Dorsale::BillingMachine::InvoiceLine < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_invoice_lines"
 
   belongs_to :invoice, inverse_of: :lines

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

@@ -1,3 +1,3 @@
-class Dorsale::BillingMachine::PaymentTerm < ActiveRecord::Base
+class Dorsale::BillingMachine::PaymentTerm < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_payment_terms"
 end

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::Quotation < ActiveRecord::Base
+class Dorsale::BillingMachine::Quotation < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_quotations"
 
   STATES = %w(pending accepted refused canceled)

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

@@ -1,4 +1,4 @@
-class Dorsale::BillingMachine::QuotationLine < ActiveRecord::Base
+class Dorsale::BillingMachine::QuotationLine < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_billing_machine_quotation_lines"
 
   belongs_to :quotation, inverse_of: :lines

data/app/models/dorsale/comment.rb

@@ -1,4 +1,4 @@
-class Dorsale::Comment < ActiveRecord::Base
+class Dorsale::Comment < ::Dorsale::ApplicationRecord
   belongs_to :author, polymorphic: true
   belongs_to :commentable, polymorphic: true
 
@@ -7,6 +7,8 @@ class Dorsale::Comment < ActiveRecord::Base
   validates :text,        presence: true
 
   default_scope -> {
-    order(created_at: :desc)
+    all
+      .order(created_at: :desc)
+      .preload(:author)
   }
 end

data/app/models/dorsale/customer_vault/link.rb

@@ -1,4 +1,4 @@
-class Dorsale::CustomerVault::Link < ActiveRecord::Base
+class Dorsale::CustomerVault::Link < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_customer_vault_links"
 
   belongs_to :alice, class_name: ::Dorsale::CustomerVault::Person

data/app/models/dorsale/customer_vault/person.rb

@@ -1,6 +1,6 @@
 require "dorsale/search"
 
-class Dorsale::CustomerVault::Person < ActiveRecord::Base
+class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_customer_vault_people"
 
   extend Forwardable
@@ -50,10 +50,14 @@ class Dorsale::CustomerVault::Person < ActiveRecord::Base
   end
 
   def links
-    a = ::Dorsale::CustomerVault::Link.where(alice_id: id)
+    a = ::Dorsale::CustomerVault::Link
+      .where(alice_id: id)
+      .preload(:alice => :taggings, :bob => :taggings)
       .each { |l| l.person = l.alice ; l.other_person = l.bob }
 
-    b = ::Dorsale::CustomerVault::Link.where(bob_id: id)
+    b = ::Dorsale::CustomerVault::Link
+      .where(bob_id: id)
+      .preload(:alice => :taggings, :bob => :taggings)
       .each { |l| l.person = l.bob ; l.other_person = l.alice }
 
     return a + b

data/app/models/dorsale/expense_gun/category.rb

@@ -1,4 +1,4 @@
-class Dorsale::ExpenseGun::Category < ActiveRecord::Base
+class Dorsale::ExpenseGun::Category < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_expense_gun_categories"
 
   validates :name, presence: true

data/app/models/dorsale/expense_gun/expense.rb

@@ -1,4 +1,4 @@
-class Dorsale::ExpenseGun::Expense < ActiveRecord::Base
+class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_expense_gun_expenses"
   include AASM
 

data/app/models/dorsale/expense_gun/expense_line.rb

@@ -1,4 +1,4 @@
-class Dorsale::ExpenseGun::ExpenseLine < ActiveRecord::Base
+class Dorsale::ExpenseGun::ExpenseLine < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_expense_gun_expense_lines"
 
   belongs_to :expense,  class_name: ::Dorsale::ExpenseGun::Expense

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

@@ -1,7 +1,7 @@
 require "dorsale/search"
 require "dorsale/polymorphic_id"
 
-class Dorsale::Flyboy::Folder < ActiveRecord::Base
+class Dorsale::Flyboy::Folder < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_folders"
 
   include AASM

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

@@ -1,7 +1,7 @@
 require "dorsale/search"
 require "dorsale/polymorphic_id"
 
-class Dorsale::Flyboy::Task < ActiveRecord::Base
+class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_tasks"
 
   include ::Dorsale::Search

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

@@ -1,4 +1,4 @@
-class Dorsale::Flyboy::TaskComment < ActiveRecord::Base
+class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_flyboy_task_comments"
 
   belongs_to :task

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -63,7 +63,7 @@ When(/^the flyboy daily crons run$/) do
 end
 
 When(/^I create a task$/) do
-  all("a[href*='tasks/new']").first.click
+  find("#context-main a[href*='tasks/new']").click
   find("form[id*=task] [type=submit]").click # First submit to see errors
   fill_in "task_name", with: "I-am-the-task-title"
   fill_in "task_description", with: "I-am-the-task-description"

data/features/support/poltergeist.rb

@@ -19,4 +19,4 @@ end
 Capybara.default_driver        = :poltergeist
 Capybara.javascript_driver     = :poltergeist
 Capybara.current_driver        = :poltergeist
-Capybara.default_max_wait_time = 3
+Capybara.default_max_wait_time = 5

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.1.6"
+  VERSION = "3.1.7"
 end

data/spec/controllers/dorsale/flyboy/folders_controller_spec.rb

@@ -26,17 +26,13 @@ describe Dorsale::Flyboy::FoldersController, type: :controller do
       end
 
       it 'should filter by status closed' do
-        Dorsale::Flyboy::SmallData::FilterForFolders.new(request.cookies)
-          .store(fb_status: "closed")
-
+        cookies["filters"] = {fb_status: "closed"}.to_json
         get :index
         expect(assigns(:folders)).to eq [@folder2]
       end
 
       it 'should filter by status open' do
-        Dorsale::Flyboy::SmallData::FilterForFolders.new(request.cookies)
-          .store(fb_status: "open")
-
+        cookies["filters"] = {fb_status: "open"}.to_json
         get :index
         expect(assigns(:folders)).to eq [@folder1]
       end

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -65,13 +65,13 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       end
 
       it 'should filter by status closed' do
-        Dorsale::Flyboy::SmallData::FilterForTasks.new(request.cookies).store({'fb_status' => "closed"})
+        cookies["filters"] = {'fb_status' => "closed"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task1]
       end
 
       it 'should filter by status opened' do
-        Dorsale::Flyboy::SmallData::FilterForTasks.new(request.cookies).store({'fb_status' => "opened"})
+        cookies["filters"] = {'fb_status' => "opened"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task2]
       end

data/spec/filters/dorsale/small_data/filter_spec.rb

@@ -6,16 +6,16 @@ module Dorsale
     let(:filter) { {"name" => "bidule"} }
     let(:f)      { Dorsale::SmallData::Filter.new(jar) }
 
-    describe "store" do
-      it "should store the provided hash as json in the jar" do
-        f.store(filter)
+    describe "write" do
+      it "should write the provided hash as json in the jar" do
+        f.write(filter)
         expect(jar["filters"]).to eq filter.to_json
       end
     end
 
     describe "read" do
       it "should read stored filters" do
-        f.store(filter)
+        f.write(filter)
         expect(f.read).to eq(filter)
       end
 
@@ -29,19 +29,11 @@ module Dorsale
       end
     end
 
-    describe "get" do
-      it "should return the value" do
-        f.store(filter)
-        expect(f.get("name")).to eq("bidule")
-      end
+    it "should set/get values" do
+      filter = Dorsale::CustomerVault::SmallData::FilterForPeople.new({})
+      filter.person_type = "truc"
+      expect(filter.person_type).to eq "truc"
     end
 
-    describe "set" do
-      it "should set the value" do
-        f.store(filter)
-        f.set("new", "truc")
-        expect(f.get("new")).to eq("truc")
-      end
-    end
   end
 end

data/spec/models/dorsale/i18n_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "i18n" do
 
   # TODO : test FR + EN
 
-  ActiveRecord::Base.descendants.each do |model|
+  ::Dorsale::ApplicationRecord.descendants.each do |model|
     next unless model.to_s.start_with?("Dorsale")
 
     it "should i18n #{model} model name" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,6 +570,7 @@ files:
 - app/models/dorsale/alexandrie.rb
 - app/models/dorsale/alexandrie/attachment.rb
 - app/models/dorsale/alexandrie/attachment_type.rb
+- app/models/dorsale/application_record.rb
 - app/models/dorsale/billing_machine.rb
 - app/models/dorsale/billing_machine/id_card.rb
 - app/models/dorsale/billing_machine/invoice.rb