message_train 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c065aec23805479ba06149a518f3edcc25c66a1
-  data.tar.gz: c53c3027c82ffe2ae8562584120980d7834bc814
+  metadata.gz: d91a2e743748d2a51d918328496e49d81a91825c
+  data.tar.gz: 76fe50e18ea3255f7294d0b44a812aa4b2ef3220
 SHA512:
-  metadata.gz: cce40f5bb3028f34eecfa87d5af88c54cbe008271cb8c92cfa1093f2c59e87eb34ff0de6e0e1a8cacbb315a3c8fc8c586695f4e6fb48f1c7ac127b6fc5e065fb
-  data.tar.gz: 00d5ad244c8734590dbc061a0130e5058a174b535ac44e599959219a7176441d494226d77ab00916cbf1118455bfc555f3dc4b31534808b3890fae64c1d7ba5a
+  metadata.gz: e3513975bc62654becda44650a50a226268c50fb45939878126904f88f7539c144def3b1a03f4344a9ab08bccd0fb1311fa9f3e7b209caf11d1c688043a1ee38
+  data.tar.gz: 5fdc4378e529e8be73324c7affe3bc36a2e73b2de3d8c7a01bc314ccd11ecfe2bf47717c5364d56fa03ca35e6d574adf7df1d9944362585b35b4a8d9bf6bcbbb

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
-gem 'haml-rails', '~> 0.9'
+gem 'haml-rails', '>= 1', '< 2'
 gem 'jquery-rails', '~> 4'
 gem 'paperclip', '>= 4.2', '< 6'
 gem 'rails', '>= 4', '< 6'
@@ -13,8 +13,8 @@ gem 'jbuilder', '~> 2.0'
 
 gem 'bootstrap-sass', '~> 3.3'
 gem 'bootstrap_form', '~> 2.3'
-gem 'bootstrap_leather', '~> 0.9'
-gem 'bootstrap_pager', '~> 0.10'
+gem 'bootstrap_leather', '>= 0.10.11', '< 1'
+gem 'kaminari', '~> 1.0'
 gem 'bootstrap_tokenfield_rails', '~> 0.12'
 gem 'ckeditor'
 gem 'cocoon', '~> 1.2'

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+- 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

@@ -0,0 +1,11 @@
+= 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

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

data/config/initializers/{bootstrap_pager_config.rb → kaminari_config.rb}

@@ -1,4 +1,5 @@
-BootstrapPager.configure do |config|
+# frozen_string_literal: true
+Kaminari.configure do |config|
   config.default_per_page = 10
   # config.max_per_page = nil
   # config.window = 4
@@ -7,4 +8,5 @@ BootstrapPager.configure do |config|
   # config.right = 0
   # config.page_method_name = :page
   # config.param_name = :page
+  # config.params_on_first_page = false
 end

data/lib/message_train.rb

@@ -18,7 +18,7 @@ module MessageTrain
 
   require 'haml-rails'
   require 'bootstrap_leather'
-  require 'bootstrap_pager'
+  require 'kaminari'
 end
 
 ActiveRecord::Base.send(:extend, MessageTrain::Mixin)

data/message_train.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.7.3 ruby lib
+# stub: message_train 0.7.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.7.3"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2017-04-28"
+  s.date = "2017-10-06"
   s.description = "Rails 4 & 5 Engine providing private and public messaging for any object, such as Users or Groups"
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -61,6 +61,13 @@ Gem::Specification.new do |s|
     "app/models/message_train/receipt.rb",
     "app/models/message_train/unsubscribe.rb",
     "app/views/application/404.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/mailer.html.haml",
     "app/views/layouts/mailer.text.haml",
     "app/views/message_train/application/_attachment_fields.html.haml",
@@ -99,8 +106,8 @@ Gem::Specification.new do |s|
     "app/views/message_train/receipt_mailer/notification_email.text.haml",
     "app/views/message_train/unsubscribes/index.html.haml",
     "config/environment.rb",
-    "config/initializers/bootstrap_pager_config.rb",
     "config/initializers/date_time.rb",
+    "config/initializers/kaminari_config.rb",
     "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/20150721145319_create_message_train_conversations.rb",
@@ -285,7 +292,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<haml-rails>, ["~> 0.9"])
+      s.add_runtime_dependency(%q<haml-rails>, ["< 2", ">= 1"])
       s.add_runtime_dependency(%q<jquery-rails>, ["~> 4"])
       s.add_runtime_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
       s.add_runtime_dependency(%q<rails>, ["< 6", ">= 4"])
@@ -294,8 +301,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_runtime_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_runtime_dependency(%q<bootstrap_form>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<bootstrap_leather>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<bootstrap_pager>, ["~> 0.10"])
+      s.add_runtime_dependency(%q<bootstrap_leather>, ["< 1", ">= 0.10.11"])
+      s.add_runtime_dependency(%q<kaminari>, ["~> 1.0"])
       s.add_runtime_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<cocoon>, ["~> 1.2"])
@@ -318,7 +325,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<seedbank>, ["~> 0.3"])
       s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
     else
-      s.add_dependency(%q<haml-rails>, ["~> 0.9"])
+      s.add_dependency(%q<haml-rails>, ["< 2", ">= 1"])
       s.add_dependency(%q<jquery-rails>, ["~> 4"])
       s.add_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
       s.add_dependency(%q<rails>, ["< 6", ">= 4"])
@@ -327,8 +334,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
-      s.add_dependency(%q<bootstrap_leather>, ["~> 0.9"])
-      s.add_dependency(%q<bootstrap_pager>, ["~> 0.10"])
+      s.add_dependency(%q<bootstrap_leather>, ["< 1", ">= 0.10.11"])
+      s.add_dependency(%q<kaminari>, ["~> 1.0"])
       s.add_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<cocoon>, ["~> 1.2"])
@@ -352,7 +359,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<haml-rails>, ["~> 0.9"])
+    s.add_dependency(%q<haml-rails>, ["< 2", ">= 1"])
     s.add_dependency(%q<jquery-rails>, ["~> 4"])
     s.add_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
     s.add_dependency(%q<rails>, ["< 6", ">= 4"])
@@ -361,8 +368,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jbuilder>, ["~> 2.0"])
     s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
     s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
-    s.add_dependency(%q<bootstrap_leather>, ["~> 0.9"])
-    s.add_dependency(%q<bootstrap_pager>, ["~> 0.10"])
+    s.add_dependency(%q<bootstrap_leather>, ["< 1", ">= 0.10.11"])
+    s.add_dependency(%q<kaminari>, ["~> 1.0"])
     s.add_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<cocoon>, ["~> 1.2"])

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,30 +170,36 @@ dependencies:
   name: bootstrap_leather
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.11
 - !ruby/object:Gem::Dependency
-  name: bootstrap_pager
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap_tokenfield_rails
   requirement: !ruby/object:Gem::Requirement
@@ -545,6 +557,13 @@ files:
 - app/models/message_train/receipt.rb
 - app/models/message_train/unsubscribe.rb
 - app/views/application/404.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/mailer.html.haml
 - app/views/layouts/mailer.text.haml
 - app/views/message_train/application/_attachment_fields.html.haml
@@ -583,8 +602,8 @@ files:
 - app/views/message_train/receipt_mailer/notification_email.text.haml
 - app/views/message_train/unsubscribes/index.html.haml
 - config/environment.rb
-- config/initializers/bootstrap_pager_config.rb
 - config/initializers/date_time.rb
+- config/initializers/kaminari_config.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20150721145319_create_message_train_conversations.rb