active_list 6.10.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5baaa0da5fd9dd52b02bc136ea12da6ebe1ae498
-  data.tar.gz: b4b7bb336a78617923273ff0fae085552a7d8669
+  metadata.gz: '022092abfbb1ef56a9e935ba1f815b5f13dd7fc4'
+  data.tar.gz: c15a78e14c48e10bfe281e2f735e5b3bc9084ea7
 SHA512:
-  metadata.gz: f8bc42dfee4953d3a2b3d260e8afd18ef54a5fd66bb8e4976e5a155897b4c0f1dfa4381f2736f463b0fd8b1270c382342401d63f2059c0048bcc0ab52f2d35a7
-  data.tar.gz: e03b4bc03ddfd5f31d5c4a1b90c98920d62021a9f1f9c4ef44feafc234299a6d7e2c0e85231533751de7db6f1f71d0bb62e6dc0bc5685c5f73e42daacfa5b750
+  metadata.gz: 51bed46ba112355efe2aadbeae3e652296fbe9071d63d915a73d4189b87c21b933c44b3af2eefc14032827bcf13e5e370f6310f6f30dc66c30ddbaf658330013
+  data.tar.gz: edc59cfcb98fa9f621d67f1f6b593657ca2e1ede60c22631884c0ec749ed455e5ff0e8724c6559e2a2e8a915288d22311d8d72a6247aaea69687b7df29eb5fd5

data/app/assets/javascripts/active_list.jquery.js.coffee

@@ -23,7 +23,7 @@ ActiveList = {}
         content = $(data)
         list_data = content.find(".list-data")
         list_control = content.find(".list-control")
-        for type in ["actions", "pagination", "settings"]
+        for type in ["actions", "pagination", "footer-pagination","settings"]
           $("*[data-list-ref='#{list_id}'].list-#{type}").replaceWith list_control.find(".list-#{type}")
         list.find(".list-data").html(list_data)
         selection = list.prop('selection')

data/app/assets/stylesheets/active_list/theme.scss

@@ -78,7 +78,7 @@
     @include background(transparentize(mix($theme-color, #FFF, 40%), 0.7));
   }
 
-  .list-pagination {
+  .list-pagination, .list-footer-pagination {
     & { text-align: left; }
     html[dir="rtl"] & { text-align: right; }
     & > * {

data/lib/active_list.rb

@@ -4,6 +4,7 @@ require 'action_dispatch'
 require 'rails'
 require 'code_string'
 require 'i18n-complements'
+require 'tmpdir'
 
 module ActiveList
   # Build and returns a short UID

data/lib/active_list/exporters/csv_exporter.rb

@@ -6,7 +6,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::CSV
+        Mime[:csv]
       end
 
       def send_data_code

data/lib/active_list/exporters/excel_csv_exporter.rb

@@ -9,7 +9,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::XCSV
+        Mime[:xcsv]
       end
 
       def send_data_code

data/lib/active_list/exporters/open_document_spreadsheet_exporter.rb

@@ -19,7 +19,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::ODS
+        Mime[:ods]
       end
 
       def send_data_code

data/lib/active_list/generator.rb

@@ -83,7 +83,8 @@ module ActiveList
 
     def session_initialization_code
       code = "options = {} unless options.is_a? Hash\n"
-      code << "options.update(params)\n"
+      # For Rails 5
+      code << "options.update(params.to_unsafe_h)\n"
       if defined?(User) && User.instance_methods.include?(:preference)
         code << "#{var_name(:params)} = YAML::load(current_user.preference('list.#{view_method_name}', YAML::dump({})).value).symbolize_keys\n"
         code << "#{var_name(:params)} = {} unless #{var_name(:params)}.is_a?(Hash)\n"

data/lib/active_list/renderers/simple_renderer.rb

@@ -42,6 +42,8 @@ module ActiveList
         extras = extras_codes
 
         code = generator.select_data_code
+        # Hack for Rails 5
+        code << "__params = params.permit!\n"
         code << "#{var_name(:tbody)} = '<tbody data-total=\"' + #{var_name(:count)}.to_s + '\""
         if table.paginate?
           code << " data-per-page=\"' + #{var_name(:limit)}.to_s + '\""
@@ -54,9 +56,9 @@ module ActiveList
         code << "    #{var_name(:attrs)}['data-' + options[:data].gsub('_', '-')] = #{record}.send(options[:data]) if options[:data]\n"
         if table.options[:line_class]
           code << "    #{var_name(:attrs)}[:class] = (#{recordify!(table.options[:line_class], record)}).to_s\n"
-          code << "    #{var_name(:attrs)}[:class] << ' focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
+          code << "    #{var_name(:attrs)}[:class] << ' focus' if __params['#{table.name}-id'].to_i == #{record}.id\n"
         else
-          code << "    #{var_name(:attrs)}[:class] = 'focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
+          code << "    #{var_name(:attrs)}[:class] = 'focus' if __params['#{table.name}-id'].to_i == #{record}.id\n"
         end
         code << "    #{var_name(:tbody)} << content_tag(:tr, #{var_name(:attrs)}) do\n"
         code << columns_to_cells(:body, record: record).dig(3)
@@ -108,6 +110,7 @@ module ActiveList
           code << "options[:content_for] ||= {}\n"
           code << "#{var_name(:extras)} = ''\n"
           extras.each do |name, ecode|
+            next if name == :footer_pagination
             code << "if options[:content_for][:#{name}]\n"
             code << "  content_for(options[:content_for][:#{name}], (#{ecode}).html_safe)\n"
             code << "else\n"
@@ -128,10 +131,21 @@ module ActiveList
         code << "end\n"
         code << "#{var_name(:content)} << #{var_name(:tbody)}\n"
         code << "#{var_name(:content)} << '</table></div>'\n"
+
+        if table.options[:footer_pagination]
+          code << "  footer_code = ''\n"
+          code << "  if options[:content_for][:footer_pagination]\n"
+          code << "    footer_code << content_for(options[:content_for][:pagination])\n"
+          code << "  else\n"
+          code << "    footer_code << (#{extras[:footer_pagination]})\n"
+          code << "  end\n"
+          code << "  #{var_name(:content)} << content_tag(:div, (footer_code).html_safe, class: 'list-control') unless footer_code.blank?\n"
+        end
+
         # code << "return #{var_name(:content)}.html_safe if options[:only] == 'content'\n"
 
         # Build whole
-        code << "return ('<div id=\"#{uid}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
+        code << "return ('<div id=\"#{uid}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + __params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
         # File.open('debug-activelist', 'w') { |file| file.write code }
         code
       end
@@ -283,7 +297,7 @@ module ActiveList
         menu << '<li class="separator"></li>'
         # Exports
         ActiveList.exporters.each do |format, _exporter|
-          menu << "<li class=\"export export-#{format}\">' + link_to(content_tag(:i) + h('list.export_as'.t(exported: :#{format}.t(scope: 'list.export.formats'))), params.merge(action: :#{generator.controller_method_name}, sort: #{var_name(:params)}[:sort], dir: #{var_name(:params)}[:dir], format: '#{format}')) + '</li>"
+          menu << "<li class=\"export export-#{format}\">' + link_to(content_tag(:i) + h('list.export_as'.t(exported: :#{format}.t(scope: 'list.export.formats'))), __params.merge(action: :#{generator.controller_method_name}, sort: #{var_name(:params)}[:sort], dir: #{var_name(:params)}[:dir], format: '#{format}')) + '</li>"
         end
         menu << '</ul></span>'
         menu
@@ -369,6 +383,26 @@ module ActiveList
 
           code << "'#{pagination}'"
           codes[:pagination] = "'#{pagination}'"
+
+          if table.options[:footer_pagination]
+            pagination = ''
+            current_page = var_name(:page).to_s
+            last_page = var_name(:last).to_s
+
+            pagination << "<span class=\"list-footer-pagination\" data-list-ref=\"#{uid}\">"
+            pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + (#{var_name(:count)} > 0 ? 1 : 0)), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
+
+            pagination << '<span class="paginator">'
+            pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} - 1).to_s + '\" class=\"btn previous-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.previous') + '</a>"
+
+            pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} + 1).to_s + '\" class=\"btn next-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.next')+'</a>"
+            pagination << '</span>'
+
+            pagination << '</span>'
+
+            code << "'#{pagination}'"
+            codes[:footer_pagination] = "'#{pagination}'"
+          end
         end
         codes
       end

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.10.0'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/test/dummy/Gemfile

@@ -1,23 +1,23 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.10'
+gem 'rails', '~> 5.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'active_list', path: '../..'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 4'
-  gem 'coffee-rails', '~> 4'
+  gem 'sass-rails'
+  gem 'coffee-rails'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', platform: :ruby
 
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier'
 end
 
 gem 'jquery-rails'

data/test/dummy/db/migrate/20120510131331_create_people.rb

@@ -1,4 +1,4 @@
-class CreatePeople < ActiveRecord::Migration
+class CreatePeople < ActiveRecord::Migration[4.2]
   def change
     create_table :people do |t|
       t.string :name

data/test/dummy/db/migrate/20120510134500_create_contacts.rb

@@ -1,4 +1,4 @@
-class CreateContacts < ActiveRecord::Migration
+class CreateContacts < ActiveRecord::Migration[4.2]
   def change
     create_table :contacts do |t|
       t.integer :person_id

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,26 +10,26 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20120510134500) do
+ActiveRecord::Schema.define(version: 2012_05_10_134500) do
 
   create_table "contacts", force: :cascade do |t|
-    t.integer  "person_id"
-    t.text     "address"
-    t.string   "phone"
-    t.string   "fax"
-    t.string   "country"
+    t.integer "person_id"
+    t.text "address"
+    t.string "phone"
+    t.string "fax"
+    t.string "country"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "people", force: :cascade do |t|
-    t.string   "name"
-    t.date     "born_on"
-    t.decimal  "height"
-    t.decimal  "balance_amount"
-    t.string   "currency"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.string "name"
+    t.date "born_on"
+    t.decimal "height"
+    t.decimal "balance_amount"
+    t.string "currency"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/test/people_controller_test.rb

@@ -5,10 +5,10 @@ class PeopleControllerTest < ActionController::TestCase
     get :list
     assert_response :success
 
-    get :list, format: :csv
+    get :list, params: {format: :csv}
     assert_response :success
 
-    get :list, format: :ods
+    get :list, params: {format: :ods}
     assert_response :success
   end
 
@@ -18,19 +18,19 @@ class PeopleControllerTest < ActionController::TestCase
   end
 
   test 'parameters' do
-    get :list, 'people-id' => 10
+    get :list, params: {'people-id' => 10}
     assert_response :success
 
-    get :list, page: 0
+    get :list, params: {page: 0}
     assert_response :success
 
-    get :list, page: 5, per_page: 25
+    get :list, params: {page: 5, per_page: 25}
     assert_response :success
 
-    get :list, page: 50, per_page: 25
+    get :list, params: {page: 50, per_page: 25}
     assert_response :success
 
-    get :list, page: 500, per_page: 25
+    get :list, params: {page: 500, per_page: 25}
     assert_response :success
   end
 end

data/test/test_helper.rb

@@ -23,6 +23,22 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'test.com'
 
+# Patch from https://github.com/rails/rails/issues/34790#issuecomment-450502805
+if RUBY_VERSION >= '2.6.0'
+  if Rails.version < '5'
+    class ActionController::TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        # hack to avoid MonitorMixin double-initialize error:
+        @mon_mutex_owner_object_id = nil
+        @mon_mutex = nil
+        initialize
+      end
+    end
+  else
+    puts "Monkeypatch for ActionController::TestResponse no longer needed"
+  end
+end
+
 module ActionView
   class Base
     module Nomen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.10.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +90,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: Generates action methods to provide clean tables.
 email: burisu@oneiros.fr
 executables: []