effective_posts 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f0f0f0face589b9c5f7aea2880a79a96ce46d7b3650f78efedba278907e1b0ef
-  data.tar.gz: 6829e35d9706eb0ad8307e5589278bd7630f8fe0c86455af4e93d74b554f2cc4
+SHA1:
+  metadata.gz: 47bb689897ed31ceb48ad5648df6c3d4ecbd1106
+  data.tar.gz: ebe12bb48e0f6ad2bf48d307acd04ba5927b7a38
 SHA512:
-  metadata.gz: dc99afaa84f8fb2ea362b2edf2ebc8c7c870aced3cff565a34b22990add9cc5f0bca04d20d102e9f4f87f93d771e57c4d40270205b3c29be0e954fc5c01a71f1
-  data.tar.gz: 5f7d254014eb35ebec4f3bd661aea6ddb3d9089942c94f5b774264c3314d120fd619e807fe87824483a927ef770134b3bdad564542c9ad32ac140d6544a89b57
+  metadata.gz: b46abfef0b22ff676af43f48d221151aeeb697bc8fd7724133bf04c79626eeb2b8bebbd3f0e3a6fc419aaa2e85be3b4c46c29a11b3caabb22bbc8cb336bfb175
+  data.tar.gz: 907116a6c0e6f8a97a22b6bf053694824e776fa5d2f7d252a5b23e303c7d85f77564d6a11a445fbe0f4f1fc1e968860baf53276b848fa2b71382ac9c2cd17e3f

data/README.md

@@ -2,11 +2,6 @@
 
 A blog implementation with WYSIWYG content editing, post scheduling, pagination and optional top level routes for each post category.
 
-Built ontop of effective_regions for post content entry and Kaminari for pagination.
-
-Rails 3.2.x and 4.x
-
-
 ## effective_posts 1.0
 
 This is the 1.0 series of effective_posts.
@@ -88,13 +83,10 @@ Use `post_excerpt(post)` to display the excerpt for a post.  Or `post_excerpt(po
 
 ## Pagination
 
-The [kaminari](https://github.com/amatsuda/kaminari) gem is used for pagination on all posts#index type screens.
+The [effective_bootstrap](https://github.com/code-and-effect/effective_bootstrap) gem is used for pagination on all posts#index type screens.
 
 The per_page for posts may be configured via the `/app/config/initializers/effective_posts.rb` initializer.
 
-Included within this gem is the bootstrap3 theme for kaminari, but, as with any gem, your app-specific kaminari views will take priority over these included views.
-
-
 
 ## Authorization
 

data/app/controllers/effective/posts_controller.rb

@@ -12,7 +12,7 @@ module Effective
         unpublished: EffectivePosts.authorized?(self, :admin, :effective_posts)
       )
 
-      @posts = @posts.page(params[:page]).per(EffectivePosts.per_page)
+      @posts = @posts.paginate(page: params[:page])
 
       if params[:category] == 'events'
         @posts = @posts.reorder(:start_at).where('start_at > ?', Time.zone.now)

data/app/models/effective/post.rb

@@ -40,6 +40,13 @@ module Effective
     scope :unpublished, -> { where(draft: true).or(where("#{EffectivePosts.posts_table_name}.published_at > ?", Time.zone.now)) }
     scope :with_category, -> (category) { where(category: category.to_s.downcase) }
 
+    scope :paginate, -> (page: nil, per_page: EffectivePosts.per_page) {
+      page = (page || 1).to_i
+      offset = [(page - 1), 0].max * per_page
+
+      limit(per_page).offset(offset)
+    }
+
     scope :posts, -> (user: nil, category: nil, unpublished: false) {
       scope = all.includes(:regions).order(published_at: :desc)
 

data/app/views/effective/posts/index.html.haml

@@ -1,9 +1,8 @@
 %h1= @page_title
 
 = render 'layout' do
-  %nav= paginate @posts
-
   .effective-posts
     = render partial: @posts, spacer_template: 'spacer'
 
-  %nav= paginate @posts
+  %nav.d-flex.justify-content-center
+    = paginate(@posts, per_page: EffectivePosts.per_page)

data/config/effective_posts.rb

@@ -21,7 +21,7 @@ EffectivePosts.setup do |config|
   # /blog/1-post-title is posts#show
   config.use_blog_routes = true
 
-  # Number of posts displayed per page (Kaminari)
+  # Number of posts displayed per page
   config.per_page = 10
 
   # Post Meta behaviour

data/lib/effective_posts.rb

@@ -1,4 +1,3 @@
-require 'kaminari'
 require 'nokogiri'
 require 'effective_datatables'
 require 'effective_regions'

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -170,13 +156,6 @@ files:
 - app/views/effective/posts/submitted.html.haml
 - app/views/effective/posts_mailer/post_submitted_to_admin.html.haml
 - app/views/effective/snippets/_read_more_divider.html.haml
-- app/views/kaminari/_first_page.html.haml
-- app/views/kaminari/_gap.html.haml
-- app/views/kaminari/_last_page.html.haml
-- app/views/kaminari/_next_page.html.haml
-- app/views/kaminari/_page.html.haml
-- app/views/kaminari/_paginator.html.haml
-- app/views/kaminari/_prev_page.html.haml
 - app/views/layouts/effective_posts_mailer_layout.html.haml
 - config/effective_posts.rb
 - config/routes.rb
@@ -206,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A blog implementation with WYSIWYG content editing, post scheduling, pagination

data/app/views/kaminari/_first_page.html.haml

@@ -1,2 +0,0 @@
-%li
-  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote

data/app/views/kaminari/_gap.html.haml

@@ -1,2 +0,0 @@
-%li.disabled
-  = content_tag :a, raw(t 'views.pagination.truncate')

data/app/views/kaminari/_last_page.html.haml

@@ -1,2 +0,0 @@
-%li
-  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}

data/app/views/kaminari/_next_page.html.haml

@@ -1,2 +0,0 @@
-%li
-  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote

data/app/views/kaminari/_page.html.haml

@@ -1,6 +0,0 @@
-- if page.current?
-  %li.active
-    = content_tag :a, page, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil))
-- else
-  %li
-    = link_to page, url, remote: remote, rel: (page.next? ? 'next' : (page.prev? ? 'prev' : nil))

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

@@ -1,11 +0,0 @@
-= paginator.render do
-  %ul.pagination
-    = first_page_tag unless current_page.first?
-    = prev_page_tag unless current_page.first?
-    - each_page do |page|
-      - if page.left_outer? || page.right_outer? || page.inside_window?
-        = page_tag page
-      - elsif !page.was_truncated?
-        = gap_tag
-    = next_page_tag unless current_page.last?
-    = last_page_tag unless current_page.last?

data/app/views/kaminari/_prev_page.html.haml

@@ -1,2 +0,0 @@
-%li
-  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote