From b539423e096c323d3f0579150483c42216bb3742 Mon Sep 17 00:00:00 2001 From: Reid Beels Date: Sat, 20 Jun 2015 15:34:34 -0700 Subject: [PATCH 1/4] Fix README code block formatting --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 92ca8d3..32c3756 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,11 @@ This software has been in use for a year at http://calagator.org and http://epdx If you have a Ruby on Rails 3 or 4 application where you're using the `paper_trail` gem to track changes to your records, you can make use of this like: Add the following line to your `Gemfile`: + gem 'paper_trail_manager' -PaperTrailManager will use your existing paging library (WillPaginate or Kaminari). If you don't currently use one in your app, add one of the following lines to your `Gemfile`: +PaperTrailManager will use your existing paging library ([will_paginate](https://github.com/mislav/will_paginate) or [Kaminari](https://github.com/amatsuda/kaminari)). If you don't currently use one in your app, add one of the following lines to your `Gemfile`: + gem 'kaminari' #or gem 'will_paginate' From de2ce9694f7dd765fc03981075c6cb6c91704267 Mon Sep 17 00:00:00 2001 From: Reid Beels Date: Sat, 20 Jun 2015 15:35:00 -0700 Subject: [PATCH 2/4] Extract version into PaperTrailManager::VERSION --- lib/paper_trail_manager/version.rb | 3 +++ paper_trail_manager.gemspec | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 lib/paper_trail_manager/version.rb diff --git a/lib/paper_trail_manager/version.rb b/lib/paper_trail_manager/version.rb new file mode 100644 index 0000000..f6f9e06 --- /dev/null +++ b/lib/paper_trail_manager/version.rb @@ -0,0 +1,3 @@ +class PaperTrailManager + VERSION = "0.4.0" +end diff --git a/paper_trail_manager.gemspec b/paper_trail_manager.gemspec index 454ae4c..e19cb6e 100644 --- a/paper_trail_manager.gemspec +++ b/paper_trail_manager.gemspec @@ -2,9 +2,12 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +# Maintain your gem's version: +require "paper_trail_manager/version" + Gem::Specification.new do |spec| spec.name = "paper_trail_manager" - spec.version = "0.4.0" + spec.version = PaperTrailManager::VERSION spec.authors = ["Igal Koshevoy", "Reid Beels"] spec.authors = ["mail@reidbeels.com"] spec.summary = "A user interface for `paper_trail` versioning data in Ruby on Rails 3 applications." From ca1f69ef528b136d99ba5fd70ae4bc7c311323d3 Mon Sep 17 00:00:00 2001 From: Reid Beels Date: Sat, 20 Jun 2015 15:37:36 -0700 Subject: [PATCH 3/4] Bump version to 0.5.0; update changelog --- CHANGES.md | 5 +++++ lib/paper_trail_manager/version.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 181ce90..232e0ca 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,11 @@ Changes to `paper_trail_manager` ================================ +* 0.5.0 + * Added support for pagination with [Kaminari](https://github.com/amatsuda/kaminari) in addition to [will_paginate](https://github.com/mislav/will_paginate). + * **[!]** Removed direct dependency on will_paginate. You must now include either `will_paginate` or `kaminari` in your Gemfile. + * Fixed a bug with route generation when paper_trail_manager is used within another Rails engine. + * 0.4.0 * Allow configuration of ChangesController's parent class, route helpers, and layout diff --git a/lib/paper_trail_manager/version.rb b/lib/paper_trail_manager/version.rb index f6f9e06..27dd46a 100644 --- a/lib/paper_trail_manager/version.rb +++ b/lib/paper_trail_manager/version.rb @@ -1,3 +1,4 @@ class PaperTrailManager - VERSION = "0.4.0" + VERSION = "0.5.0" end + From 356c7681b24e17e2114121c764d72cf90512919a Mon Sep 17 00:00:00 2001 From: Reid Beels Date: Sat, 20 Jun 2015 15:48:45 -0700 Subject: [PATCH 4/4] Give up on external version file for now :( To use this correctly, we'd need to refactor the top-level PaperTrailManager constant to be a module and move all of the engine functionality into PaperTrailManager::Engine. --- lib/paper_trail_manager/version.rb | 4 ---- paper_trail_manager.gemspec | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 lib/paper_trail_manager/version.rb diff --git a/lib/paper_trail_manager/version.rb b/lib/paper_trail_manager/version.rb deleted file mode 100644 index 27dd46a..0000000 --- a/lib/paper_trail_manager/version.rb +++ /dev/null @@ -1,4 +0,0 @@ -class PaperTrailManager - VERSION = "0.5.0" -end - diff --git a/paper_trail_manager.gemspec b/paper_trail_manager.gemspec index e19cb6e..f19c9fe 100644 --- a/paper_trail_manager.gemspec +++ b/paper_trail_manager.gemspec @@ -2,12 +2,9 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -# Maintain your gem's version: -require "paper_trail_manager/version" - Gem::Specification.new do |spec| spec.name = "paper_trail_manager" - spec.version = PaperTrailManager::VERSION + spec.version = "0.5.0" spec.authors = ["Igal Koshevoy", "Reid Beels"] spec.authors = ["mail@reidbeels.com"] spec.summary = "A user interface for `paper_trail` versioning data in Ruby on Rails 3 applications."