rocket_pants 1.4.0 → 1.4.1

data/lib/rocket_pants/controller/respondable.rb

@@ -3,7 +3,7 @@ module RocketPants
     extend ActiveSupport::Concern
 
     def self.pagination_type(object)
-      if defined?(WillPaginate::Collection) && object.is_a?(WillPaginate::Collection)
+      if object.respond_to?(:total_entries)
         :will_paginate
       elsif object.respond_to?(:num_pages) && object.respond_to?(:current_page)
         :kaminari

data/lib/rocket_pants/exceptions.rb

@@ -92,7 +92,9 @@ module RocketPants
     #   register! :ninjas_unavailable, :http_status => :service_unavailable
     def self.register!(name, options = {})
       klass_name = (options[:class_name] || name.to_s.classify).to_sym
-      klass = Class.new(Error)
+      base_klass = options[:base] || Error
+      raise ArgumentError, ":base must be a subclass of RocketPants::Error" unless base_klass <= Error
+      klass = Class.new(base_klass)
       klass.error_name(options[:error_name] || name.to_s.underscore)
       klass.http_status(options[:http_status]) if options[:http_status].present?
       (options[:under] || RocketPants).const_set klass_name, klass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack