thredded-workgroup 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e900db2dd2e7b571e3d3fcb4fac889dbdb8d40d96902a2952b97cbf6bb09704f
-  data.tar.gz: 22794ff545fa54b6e0b26680ee53dacb5a472ccbe8658413534ea327344ddf47
+  metadata.gz: 5a4b87b36c16619b50e64a3279c978938cc4656be82573b6b86b65e3fec7ea9c
+  data.tar.gz: 531f7e1814b3f671b74040ab78002da8ce237c948fe9a6ad89162339fa1aa510
 SHA512:
-  metadata.gz: 67d6def354e8949bf6cff37ddbd360a96a6a9a40a01260ebb7691e400d806796815ab017355ce778de415c368edb7eecefc2fe34f4fbb8b50127b68917e9fc91
-  data.tar.gz: dc65476c53d44b297f13e5c1ca62309c6ec6436d9cfa90ee7f62e43d75b1b300226cae7b79a6be21f55617adaafea15192d6cab60943aeb7f41954161c62b08d
+  metadata.gz: a60532df9ba718818df6a18903cef78f3b9d269c36ba361296d57db7b13ff5a6de2297961855f98507e4ae00a5672ed22a4f4e784688efe9af560e029d1a6971
+  data.tar.gz: 1dff132aea3c5179bb706327d4f4c6f988492d6a197ba4045778e75f89cb83de73eacaa8fdc7e0915e6a5f81eb505510d0c01026ec9812009fcd689bef1df1a5

data/.rubocop.yml

@@ -15,6 +15,15 @@ AllCops:
   CacheRootDirectory: tmp # ie. tmp/rubocop_cache
   UseCache: true
 
+Layout/EndAlignment:
+  AutoCorrect: true
+
+Layout/LineLength:
+  Max: 120
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -22,10 +31,23 @@ Metrics/ClassLength:
   Max: 125
 
 Metrics/BlockLength:
+  CountComments: false  # count full line comments?
+  IgnoredMethods:
+    - 'context'
+    - 'configure'
+    - 'describe'
+    - 'namespace'
+    - 'shared_examples_for'
+    - 'shared_examples'
+    - 'pending'
+    - 'shared_context'
+    - 'xcontext'
+    - 'xdescribe'
+    - 'it'
   Exclude:
-    - 'spec/factories/*'
-Layout/LineLength:
-  Max: 120
+    - 'db/schema.rb'
+    - 'spec/factories/**/*'
+    - '*.gemspec'
 
 Metrics/MethodLength:
   Max: 25
@@ -37,19 +59,29 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Naming/PredicateName:
+  Exclude:
+  - spec/**/*.rb
+
+Rails:
+  Enabled: true
+
+Rails/Date:
+  EnforcedStyle: strict
+
+Rails/FindBy:
+  Enabled: true
+  Include:
+  - app/commands/**/*.rb
+  - app/models/**/*.rb
+  - app/view_models/**/*.rb
+
 Style/CollectionMethods:
   Enabled: true
 
 Style/Documentation:
   Enabled: false
 
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Naming/PredicateName:
-  Exclude:
-  - spec/**/*.rb
-
 Style/SignalException:
   EnforcedStyle: semantic
 
@@ -65,18 +97,3 @@ Style/TrailingCommaInHashLiteral:
 Style/TrailingCommaInArguments:
   Enabled: false
 
-Rails:
-  Enabled: true
-
-Rails/Date:
-  EnforcedStyle: strict
-
-Rails/FindBy:
-  Enabled: true
-  Include:
-  - app/commands/**/*.rb
-  - app/models/**/*.rb
-  - app/view_models/**/*.rb
-
-Layout/EndAlignment:
-  AutoCorrect: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.4.1
+
+* Fix for a bug with pagination
+
 # v0.4.0
 
 This version supports:

data/app/view_models/thredded/workgroup/paginator.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Thredded
+  module Workgroup
+    class Paginator < Kaminari::Helpers::Paginator
+      module UrlFixer
+        def page_url_for(page)
+          params = params_for(page)
+          params[:only_path] = true
+          @template.thredded_workgroup.url_for params
+        end
+      end
+
+      # Override the Kaminari::Helpers::Paginator methods as of kaminari v1.2.2 (fragile)
+      def page_tag(page)
+        @last = Thredded::Workgroup::Paginator::Page.new @template, **@options.merge(page: page)
+      end
+
+      # rubocop:disable Security/Eval
+      # rubocop:disable Style/DocumentDynamicEvalDefinition
+      %w[first_page prev_page next_page last_page gap].each do |tag|
+        eval <<-DEF, nil, __FILE__, __LINE__ + 1
+          def #{tag}_tag
+            @last = Thredded::Workgroup::Paginator::#{tag.classify}.new @template, **@options
+          end
+        DEF
+      end
+
+      # Create the relevant classes with the URL overrides
+      %w[page first_page prev_page next_page last_page gap].each do |tag|
+        eval <<-DEF, nil, __FILE__, __LINE__ + 1
+          class #{tag.classify} < ::Kaminari::Helpers:: #{tag.classify}
+            include UrlFixer
+          end
+        DEF
+      end
+      # rubocop:enable Security/Eval
+      # rubocop:enable Style/DocumentDynamicEvalDefinition
+    end
+  end
+end

data/app/views/thredded/workgroup/topics/_topics_with_last_post.html.erb

@@ -11,6 +11,6 @@
       method: :put -%>
 
   <footer>
-    <%= paginate @topics %>
+    <%= paginate(@topics, paginator_class: Thredded::Workgroup::Paginator) %>
   </footer>
 <% end %>

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+                                           Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/lib/thredded/workgroup/version.rb

@@ -2,6 +2,6 @@
 
 module Thredded
   module Workgroup
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded-workgroup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tim Diggins
@@ -448,6 +448,7 @@ files:
 - app/controllers/thredded/workgroup/topics_controller.rb
 - app/jobs/thredded/workgroup/mark_all_topics_read_job.rb
 - app/view_hooks/thredded/workgroup/view_hooks.rb
+- app/view_models/thredded/workgroup/paginator.rb
 - app/view_models/thredded/workgroup/topics_page_view_with_last_post.rb
 - app/views/layouts/thredded/workgroup/application.html.erb
 - app/views/thredded/posts_common/form/_after_content.html.erb
@@ -469,6 +470,7 @@ files:
 - bin/dummy-rails
 - bin/rails.rb
 - bin/rspec
+- bin/rubocop
 - bin/setup
 - bin/update_from_thredded
 - config/locales/en.yml