bhf 1.0.0.beta16 → 1.0.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3eade6bcba108b7540734cdf65ca9ed614ab2cfd64ec4934fbad4a1672191e1
-  data.tar.gz: 5e44a86b58952cafa8cd27c85f7b87c39f421aa4d6f3c3fcc6159fcdf05531e6
+  metadata.gz: 2b5298af67d1ce81fd480ff168ea34424fd68c3a523fb01a9b9b75db5bf0d407
+  data.tar.gz: ba5c1c87b5ce5bf6973ad2c9129d411ebd4f5ee02a2a3c10337d995281225684
 SHA512:
-  metadata.gz: a4dd961161d6f083d5c1963d5272c450fca87a165bcc2479ee7786a14113d562469cbdb0d8afe732319683479ab344be66ad64a844d1583ddd432378880c387a
-  data.tar.gz: 49e8e4bfdc24fe1adc6fcdb3d18689e8e4ec32aa115c7a3d8f566d021dafa042cb7f5a65c585f5fc978a80a860d944e981e7b9626357f7819e4e71344ca6e749
+  metadata.gz: a3ad8e0e543832cdfbafa9d76a90aae827f39d9fd7610af7b0e57cd7b220f5d069f253df3c1c46a9f9c24b773696f886d108b82223dc6e959a5bbb02d9563659
+  data.tar.gz: 4ea00b40824a778a7155bef419819fd59438aa7ded663399856b34dd1cdad5565285c0ec3da6ee0c385b97fbc378d6f361b9727557b4d7de94068f478ffa9790

data/.rvm

@@ -0,0 +1 @@
+3.4

data/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'rails',        '>= 5.2.2.1'
+gem 'rails',        '>= 8.0.3'
 gem 'sass-rails',   '>= 6'
 gem 'turbolinks',   '>= 2'
-gem 'kaminari',     '>= 0'
+gem 'kaminari',     '>= 1.2.2'
 gem 'haml-rails',   '>= 0'
 
 

data/Gemfile.lock

@@ -1,74 +1,104 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      mail (>= 2.7.1)
-    actionmailer (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      rack (~> 2.0, >= 2.0.8)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      mail (>= 2.8.0)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.1)
-      activesupport (= 6.0.2.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activestorage (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
+      timeout (>= 0.4.0)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
+      marcel (~> 1.0)
+    activesupport (8.0.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.4.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.3.1)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
     crass (1.0.6)
+    date (3.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.3.2)
-    erubi (1.9.0)
-    erubis (2.7.0)
+    docile (1.4.1)
+    drb (2.2.3)
+    erb (5.1.1)
+    erubi (1.13.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
-    git (1.5.0)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
+    git (1.11.0)
+      rchardet (~> 1.8)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -76,26 +106,27 @@ GEM
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    haml (5.1.2)
-      temple (>= 0.8.0)
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
-    haml-rails (2.0.1)
+    haml-rails (3.0.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
-      haml (>= 4.0.6, < 6.0)
-      html2haml (>= 1.0.1)
+      haml (>= 4.0.6)
       railties (>= 5.1)
-    hashie (4.0.0)
-    highline (2.0.3)
-    html2haml (2.2.0)
-      erubis (~> 2.7.0)
-      haml (>= 4.0, < 6)
-      nokogiri (>= 1.6.0)
-      ruby_parser (~> 3.5)
-    i18n (1.8.3)
+    hashie (5.0.0)
+    highline (3.1.2)
+      reline
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     jeweler (2.3.9)
       builder
       bundler
@@ -107,86 +138,125 @@ GEM
       rake
       rdoc
       semver2
-    json (2.3.0)
-    jwt (2.2.1)
-    kaminari (1.2.1)
+    jwt (2.10.2)
+      base64
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
-    loofah (2.6.0)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.1.0)
     mime-types (2.99.3)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.0.2)
-    mini_portile2 (2.8.0)
-    minitest (5.14.1)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.13.4)
-      mini_portile2 (~> 2.8.0)
+    mini_mime (1.1.5)
+    minitest (5.26.0)
+    multi_json (1.17.0)
+    multi_xml (0.7.2)
+      bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
+    net-imap (0.5.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.10-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    oauth2 (1.4.2)
-      faraday (>= 0.8, < 2.0)
+    nokogiri (1.18.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-musl)
+      racc (~> 1.4)
+    oauth2 (1.4.8)
+      faraday (>= 0.8, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.1.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.2.1)
-      actioncable (= 6.0.2.1)
-      actionmailbox (= 6.0.2.1)
-      actionmailer (= 6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actiontext (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rack (2.2.20)
+    rack-session (1.0.2)
+      rack (< 3)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      bundler (>= 1.15.0)
+      railties (= 8.0.3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rdoc (6.3.1)
-    ruby_parser (3.14.1)
-      sexp_processor (~> 4.9)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rake (13.3.0)
+    rchardet (1.10.0)
+    rdoc (6.15.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.2)
+      io-console (~> 0.5)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -194,49 +264,65 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    securerandom (0.4.1)
     semver2 (3.4.2)
-    sexp_processor (4.13.0)
-    shoulda (3.6.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 3.0)
-    shoulda-context (1.2.2)
-    shoulda-matchers (3.1.3)
-      activesupport (>= 4.0.0)
-    simplecov (0.17.1)
+    shoulda (4.0.0)
+      shoulda-context (~> 2.0)
+      shoulda-matchers (~> 4.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.5.1)
+      activesupport (>= 4.2.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (4.0.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      logger
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    temple (0.8.2)
-    thor (1.0.1)
+    stringio (3.1.7)
+    temple (0.10.4)
+    thor (1.4.0)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.6.1)
+    timeout (0.4.3)
+    tsort (0.2.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.4)
+    useragent (0.16.11)
+    webrick (1.9.1)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
+    zeitwerk (2.7.3)
 
 PLATFORMS
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   bundler (>= 1)
   haml-rails
   jeweler (>= 2)
-  kaminari
-  rails (>= 5.2.2.1)
+  kaminari (>= 1.2.2)
+  rails (>= 8.0.3)
   rdoc (>= 3)
   sass-rails (>= 6)
   shoulda (>= 3)
@@ -244,4 +330,4 @@ DEPENDENCIES
   turbolinks (>= 2)
 
 BUNDLED WITH
-   1.17.3
+   2.5.17

data/VERSION

@@ -1 +1 @@
-1.0.0.beta16
+1.0.0.beta18

data/app/assets/javascripts/bhf/application.js

@@ -43,7 +43,7 @@
 	var triggerPlatformPagination = function(href, platform, callback){
 		window.history.pushState({ turbolinks: true, url: href }, '', href);
 		ajaxNote.loading();
-		new Request.HTML({
+		new Request.bhf({
 			method: 'get',
 			url: href,
 			onFailure: function(){

data/app/assets/javascripts/bhf/classes/QuickEdit.js

@@ -18,7 +18,7 @@ var QuickEdit = new Class({
 		this.newEntry = this.linkElem.hasClass('js_add_field');
 
 		this.fireEvent('startRequest');
-		this.currentRequest = new Request.HTML({
+		this.currentRequest = new Request.bhf({
 			method: 'get',
 			evalScripts: false,
 			url: element.get('href'),

data/app/assets/javascripts/bhf/classes/Request_bhf.js

@@ -37,6 +37,9 @@ Request.bhf = new Class({
 			this.headers['Content-type'] = 'application/x-www-form-urlencoded' + encoding;
 		}
 
+		// Set X-Requested-With header to identify AJAX requests
+		this.headers['X-Requested-With'] = 'XMLHttpRequest';
+
 		if (!url) url = document.location.pathname;
 
 		var trimPosition = url.lastIndexOf('/');

data/app/controllers/bhf/entries_controller.rb

@@ -253,7 +253,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
     end
 
     def set_quick_edit
-      @quick_edit = request.xhr?
+      @quick_edit = request.headers['X-Requested-With'] == 'XMLHttpRequest'
     end
 
     def redirect_after_save(flash)

data/app/controllers/bhf/pages_controller.rb

@@ -2,14 +2,13 @@ class Bhf::PagesController < Bhf::ApplicationController
   before_action :set_page
 
   def show
-    @edit_params = {}
     unless platform_options = @settings.content_for_page(@page)
       raise Exception.new("Page '#{@page}' could not be found")
     end
 
-    if request.xhr?
+    if request.headers['X-Requested-With'] == 'XMLHttpRequest'
       params.each do |key, value|
-        return render_platform(key) if value.is_a?(ActionController::Parameters) && value[:page] != nil
+        return render_platform(key) if value.is_a?(ActionController::Parameters)
       end
     end
 
@@ -50,8 +49,6 @@ class Bhf::PagesController < Bhf::ApplicationController
 
       page_params = { page: page, per_page: per_page }
 
-      @edit_params[platform.name] = page_params
-
       platform.get_objects(p, page_params)
     end
 

data/app/helpers/bhf/pages_helper.rb

@@ -2,16 +2,16 @@ module Bhf
   module PagesHelper
 
     def get_value(key, p)
-      return unless p.is_a?(Hash)
+      return unless p.is_a?(ActionController::Parameters)
 
-      return p[key[0]][key[1]] if key.is_a?(Array) && p[key[0]].is_a?(Hash) && p[key[0]][key[1]].is_a?(String) #omg
+      return p[key[0]][key[1]] if key.is_a?(Array) && p[key[0]].is_a?(ActionController::Parameters) && p[key[0]][key[1]].is_a?(String) #omg
 
       p[key] if p[key] && p[key].is_a?(String)
     end
 
     def current_order_path(order_by, platform_name)
       params_platfrom = params[platform_name] ? params[platform_name].clone : ActionController::Parameters.new({})
-      params_platfrom.permit! 
+      params_platfrom.permit!
 
       if params_platfrom['order'] == order_by && params_platfrom['direction'] != 'desc'
         params_platfrom['direction'] = 'desc'

data/app/views/bhf/pages/_search.html.haml

@@ -10,7 +10,7 @@
     - if platform.search_field?
       = s.text_field :text, value: get_value([:search, :text], p), placeholder: t('bhf.helpers.searchform.placeholder')
 
-    - if p && p[:search].is_a?(Hash)
+    - if p && p[:search].is_a?(ActionController::Parameters)
       - p[:search].each do |key, value|
         = s.hidden_field key, value: value, id: nil, class: (:hidden_search if key == 'text')
 

data/app/views/kaminari/bhf/_paginator.html.haml

@@ -2,7 +2,7 @@
   = prev_page_tag
 
   - each_page do |page|
-    - if page.left_outer? || page.right_outer? || page.inside_window?
+    - if page.display_tag?
       = page_tag page
     - elsif !page.was_truncated?
       = gap_tag

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 1.0.0.beta16 ruby lib
+# stub: bhf 1.0.0.beta18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf".freeze
-  s.version = "1.0.0.beta16"
+  s.version = "1.0.0.beta18".freeze
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Anton Pawlik".freeze]
-  s.date = "2023-04-11"
+  s.date = "1980-01-02"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid.".freeze
   s.email = "anton.pawlik@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".editorconfig",
+    ".rvm",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -174,46 +175,20 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://antpaw.github.io/bhf".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.9".freeze
+  s.rubygems_version = "3.6.9".freeze
   s.summary = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user.".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
-      s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6"])
-      s.add_runtime_dependency(%q<turbolinks>.freeze, [">= 2"])
-      s.add_runtime_dependency(%q<kaminari>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0"])
-      s.add_development_dependency(%q<shoulda>.freeze, [">= 3"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 3"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 1"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 2"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
-      s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
-      s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
-      s.add_dependency(%q<kaminari>.freeze, [">= 0"])
-      s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
-      s.add_dependency(%q<shoulda>.freeze, [">= 3"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 3"])
-      s.add_dependency(%q<bundler>.freeze, [">= 1"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 2"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>.freeze, [">= 5.2.2.1"])
-    s.add_dependency(%q<sass-rails>.freeze, [">= 6"])
-    s.add_dependency(%q<turbolinks>.freeze, [">= 2"])
-    s.add_dependency(%q<kaminari>.freeze, [">= 0"])
-    s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
-    s.add_dependency(%q<shoulda>.freeze, [">= 3"])
-    s.add_dependency(%q<rdoc>.freeze, [">= 3"])
-    s.add_dependency(%q<bundler>.freeze, [">= 1"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 2"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<rails>.freeze, [">= 8.0.3".freeze])
+  s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6".freeze])
+  s.add_runtime_dependency(%q<turbolinks>.freeze, [">= 2".freeze])
+  s.add_runtime_dependency(%q<kaminari>.freeze, [">= 1.2.2".freeze])
+  s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<shoulda>.freeze, [">= 3".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, [">= 3".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, [">= 1".freeze])
+  s.add_development_dependency(%q<jeweler>.freeze, [">= 2".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
 end
 

data/lib/bhf/platform/pagination.rb

@@ -1,15 +1,3 @@
-Kaminari::Helpers::Tag.class_eval do
-  def page_url_for(page)
-    if @param_name.is_a?(Array)
-      @params[@param_name[0]] = (@params[@param_name[0]] || {}).merge(@param_name[1] => (page <= 1 ? 1 : page))
-      return @template.url_for @params
-    end
-
-    @template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page))
-  end
-end
-# TODO: monitor https://github.com/amatsuda/kaminari/issues/542#issuecomment-40294388
-
 module Bhf::Platform
 
   class Pagination
@@ -27,8 +15,7 @@ module Bhf::Platform
 
       links = if !(page_links = template.paginate(platform.objects,
         theme: 'bhf',
-        param_name: [platform.name, :page],
-        params: template.params.permit!
+        param_name: "#{platform.name}[page]",
       )).blank?
         "#{load_more(platform)} #{page_links}"
       elsif platform.objects.total_pages == 1 && platform.objects.size > @offset_to_add
@@ -69,7 +56,7 @@ module Bhf::Platform
     end
 
     def load_more(platform, attributes = {}, plus = true)
-      platform_params = template.params[platform.name] || {}
+      platform_params = (template.params[platform.name] || ActionController::Parameters.new).dup
       load_offset = @offset_per_page
       load_offset = platform_params[:per_page].to_i if platform_params[:per_page]
       if plus
@@ -80,12 +67,14 @@ module Bhf::Platform
 
       platform_params.delete(:page)
       platform_params[:per_page] = load_offset
+      platform_params.permit!
 
       direction = plus ? 'more' : 'less'
 
       parsed_paramas = {
         bhf_area: template.params[:bhf_area],
-        page: template.params[:page]
+        page: template.params[:page],
+        format: nil
       }.merge(platform.name.to_sym => platform_params)
       template.link_to(
         I18n.t("bhf.pagination.load_#{direction}"),

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta16
+  version: 1.0.0.beta18
 platform: ruby
 authors:
 - Anton Pawlik
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: 8.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: 8.0.3
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +160,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".editorconfig"
+- ".rvm"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -316,7 +316,6 @@ homepage: https://antpaw.github.io/bhf
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -327,12 +326,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A simple to use Rails-Engine-Gem that offers an admin interface for trusted
   user.