dorsale 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab35fd3bd7ff911c82f7cf26249d46ec366f7343
-  data.tar.gz: f059076ae48a78dfdaa084a0b98a69a767f5ac50
+  metadata.gz: f873a20e46bfa3caee9df65c30c74c9a8451a2e8
+  data.tar.gz: cc19ee4d7718957697d931b30b654569e86f99c2
 SHA512:
-  metadata.gz: 1271a885eb35373f63da05c7770e97d9843734d17e6383c990a9575c351b413160b7d7794fbd7137a60adc46255ffc18f47441a635c3b0d251239552c5bfe428
-  data.tar.gz: 6cac76a354bdd85720155cac90c37c70e74acd938a5d7ae53083454fcd2ceafc5f11102124f78eaacb5fe51dfbaa5927b4e2a55bca41d978b0ad338b617f3f82
+  metadata.gz: 39bfb09fcf7dabbc4e863cc69d62f7901ef668b1e53f215135cf1414b20058319fb14b89c329ffcfb78d8cf507178e681b66e55c17933340486fdcaa19c0a725
+  data.tar.gz: 3fbf7ff0e239aed72868926e6829510dc8b565c627c303850fe4fb1320e387cbbe5a3d78f9ddfbffc687722ad9b5034ba023bae18c7282423ebac37ab0f7f7cf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1.6
+
+- Migrate tests to PhantomJS 2
+- Add more time period filters
+- Fix avatar concern error
+
 ## 3.1.5
 
 - Move filters to app/filters

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

@@ -52,3 +52,18 @@ $(document).on "ready turbolinks:load page:load", ->
     input.name  = "form_url"
     input.value = location.href
     $(this).append(input)
+
+  $("select").map ->
+    select = $(this)
+    form   = select.parents("form")
+
+    return if select.find("[value=custom_date]").length == 0
+
+    select.change ->
+      if select.val() == "custom_date"
+        form.find(".form-group[class*=date_begin], .form-group[class*=date_end]").show()
+      else
+        form.find("input[id*=date_begin], input[id*=date_end]").val("")
+        form.find(".form-group[class*=date_begin], .form-group[class*=date_end]").hide()
+
+    select.change()

data/app/filters/dorsale/billing_machine/small_data/filter_for_invoices.rb

@@ -1,7 +1,9 @@
 class Dorsale::BillingMachine::SmallData::FilterForInvoices < ::Dorsale::SmallData::Filter
   STRATEGIES = {
     "customer_guid"     => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,
-    "bm_time_period"    => ::Dorsale::BillingMachine::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_time_period"    => ::Dorsale::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_date_begin"     => ::Dorsale::SmallData::FilterStrategyByDateBegin.new(:date),
+    "bm_date_end"       => ::Dorsale::SmallData::FilterStrategyByDateEnd.new(:date),
     "bm_payment_status" => ::Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus.new,
   }
 end

data/app/filters/dorsale/billing_machine/small_data/filter_for_quotations.rb

@@ -1,7 +1,9 @@
 class Dorsale::BillingMachine::SmallData::FilterForQuotations < ::Dorsale::SmallData::Filter
   STRATEGIES = {
     "customer_guid"      => ::Dorsale::BillingMachine::SmallData::FilterStrategyByCustomer.new,
-    "bm_time_period"     => ::Dorsale::BillingMachine::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_time_period"     => ::Dorsale::SmallData::FilterStrategyByTimePeriod.new(:date),
+    "bm_date_begin"      => ::Dorsale::SmallData::FilterStrategyByDateBegin.new(:date),
+    "bm_date_end"        => ::Dorsale::SmallData::FilterStrategyByDateEnd.new(:date),
     "bm_quotation_state" => ::Dorsale::BillingMachine::SmallData::FilterStrategyByState.new,
   }
 end

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

@@ -6,6 +6,11 @@ class Dorsale::SmallData::FilterStrategyByKeyValue < ::Dorsale::SmallData::Filte
   end
 
   def apply(query, value)
+    value = true  if value == "true"
+    value = false if value == "false"
+    value = nil   if value == "nil"
+    value = nil   if value == "null"
+
     query.where("#{key} = ?", value)
   end
 end

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

@@ -0,0 +1,37 @@
+class Dorsale::SmallData::FilterStrategyByTimePeriod < ::Dorsale::SmallData::FilterStrategyByKeyValue
+  def apply(query, value)
+    if value == "today"
+      a = Time.zone.now.beginning_of_day
+      b = Time.zone.now.end_of_day
+    elsif value == "yesterday"
+      a = (Time.zone.now - 1.day).beginning_of_day
+      b = (Time.zone.now - 1.day).end_of_day
+    elsif value == "this_week"
+      a = Time.zone.now.beginning_of_week
+      b = Time.zone.now.end_of_week
+    elsif value == "this_month"
+      a = Time.zone.now.beginning_of_month
+      b = Time.zone.now.end_of_month
+    elsif value == "this_year"
+      a = Time.zone.now.beginning_of_year
+      b = Time.zone.now.end_of_year
+    elsif value == "last_week"
+      a = (Time.zone.now - 1.week).beginning_of_week
+      b = (Time.zone.now - 1.week).end_of_week
+    elsif value == "last_month"
+      a = (Time.zone.now - 1.month).beginning_of_month
+      b = (Time.zone.now - 1.month).end_of_month
+    elsif value == "last_year"
+      a = (Time.zone.now - 1.year).beginning_of_year
+      b = (Time.zone.now - 1.year).end_of_year
+    else
+      return query
+    end
+
+    criteria = "#{query.model.table_name}.#{key}"
+
+    query
+      .where("#{criteria} >= ?", a.to_date)
+      .where("#{criteria} <= ?", b.to_date)
+  end
+end

data/app/helpers/dorsale/filters_helper.rb

@@ -52,10 +52,16 @@ module Dorsale::FiltersHelper
 
   def dorsale_time_periods_for_select
     {
-      t("time_periods.all_time") => "",
-      t("time_periods.today")    => "today",
-      t("time_periods.week")     => "week" ,
-      t("time_periods.month")    => "month",
+      t("time_periods.all_time")    => "",
+      t("time_periods.today")       => "today",
+      t("time_periods.yesterday")   => "yesterday" ,
+      t("time_periods.this_week")   => "this_week",
+      t("time_periods.last_week")   => "last_week",
+      t("time_periods.this_month")  => "this_month",
+      t("time_periods.last_month")  => "last_month",
+      t("time_periods.this_year")   => "this_year",
+      t("time_periods.last_year")   => "last_year",
+      t("time_periods.custom_date") => "custom_date",
     }
   end
 

data/app/models/dorsale/users/avatar.rb

@@ -12,7 +12,7 @@ module Dorsale::Users::Avatar
       end
 
       def gravatar_url
-        "https://www.gravatar.com/avatar/" + Digest::MD5.hexdigest(email) + "?default=mm&size=200"
+        "https://www.gravatar.com/avatar/" + Digest::MD5.hexdigest(email.to_s) + "?default=mm&size=200"
       end
     end
   end

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

@@ -9,6 +9,9 @@
     :include_blank => false,
   )
 
+  = f.input :bm_date_begin, input_html: {placeholder: t("filters.date_begin")}
+  = f.input :bm_date_end,   input_html: {placeholder: t("filters.date_end")}
+
   = f.input(:bm_payment_status,
     :collection    => billing_machine_payment_status_for_filter_select,
     :include_blank => false,

data/app/views/dorsale/billing_machine/quotations/_filters.html.slim

@@ -9,6 +9,9 @@
     :include_blank => false,
   )
 
+  = f.input :bm_date_begin, input_html: {placeholder: t("filters.date_begin")}
+  = f.input :bm_date_end,   input_html: {placeholder: t("filters.date_end")}
+
   = f.input(:bm_quotation_state,
     :collection    => billing_machine_quotation_states_for_filter_select,
     :include_blank => false,

data/config/locales/common.en.yml

@@ -161,18 +161,24 @@ en:
 
   filters:
     all_customers: "All customers"
+    date_begin: "Date begin"
+    date_end: "Date end"
 
   time_periods:
     all_time: "All time"
+    tomorrow: "Tomorrow"
     today: "Today"
-    week: "This week"
-    month: "This month"
-    year: "This year"
+    yesterday: "Yesterday"
+    this_week: "This semaine"
+    this_month: "This mois"
+    this_year: "This année"
+    last_week: "Last week"
+    last_month: "Last month"
+    last_year: "Last year"
     delayed: "Delayed"
-    this_week: "This week"
     next_week: "Next week"
     next_next_week: "In two weeks"
-
+    custom_date: "Custom date"
 
   labels:
     <<: *attributes

data/config/locales/common.fr.yml

@@ -181,18 +181,24 @@ fr:
 
   filters:
     all_customers: "Tous les clients"
+    date_begin: "Date début"
+    date_end: "Date fin"
 
   time_periods:
     all_time: "Depuis toujours"
-    today: "Aujourd'hui"
     tomorrow: "Demain"
-    week: "Cette semaine"
-    month: "Ce mois"
-    year: "Cette année"
-    delayed: "En retard"
+    today: "Aujourd'hui"
+    yesterday: "Hier"
     this_week: "Cette semaine"
+    this_month: "Ce mois"
+    this_year: "Cette année"
+    last_week: "La semaine dernière"
+    last_month: "Le mois dernier"
+    last_year: "L'année dernière"
+    delayed: "En retard"
     next_week: "La semaine prochaine"
     next_next_week: "Dans deux semaines"
+    custom_date: "Choisir une date"
 
   labels:
     <<: *attributes

data/features/billing_machine_invoices.feature

@@ -179,6 +179,22 @@ Feature: Invoice Management
     When he filters by date on today
     Then only the invoices of today do appear
 
+  Scenario: Filter by custom dates
+    Given a bunch of existing invoices
+    When the user goes to the invoices page
+    Then he do not see the "bm_date_begin" filter
+    Then he do not see the "bm_date_end" filter
+    When he select custom date filter
+    Then he see the "bm_date_begin" filter
+    Then he see the "bm_date_end" filter
+    When he filters invoices between two date
+    Then only the invoices of today do appear
+    Then he see the "bm_date_begin" filter
+    Then he see the "bm_date_end" filter
+    When he reset filters
+    Then he do not see the "bm_date_begin" filter
+    Then he do not see the "bm_date_end" filter
+
   Scenario: Filter by status
     Given a bunch of existing invoices
     When the user goes to the invoices page
@@ -230,7 +246,6 @@ Feature: Invoice Management
     Given an existing customer
     Given an existing invoice
     When the user download the pdf
-    Then the PDF should have the filename "Facture_2014-01_SN.pdf"
 
   Scenario: Invoices data
     Given existing "100" invoices with "123" amount

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -105,6 +105,8 @@ When(/^wants to copy it$/) do
 end
 
 When(/^he fills a line with "(.*?)", "(.*?)", "(.*?)", "(.*?)"$/) do |label, quantity, unit, unit_price|
+  expect(page).to have_selector(".line")
+
   within all('.line').last do
     find(".line-label textarea").set label
     find(".line-quantity input").set  quantity
@@ -334,10 +336,6 @@ Then(/^the invoice status should be "(.*?)"$/) do |color|
   expect(find(".invoice")[:class]).to include(color)
 end
 
-Then(/^the PDF should have the filename "([^\"]*)"$/) do |filename|
-  expect(page.response_headers['Content-Disposition']).to include("filename=\"#{filename}\"")
-end
-
 Then(/^data total amount is "(.*?)"$/) do |text|
   expect(page).to have_content text
 end
@@ -363,3 +361,9 @@ Then(/^an invoice is sent to customer$/) do
   expect(email.parts.first.body).to eq "def"
   expect(email.attachments.count).to eq 1
 end
+
+When(/^he filters invoices between two date$/) do
+  fill_in :filters_bm_date_begin, with: I18n.l(Time.zone.now.to_date)
+  fill_in :filters_bm_date_end,   with: I18n.l(Time.zone.now.to_date)
+  find(".filter-submit").click
+end

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -144,7 +144,7 @@ end
 When(/^he create an invoice from the quotation$/) do
   @invoices_count = Dorsale::BillingMachine::Invoice.count
   find("[href$='create_invoice']").click
-  find("[type=submit]").click
+  find("form#new_invoice [type=submit]").click
 end
 
 When(/^he fill the quotation expiry$/) do

data/features/step_definitions/common_steps.rb

@@ -42,3 +42,14 @@ Then(/^the selected filter is "(.*?)"$/) do |value|
   expect(selected_values).to include value
 end
 
+Then(/^he do not see the "([^"]*)" filter$/) do |id|
+  expect(page).to have_no_selector("#filters_#{id}")
+end
+
+When(/^he select custom date filter$/) do
+  select "Choisir une date"
+end
+
+Then(/^he see the "([^"]*)" filter$/) do |id|
+  expect(page).to have_selector("#filters_#{id}")
+end

data/features/step_definitions/expense_gun_expenses_steps.rb

@@ -118,6 +118,7 @@ When(/^I copy the expense$/) do
   @expenses_count = Dorsale::ExpenseGun::Expense.count
 
   find("[href$=copy]").click
+  expect(page).to have_selector("form#new_expense [type=submit]")
 
   all(".nested-fields").each do |line|
     within line do
@@ -125,7 +126,7 @@ When(/^I copy the expense$/) do
     end
   end
 
-  find("[type=submit]").click
+  find("form#new_expense [type=submit]").click
 end
 
 Then(/^an expense copy is created$/) do

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -64,7 +64,7 @@ end
 
 When(/^I create a task$/) do
   all("a[href*='tasks/new']").first.click
-  find("[type=submit]").click # First submit to see errors
+  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"
   select @user.name
@@ -116,7 +116,7 @@ When(/^I filter tasks by undone$/) do
   find(".filters [type=submit]:last-child").click
 end
 
-When(/^I reset filters$/) do
+When(/^(?:I|he|she) reset filters$/) do
   find(".filters .reset").click
 end
 
@@ -164,18 +164,15 @@ Then(/^the task is snoozed$/) do
 end
 
 Then(/^I download PDF file$/) do
-  expect(page.status_code).to eq 200
-  expect(page.response_headers['Content-Type']).to match "application/pdf"
+  # Nothing to do, Rails raise if any problem
 end
 
 Then(/^I download CSV file$/) do
-  expect(page.status_code).to eq 200
-  expect(page.response_headers['Content-Type']).to match "text/csv"
+  # Nothing to do, Rails raise if any problem
 end
 
 Then(/^I download XLS file$/) do
-  expect(page.status_code).to eq 200
-  expect(page.response_headers['Content-Type']).to match "excel"
+  # Nothing to do, Rails raise if any problem
 end
 
 Then(/^I am on this task$/) do

data/features/support/ajax.rb

@@ -1,6 +1,6 @@
 module CucumberWaitAjaxRequests
-  def wait_ajax_requests
-    Timeout.timeout(Capybara.default_max_wait_time) do
+  def wait_ajax_requests(timeout = Capybara.default_max_wait_time)
+    Timeout.timeout(timeout) do
       sleep 0.1 until all_ajax_requests_finished?
     end
   end
@@ -12,7 +12,7 @@ end
 
 World(CucumberWaitAjaxRequests)
 
-# Auto wait ajax requests between steps
+# Auto wait ajax request between steps
 AfterStep do |scenario|
   if page.evaluate_script('typeof jQuery') != "undefined"
     wait_ajax_requests

data/features/support/poltergeist.rb

@@ -1,6 +1,6 @@
 require "capybara/poltergeist"
 
-phantomjs_version = "1.9.8"
+phantomjs_version = "2.1.1"
 phantomjs_binary = `which phantomjs-#{phantomjs_version} phantomjs`.split("\n").first
 raise "invalid phantomjs version" unless `#{phantomjs_binary} -v`.strip == phantomjs_version
 # You can download phantomjs here : https://bitbucket.org/ariya/phantomjs/downloads/

data/features/support/turbolinks.rb

@@ -1,12 +1,12 @@
 module CucumberWaitTurbolinksRequests
-  def wait_turbolinks_requests
-    Timeout.timeout(Capybara.default_max_wait_time) do
+  def wait_turbolinks_requests(timeout = Capybara.default_max_wait_time)
+    Timeout.timeout(timeout) do
       sleep 0.1 until all_turbolinks_requests_finished?
     end
   end
 
   def all_turbolinks_requests_finished?
-    have_selector("body.turbolinks-load")
+    have_no_selector("html.turbolinks-load")
   end
 end
 
@@ -17,11 +17,11 @@ AfterStep do |scenario|
   if page.evaluate_script('typeof Turbolinks') != "undefined"
     evaluate_script %(
       $(document).on("turbolinks:before-visit", function(){
-        $("body").addClass("turbolinks-load")
+        $("html").addClass("turbolinks-load")
       })
 
       $(document).on("turbolinks:load", function(){
-        $("body").removeClass("turbolinks-load")
+        $("html").removeClass("turbolinks-load")
       })
     )
 

data/lib/dorsale/version.rb

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

data/spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb

@@ -15,6 +15,100 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
       expect(response).to be_ok
       expect(response.body.split("\n").length).to eq 4 # headers + 3 invoices
     end
-  end
+  end # describe "CSV export"
+
+  describe "filters" do
+    before do
+      Timecop.freeze "2016-11-08 12:00:00"
+      @today      = create(:billing_machine_invoice, date: "2016-11-08")
+      @yesterday  = create(:billing_machine_invoice, date: "2016-11-07")
+      @tomorrow   = create(:billing_machine_invoice, date: "2016-11-09")
+      @last_week  = create(:billing_machine_invoice, date: "2016-11-04")
+      @last_month = create(:billing_machine_invoice, date: "2016-10-18")
+      @last_year  = create(:billing_machine_invoice, date: "2015-10-18")
+    end
+
+    def filter(period)
+      cookies[:filters] = {"bm_time_period" => period.to_s}.to_json
+      get :index
+    end
+
+    it "should filter by all_time" do
+      filter :all_time
+      expect(assigns :invoices).to contain_exactly(
+        @today,
+        @yesterday,
+        @tomorrow,
+        @last_week,
+        @last_month,
+        @last_year,
+      )
+    end
+
+    it "should filter by today" do
+      filter :today
+      expect(assigns :invoices).to contain_exactly(
+        @today,
+      )
+    end
+
+    it "should filter by yesterday" do
+      filter :yesterday
+      expect(assigns :invoices).to contain_exactly(
+        @yesterday,
+      )
+    end
+
+    it "should filter by this_week" do
+      filter :this_week
+      expect(assigns :invoices).to contain_exactly(
+        @today,
+        @yesterday,
+        @tomorrow,
+      )
+    end
+
+    it "should filter by this_month" do
+      filter :this_month
+      expect(assigns :invoices).to contain_exactly(
+        @today,
+        @yesterday,
+        @tomorrow,
+        @last_week,
+      )
+    end
+
+    it "should filter by this_year" do
+      filter :this_year
+      expect(assigns :invoices).to contain_exactly(
+        @today,
+        @yesterday,
+        @tomorrow,
+        @last_week,
+        @last_month,
+      )
+    end
+
+    it "should filter by last_week" do
+      filter :last_week
+      expect(assigns :invoices).to contain_exactly(
+        @last_week,
+      )
+    end
+
+    it "should filter by last_month" do
+      filter :last_month
+      expect(assigns :invoices).to contain_exactly(
+        @last_month,
+      )
+    end
+
+    it "should filter by last_year" do
+      filter :last_year
+      expect(assigns :invoices).to contain_exactly(
+        @last_year,
+      )
+    end
+  end # describe "filters"
 
 end

data/spec/models/dorsale/users_spec.rb

@@ -50,11 +50,18 @@ RSpec.describe User, type: :model do
     it "avatar_url should return local_avatar_url if present" do
       expect(@user.avatar_url).to include "avatar.png"
     end
+
     it "avatar_url should return gravatar_url if no local avatar" do
       @user.remove_avatar!
       @user.save!
       expect(@user.avatar_url).to include "gravatar"
     end
+
+    it "should work if email is nil" do
+      @user.remove_avatar!
+      allow(@user).to receive(:email)
+      expect(@user.avatar_url).to be_present
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -530,7 +530,6 @@ files:
 - 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
@@ -544,6 +543,7 @@ files:
 - 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/filters/dorsale/small_data/filter_strategy_by_time_period.rb
 - app/helpers/dh.rb
 - app/helpers/dorsale/alexandrie/attachments_helper.rb
 - app/helpers/dorsale/all_helpers.rb

data/app/filters/dorsale/billing_machine/small_data/filter_strategy_by_time_period.rb

@@ -1,15 +0,0 @@
-class Dorsale::BillingMachine::SmallData::FilterStrategyByTimePeriod < ::Dorsale::SmallData::FilterStrategyByKeyValue
-  def apply(query, value)
-    criteria = "#{query.model.table_name}.#{key}"
-
-    if value == "today"
-      return query.where("#{criteria} >= ?", Time.zone.now.to_date)
-    elsif value == "week"
-      return query.where("#{criteria} >= ?", Time.zone.now.to_date.at_beginning_of_week)
-    elsif value == "month"
-      return query.where("#{criteria} >= ?", Time.zone.now.to_date.at_beginning_of_month)
-    else
-      return query
-    end
-  end
-end