agilibox 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7f0e59fd9a62da85e62c61abc3638382fd2e949
-  data.tar.gz: d6d180e70886773cbfcd8f43e3d54394fd7e348e
+SHA256:
+  metadata.gz: c47b5f9188e74619272d53f2f46dccaba3fbbdb4f36ff862a2fc42964d9272ad
+  data.tar.gz: db7e31ea1f12048dc3bee0a6483d74f54b041260372ceb9a43352dceaee3a189
 SHA512:
-  metadata.gz: 55fd5e237e565365e5ba3bc1bb1d6ac4478a7bbe8fe1b953437900b91c4a32c350fd38cbcb35971d5ecd81cf1b2deb8f44efff08e6e79ed0a8dde0f886a29683
-  data.tar.gz: ea0ae8d4e740b142eeb84df062aa6c00cd0c0b4b07dad7cdbdc17d1de12d174feb9d87e54ab29686123238292d571330af927a6e0a060f6a9e62b5782a2f00b0
+  metadata.gz: 73b32e94afc159700b611ae0fb1363bcab445f5b12ad6cc89145b8ae4192581fd0977f14e94bb533cb2454b97f6286fbcd572bfdb1d10a0b4400d00f9a7de87d
+  data.tar.gz: 15636d5f9372df16d14ddfbbb076b564b25183cce1ffc80e55260e5df3e68e4d33e65d21fa471fdcf3669aa27a3f18960b94f2b029daaaafef2b2f3affe0a6ac

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.2.0
+
+- Add `Agilibox::MiniFormObject`
+- Replace time period filter by date+datetime period filters
+- JS Modal improvements
+- Change Cucumber config :
+  - add Chrome Headless support
+  - rename `phantomjs_window_size` to `window_size`
+  - refactoring
+  - you now need to add `Agilibox::CucumberConfig.require_poltergeist!` or `Agilibox::CucumberConfig.require_chrome_headless!` to your `env.rb`
+
 ## 1.1.0
 
 - Search concern improvements

data/app/assets/javascripts/agilibox/modals.coffee

@@ -4,12 +4,12 @@ window.modal =
     error: "Error."
 
   template: """
-    <div id='modal' class='closable'>
-      <div id='modal-overlay'></div>
+    <div id="modal" class="closable">
+      <div id="modal-overlay"></div>
 
-      <button id='modal-close'>×</button>
+      <button id="modal-close">&times;</button>
 
-      <div id='modal-body'>
+      <div id="modal-body">
         {{content}}
       </div>
     </div>
@@ -19,7 +19,7 @@ window.modal =
     $(modal.template.replace("{{content}}", content))
 
   open: (content) ->
-    if modal.is_opened()
+    if modal.isOpened()
       modal._update(content)
     else
       modal._create(content)
@@ -32,34 +32,44 @@ window.modal =
   _update: (content) ->
     $("#modal-body").html(content)
 
-  close: ->
+  close: (event) ->
+    event.preventDefault() if event
     $("body").removeClass("modal-open")
     $("#modal").remove()
     $(document).trigger("modal:close")
-    return false
+    return true
 
-  is_opened: ->
-    return $("#modal").length > 0
+  isOpened: -> return $("#modal").length > 0
 
-  is_closed: ->
-    return $("#modal").length == 0
+  isClosed: -> return $("#modal").length == 0
 
-  is_closable: ->
-    return $("#modal").hasClass("closable")
+  isClosable: -> return $("#modal").hasClass("closable")
 
-  autoclose: ->
-    modal.close() if modal.is_closable()
-    return false
+  autoclose: (event) ->
+    event.preventDefault() if event
+    modal.close() if modal.isClosable()
+    return true
 
-  set_closable: ->
-    $("#modal").addClass("closable")
+  # Modes : normal, nested, off, unknown
+  setModalMode: (mode) ->
+    mode = modal.parseModalMode(mode)
+    if mode != "unknown"
+      try document.querySelector("#modal").dataset.modal = mode
+    return true
 
-  set_unclosable: ->
-    $("#modal").removeClass("closable")
+  parseModalMode: (mode) ->
+    if String(mode) == "1"
+      console.log("[data-modal=1] if deprecated, please use [data-modal=nested] or [data-modal=normal]")
+      return "nested"
 
-  _set_closable_for_element: (element) ->
-    return modal.set_closable()   if $(element).is("[data-modal-closable=1]")
-    return modal.set_unclosable() if $(element).is("[data-modal-closable=0]")
+    if String(mode) == "0"
+      console.log("[data-modal=0] if deprecated, please use [data-modal=off]")
+      return "off"
+
+    if mode == "off" || mode == "normal" || mode == "nested"
+      return mode
+    else
+      return "unknown"
 
   openUrl: (url, type = "GET", data = {}) ->
     modal.open(modal.i18n.loading)
@@ -85,33 +95,60 @@ window.modal =
 
       error: ->
         modal.open(modal.i18n.error)
-        modal.set_closable()
 
   _callbacks:
-    links: ->
+    links: (event) ->
+      return unless modal.shouldOpenInModalForElement(this)
+
+      event.preventDefault()
       modal.openUrl(this.href)
-      modal._set_closable_for_element(this)
-      return false
+      modal.setModalMode(this.dataset.modal)
+
+    forms: (event) ->
+      return unless modal.shouldOpenInModalForElement(this)
+
+      event.preventDefault()
 
-    forms: ->
       if String(this.method).toLowerCase() == "get"
         data = $(this).serialize()
       else
         data = new FormData(this)
+
       modal.openUrl(this.action, this.method, data)
-      modal._set_closable_for_element(this)
-      return false
+      modal.setModalMode(this.dataset.modal)
 
     escape: (event) ->
       modal.autoclose() if event.keyCode == 27
+
+  shouldOpenInModalForElement: (element) ->
+    # ALWAYS ignore
+    return false if String(element.href).indexOf("javascript:") == 0
+    return false if String(element.href).indexOf("mailto:") == 0
+    return false if String(element.href).indexOf("tel:") == 0
+    return false if String(element.href).indexOf("sms:") == 0
+    return false if String(element.target).indexOf("_") == 0
+    return false if String(element.dataset.remote || "") != ""
+    return false if String(element.dataset.method || "") != ""
+    return false if modal.parseModalMode(element.dataset.modal) == "off"
+
+    # True if element mode is NORMAL or NESTED
+    elementMode = modal.parseModalMode(element.dataset.modal)
+    return true if elementMode == "normal" || elementMode == "nested"
+
+    # True if element is inside a NESTED modal
+    if $(element).parents("#modal[data-modal=nested]").length
+      return true
+
+    # Hidden forms created by jquery_ujs for remote links inside a NESTED modal
+    if $(element).parent().is("body.modal-open") && $("#modal[data-modal=nested]").length
       return true
 
+    return false
+
   setup: ->
     $(document).on("keyup", modal._callbacks.escape)
-    $(document).on("click", "#modal-overlay, #modal-close", modal.autoclose)
-    $(document).on("click", "a[data-modal=1], #modal a[href]:not([data-modal=0]):not([data-remote]):not([data-method])", modal._callbacks.links)
-    $(document).on("submit", "form[data-modal=1], #modal form:not([data-modal=0]):not([data-remote])", modal._callbacks.forms)
-    # Forms created by jquery_ujs for remote links
-    $(document).on("submit", "body.modal-open > form", modal._callbacks.forms)
+    $(document).on("click", "#modal-overlay, #modal-close, .modal-autoclose", modal.autoclose)
+    $(document).on("click", "a", modal._callbacks.links)
+    $(document).on("submit", "form", modal._callbacks.forms)
 
 modal.setup()

data/app/assets/stylesheets/agilibox/modals.sass

@@ -19,9 +19,10 @@ body.modal-open
 
 #modal-body
   position: relative
-  margin: 10vh auto
-  padding: 2rem
+  margin: 50px auto
+  padding: 20px
   width: auto
+  box-sizing: border-box
   min-width: 50%
   max-width: 980px
   background: white
@@ -32,14 +33,21 @@ body.modal-open
     overflow: auto
 
 #modal-close
+  margin: 0
+  padding: 0
+  display: block
+  font-size: 50px
+  line-height: 50px
+  height: 50px
+  width: 50px
+  position: fixed
+  top: 0px
+  right: 0px
   color: white
-  position: absolute
-  font-size: 4rem
-  line-height: 0.5rem
-  top: 0.25rem
-  right: 0.25rem
   border: none
+  outline: none
   background: none
+  text-align: center
 
 #modal:not(.closable) #modal-close
   display: none

data/app/filters/agilibox/small_data/filter_strategy_by_date_period.rb

@@ -0,0 +1,37 @@
+class Agilibox::SmallData::FilterStrategyByDatePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
+  def apply(query, value)
+    value = value.to_s
+
+    if value == "today"
+      a = Date.current
+      b = Date.current
+    elsif value == "yesterday"
+      a = (Date.current - 1.day)
+      b = (Date.current - 1.day)
+    elsif value == "this_week"
+      a = Date.current.beginning_of_week
+      b = Date.current.end_of_week
+    elsif value == "this_month"
+      a = Date.current.beginning_of_month
+      b = Date.current.end_of_month
+    elsif value == "this_year"
+      a = Date.current.beginning_of_year
+      b = Date.current.end_of_year
+    elsif value == "last_week"
+      a = (Date.current - 1.week).beginning_of_week
+      b = (Date.current - 1.week).end_of_week
+    elsif value == "last_month"
+      a = (Date.current - 1.month).beginning_of_month
+      b = (Date.current - 1.month).end_of_month
+    elsif value == "last_year"
+      a = (Date.current - 1.year).beginning_of_year
+      b = (Date.current - 1.year).end_of_year
+    else
+      return query
+    end
+
+    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
+
+    query.where("#{column} >= ? AND #{column} <= ?", a, b)
+  end
+end

data/app/filters/agilibox/small_data/filter_strategy_by_datetime_period.rb

@@ -0,0 +1,37 @@
+class Agilibox::SmallData::FilterStrategyByDatetimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
+  def apply(query, value)
+    value = value.to_s
+
+    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
+
+    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
+
+    query.where("#{column} >= ? AND #{column} <= ?", a, b)
+  end
+end

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

@@ -1,39 +1,6 @@
-class Agilibox::SmallData::FilterStrategyByTimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
-  def apply(query, value) # rubocop:disable Metrics/MethodLength
-    value = value.to_s
-
-    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
-
-    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
-
-    query
-      .where("DATE(#{column}) >= ?", a.to_date)
-      .where("DATE(#{column}) <= ?", b.to_date)
+class Agilibox::SmallData::FilterStrategyByTimePeriod
+  def initialize(*)
+    raise "FilterStrategyByTimePeriod is deprecated, please use " \
+      "FilterStrategyByDatePeriod or FilterStrategyByDatetimePeriod"
   end
 end

data/app/forms/agilibox/mini_form_object.rb

@@ -0,0 +1,29 @@
+class Agilibox::MiniFormObject < SimpleDelegator
+  include ActiveModel::Validations
+  extend Forwardable
+
+  def valid?
+    __getobj__.valid?
+    run_validations!
+  end
+
+  def invalid?
+    !valid?
+  end
+
+  alias validate valid?
+
+  def validate!
+    valid? || raise_validation_error
+  end
+
+  def_delegators :__getobj__, :errors
+
+  def save
+    valid? && __getobj__.save
+  end
+
+  def save!
+    validate! && __getobj__.save!
+  end
+end

data/lib/agilibox/cucumber_config.rb

@@ -7,10 +7,10 @@ class << Agilibox::CucumberConfig = Class.new
     @phantomjs_version ||= "2.1.1"
   end
 
-  attr_writer :phantomjs_window_size
+  attr_writer :window_size
 
-  def phantomjs_window_size
-    @phantomjs_window_size ||= [1680, 1050]
+  def window_size
+    @window_size ||= [1680, 1050]
   end
 
   attr_writer :databasecleaner_tables
@@ -24,7 +24,16 @@ class << Agilibox::CucumberConfig = Class.new
   end
 
   def require_all_helpers!
-    files = Dir.glob Agilibox::Engine.root.join("features/support/*.rb")
+    files = Dir.glob Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "*.rb")
+    files.delete_if { |f| f.match?(/poltergeist|chrome/) }
     files.each { |file| require file }
   end
+
+  def require_poltergeist!
+    require Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "poltergeist.rb")
+  end
+
+  def require_chrome_headless!
+    require Agilibox::Engine.root.join("lib", "agilibox", "cucumber_helpers", "chrome_headless.rb")
+  end
 end

data/lib/agilibox/cucumber_helpers/capybara.rb

@@ -0,0 +1,11 @@
+Capybara.register_driver :agilibox_no_driver do |_app|
+  raise "You need to add Agilibox::CucumberConfig.require_poltergeist! or "\
+    "Agilibox::CucumberConfig.require_chrome_headless! " \
+    "to your features/support/env.rb"
+end
+
+Capybara.default_driver    = :agilibox_no_driver
+Capybara.current_driver    = :agilibox_no_driver
+Capybara.javascript_driver = :agilibox_no_driver
+
+Capybara.default_max_wait_time = 3

data/lib/agilibox/cucumber_helpers/chrome_headless.rb

@@ -0,0 +1,16 @@
+Capybara.register_driver :agilibox_chrome_headless do |app|
+  window_size = Agilibox::CucumberConfig.window_size.map(&:to_s).join(",")
+
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    :chromeOptions => {args: %W(headless window-size=#{window_size})},
+  )
+
+  Capybara::Selenium::Driver.new(app,
+    :browser              => :chrome,
+    :desired_capabilities => capabilities,
+  )
+end
+
+Capybara.default_driver    = :agilibox_chrome_headless
+Capybara.current_driver    = :agilibox_chrome_headless
+Capybara.javascript_driver = :agilibox_chrome_headless

data/{features/support → lib/agilibox/cucumber_helpers}/poltergeist.rb

@@ -6,16 +6,15 @@ raise "invalid phantomjs version" if `#{phantomjs_binary} -v`.strip != phantomjs
 # You can download phantomjs here : https://bitbucket.org/ariya/phantomjs/downloads/
 # Semaphore setup commmand : change-phantomjs-version 2.1.1
 
-Capybara.register_driver :poltergeist do |app|
+Capybara.register_driver :agilibox_poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app,
     :debug       => false,
-    :window_size => Agilibox::CucumberConfig.phantomjs_window_size,
+    :window_size => Agilibox::CucumberConfig.window_size,
     :timeout     => 60,
     :phantomjs   => phantomjs_binary,
   )
 end
 
-Capybara.default_driver        = :poltergeist
-Capybara.javascript_driver     = :poltergeist
-Capybara.current_driver        = :poltergeist
-Capybara.default_max_wait_time = 3
+Capybara.default_driver    = :agilibox_poltergeist
+Capybara.javascript_driver = :agilibox_poltergeist
+Capybara.current_driver    = :agilibox_poltergeist

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -87,10 +87,13 @@ files:
 - app/filters/agilibox/small_data/filter_strategy_by_date.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date_begin.rb
 - app/filters/agilibox/small_data/filter_strategy_by_date_end.rb
+- app/filters/agilibox/small_data/filter_strategy_by_date_period.rb
+- app/filters/agilibox/small_data/filter_strategy_by_datetime_period.rb
 - app/filters/agilibox/small_data/filter_strategy_by_key_value.rb
 - app/filters/agilibox/small_data/filter_strategy_by_key_values.rb
 - app/filters/agilibox/small_data/filter_strategy_by_tags.rb
 - app/filters/agilibox/small_data/filter_strategy_by_time_period.rb
+- app/forms/agilibox/mini_form_object.rb
 - app/helpers/agilibox/all_helpers.rb
 - app/helpers/agilibox/bootstrap_helper.rb
 - app/helpers/agilibox/button_helper.rb
@@ -143,26 +146,27 @@ files:
 - config/locales/errors.fr.yml
 - config/routes.rb
 - db/migrate/20170502143330_enable_unaccent.rb
-- features/support/agilibox.rb
-- features/support/ajax.rb
-- features/support/database_cleaner.rb
-- features/support/env.rb
-- features/support/factory_bot.rb
-- features/support/fix_referrer.rb
-- features/support/poltergeist.rb
-- features/support/rails.rb
-- features/support/rspec.rb
-- features/support/screenshots.rb
-- features/support/select2.rb
-- features/support/sign_in.rb
-- features/support/simplecov.rb
-- features/support/timecop.rb
-- features/support/turbolinks.rb
-- features/support/zonebie.rb
 - lib/agilibox.rb
 - lib/agilibox/active_record_comma_type_cast.rb
 - lib/agilibox/core_and_rails_ext.rb
 - lib/agilibox/cucumber_config.rb
+- lib/agilibox/cucumber_helpers/agilibox.rb
+- lib/agilibox/cucumber_helpers/ajax.rb
+- lib/agilibox/cucumber_helpers/capybara.rb
+- lib/agilibox/cucumber_helpers/chrome_headless.rb
+- lib/agilibox/cucumber_helpers/database_cleaner.rb
+- lib/agilibox/cucumber_helpers/factory_bot.rb
+- lib/agilibox/cucumber_helpers/fix_referrer.rb
+- lib/agilibox/cucumber_helpers/poltergeist.rb
+- lib/agilibox/cucumber_helpers/rails.rb
+- lib/agilibox/cucumber_helpers/rspec.rb
+- lib/agilibox/cucumber_helpers/screenshots.rb
+- lib/agilibox/cucumber_helpers/select2.rb
+- lib/agilibox/cucumber_helpers/sign_in.rb
+- lib/agilibox/cucumber_helpers/simplecov.rb
+- lib/agilibox/cucumber_helpers/timecop.rb
+- lib/agilibox/cucumber_helpers/turbolinks.rb
+- lib/agilibox/cucumber_helpers/zonebie.rb
 - lib/agilibox/engine.rb
 - lib/agilibox/engine_file.rb
 - lib/agilibox/form_back_url.rb
@@ -191,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Agilibox

data/features/support/env.rb

@@ -1,3 +0,0 @@
-ENV["RAILS_ROOT"] ||= File.expand_path("../../spec/dummy", __dir__)
-require "cucumber/rails"
-require "agilibox/cucumber_config"