pragma 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33831eebb49b3b8bbe97ad98221f1a2c17c0bca329c60f4d0eea66c260a5b82a
-  data.tar.gz: e726495b25a7f62cdbdf6e15025963a358ff6e1732ddf45cc7b0a79d34d7f613
+  metadata.gz: 3011120ae28ea10f9c9c287c23c6b3644d139bff0850ef7cb94d0353b01807fb
+  data.tar.gz: d2bf641611df5b41a3f57264872e30e4e45d28c17b3fe7978693d412fa2c7e47
 SHA512:
-  metadata.gz: f821889bd9e24a5aaea95039508655f3170a85317b6cb9ee34676fcec99c9e9482dd294667847351ae3768ceccd4f2ad0ce56b68e4ac525662d527e1aea170f6
-  data.tar.gz: f4166fb8b737b3aa26fed21a5b3717a026339b465b4a29d628ef162890a94e1c70a26c597a97f5a5af1e481992dc37c6a4cd3727e0ce20ceb4987e229c84ba88
+  metadata.gz: e8c89a042285a28cf7abb1c79bf1f7d083b0b306badfb50d536944b246c6402f19459bcbe9962f35e9197c709f211fae0913a52578b2e29421f8e8e9a440990b
+  data.tar.gz: 6eaf14f5241b3dd29bc96c6a4de261f10f45899f8a5a79361e30b3e847eb50c27cd8fbfc7abd973f62e7208f0ee31401f8af13d667dce0135f352df43ff6c05b

data/CHANGELOG.md

@@ -5,7 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.3.0]
+
+### Added
+
+- Add support for Kaminari in `Pagination` macro
+
+### Changed
+
+- Dropped runtime dependency on will_paginate
+
+### Fixed
+
+- Fixed constant loading in Ruby 2.5
 
 ## [2.2.0]
 
@@ -50,7 +62,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 First Pragma 2 release.
 
-[Unreleased]: https://github.com/pragmarb/pragma/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/pragmarb/pragma/compare/v2.3.0...HEAD
+[2.3.0]: https://github.com/pragmarb/pragma/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/pragmarb/pragma/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/pragmarb/pragma/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/pragmarb/pragma/compare/v2.0.0...v2.1.0

data/lib/pragma.rb

@@ -5,9 +5,6 @@ require 'pragma/policy'
 require 'pragma/contract'
 require 'pragma/decorator'
 
-require 'will_paginate'
-require 'will_paginate/array'
-
 require 'pragma/version'
 
 require 'pragma/decorator/error'

data/lib/pragma/macro/classes.rb

@@ -26,13 +26,13 @@ module Pragma
             rescue NameError => e
               # We check the error message to avoid silently ignoring other NameErrors
               # thrown while initializing the constant.
-              if e.message.start_with?('uninitialized constant')
-                # Required instead of a simple equality check because loading
-                # API::V1::Post::Contract::Index might throw "uninitialized constant
-                # API::V1::Post::Contract" if the resource has no contracts at all.
-                error_constant = e.message.split.last
-                raise e unless value.sub(/\A::/, '').start_with?(error_constant)
-              end
+              raise e unless e.message.start_with?('uninitialized constant')
+
+              # Required instead of a simple equality check because loading
+              # API::V1::Post::Contract::Index might throw "uninitialized constant
+              # API::V1::Post::Contract" if the resource has no contracts at all.
+              error_constant = e.message.scan(/uninitialized constant ([^\s]+)/).first.first
+              raise e unless value.sub(/\A::/, '').start_with?(error_constant)
             end
 
             options[key] = (Object.const_get(value) if Object.const_defined?(value))

data/lib/pragma/macro/pagination.rb

@@ -18,10 +18,18 @@ module Pragma
             return false
           end
 
-          options['model'] = options['model'].paginate(
+          pagination_options = {
             page: page(options, **options),
             per_page: per_page(options, **options)
-          )
+          }
+
+          options['model'] = if defined?(Kaminari)
+            options['model'].page(pagination_options[:page]).per(pagination_options[:per_page])
+          elsif defined?(WillPaginate)
+            options['model'].paginate(pagination_options)
+          else
+            fail 'Cannot find a supported pagination adapter (tried Kaminari, will_paginate)!'
+          end
         end
 
         private

data/lib/pragma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pragma
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/pragma.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pragma-operation', '~> 2.0'
   spec.add_dependency 'pragma-policy', '~> 2.0'
   spec.add_dependency 'trailblazer', '~> 2.0'
-  spec.add_dependency 'will_paginate', '~> 3.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
@@ -34,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'will_paginate'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pragma-contract
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="