workarea-blog 3.4.7 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1c8e1727a95ff4cd8f73da3558b384924fcaf8fff71ef322f4f5af28a7054ea
-  data.tar.gz: c1fbb6fdf5b849405aec0ad85e480857bbc21a8ac735f5825ed56040d0ba9339
+  metadata.gz: 5e87f8cf05f4855dc05e2a61e1df898971902d7408e691db8c5d70a25e4194fc
+  data.tar.gz: 5fa1624cd20946a0a29c968d6861a457dead106368c55cc438dafba48629a961
 SHA512:
-  metadata.gz: e0226d6237319795f8e6598e052cac59f1679fd3d4b58a7dfdf9c986a1259fcebb45445e40933feb987ee0e5ec88a7ea675d7a9607cf911ac5348655be130461
-  data.tar.gz: 1043b6310f5634704e21cf2f0eef1212771faf690ba3c2b6eded8b8ac52eaec1b14e5fdbe0319c328e126b9aa71d60e98d8d6640e60a8857154b6b58e0ea3fc2
+  metadata.gz: 7bfd69d488b23f9616d981b78c100513c49110cedfd6232924d44295c4b4f4e88d01924a7409f607f30f3bab8105c3e1ba8e2686db556b8c1350c252ac9a45f3
+  data.tar.gz: b7125a6748b4ed90bf72f32150e0b64fe298b37d692e961a93594a103a49dd060a6e2d339ce5d83a2eec0e77b0694ab7f8b760701a356008fd2221a19c7918d5

data/.gitignore

@@ -12,5 +12,5 @@ test/dummy/tmp/
 test/dummy/public/
 node_modules
 test/reports
-package.json
 yarn.lock
+.rubocop-http*

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+Workarea Blog 3.4.8 (2019-10-01)
+--------------------------------------------------------------------------------
+
+*   Fix Blog Entries Total Count
+
+    The `#total` method on `Storefront::BlogEntryViewModel` was not
+    returning the actual total amount of entries if they exceeded 25, due to
+    Kaminari's default pagination. Use `scoped_entries.total_count` here to
+    avoid the problem.
+    Tom Scott
+
+
+
 Workarea Blog 3.4.7 (2019-08-21)
 --------------------------------------------------------------------------------
 

data/Rakefile

@@ -27,10 +27,10 @@ desc "Release version #{Workarea::Blog::VERSION} of the gem"
 task :release do
   host = "https://#{ENV['BUNDLE_GEMS__WEBLINC__COM']}@gems.weblinc.com"
 
-  #Rake::Task['workarea:changelog'].execute
-  #system 'git add CHANGELOG.md'
-  #system 'git commit -m "Update CHANGELOG"'
-  #system 'git push origin HEAD'
+  Rake::Task['workarea:changelog'].execute
+  system 'git add CHANGELOG.md'
+  system 'git commit -m "Update CHANGELOG"'
+  system 'git push origin HEAD'
 
   system "git tag -a v#{Workarea::Blog::VERSION} -m 'Tagging #{Workarea::Blog::VERSION}'"
   system 'git push --tags'

data/app/view_models/workarea/storefront/blog_view_model.rb

@@ -40,7 +40,7 @@ module Workarea
       end
 
       def total
-        @total ||= scoped_entries.count
+        @total ||= scoped_entries.total_count
       end
 
       def page

data/lib/workarea/blog/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module Blog
-    VERSION = '3.4.7'.freeze
+    VERSION = '3.4.8'.freeze
   end
 end

data/test/view_models/workarea/storefront/blog_view_model_test.rb

@@ -143,6 +143,29 @@ module Workarea
             refute newly_published.empty?
           end
         end
+
+        def test_total
+          release = create_release(publish_at: 1.hour.from_now, published_at: nil)
+          26.times do
+            @blog.entries.create!(name: 'Test', author: 'BC', active: true)
+            @blog.entries.create!(name: 'Unpublished', author: 'BC', active: false)
+          end
+          release.as_current do
+            @blog.entries.where(name: 'Unpublished').each do |entry|
+              entry.update!(active: true)
+            end
+          end
+
+          view_model = Workarea::Storefront::BlogViewModel.new(@blog)
+
+          assert_equal(26, view_model.total)
+
+          release.as_current do
+            view_model = Workarea::Storefront::BlogViewModel.new(@blog.reload)
+
+            assert_equal(52, view_model.total)
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-blog
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.8
 platform: ruby
 authors:
 - bcrouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Blog plugin for Workarea.