rapporteur 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633181a4b53c700cdd2d1c2c0f8a9f6a5f08acda
-  data.tar.gz: 7b29ca2a1e7c9a57424d246ff8c4aa48732cabce
+  metadata.gz: 1c09441f5790264d6bac686e7995dfd8de5e5eec
+  data.tar.gz: 0271da9fe733c0114ef50aecedfce99b72c7ed94
 SHA512:
-  metadata.gz: 8641338d699725b6612887fa2a3b2cd5b8d3d0b76f66b6e28e0f8960356d3bf674422f1056224fba79d41c877abace918c183e53fe7fc9286350bef659edb659
-  data.tar.gz: ddf0fe2836eb103f1a0af23d039df8a0fb66eec99fd6d01d66b5589de23526569db5d8c561bce60f1c636633e726fe3afe2c46d2c147b242a932d64a9ade2023
+  metadata.gz: 1428b9ee37335136b8751cf828c8de25837b4a903fe875c5b33d1540125b8f42b754d9716391d74218a780d7b6cd99550756747c24ff90fe65d40f240f6d3887
+  data.tar.gz: 8900d3c79a3787acdbaeb997af7f05cfcd3e516c5967d1bae3f90aa0bdf287137bd31bb8e02aa1df0e9fc0b286ba4dc0fe82fedd71b5b5f48ff12c38a7a3e7fb

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
+cache:
+  directories:
+    - vendor/bundle
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1.5
   - jruby-19mode
 gemfile:
   - gemfiles/rails3.2.gemfile
@@ -9,8 +12,3 @@ gemfile:
   - gemfiles/sinatra1.x.gemfile
 notifications:
   email: false
-  campfire:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: "gxEt3SeVn1kup6PfB6hiQu6eWsefmMEdd8U1qPSS6vlRjsM7Xy2IrXdz9gdl\n0nrrRgESvOxT3sqMh4/opH6M1kbtCyl3M0yvjF2QUtjWQ+4BStJGhNyXlDTp\nNAas19fuEUPBNxNqoy7aTVBiFpQRs0NisEZTS3+N3eA2tz757Qk="

data/CHANGELOG.md

@@ -10,6 +10,17 @@
 
 * No significant changes.
 
+## [3.3.0][v3.3.0] / 2015-02-03
+
+* Remove the customized Rapporteur::Responder (an ActionController::Responder)
+  since responders were removed from Rails core in version 4.2 and inline the
+  logic into the StatusesController.
+* Register Rapporteur::Engine routes for Rails 4.2 support.
+* Auto-mount the engine routes and force definition of an application `status`
+  route for backward compatibility. Otherwise, developers would seemingly need
+  to either manually mount the engine or define an application-level named
+  route for the status endpoint.
+
 ## [3.2.0][v3.2.0] / 2015-02-02
 
 * Update the Rails route definition to force (and default) a JSON format. The
@@ -105,7 +116,8 @@
 * Initial public release.
 
 
-[unreleased]: https://github.com/codeschool/rapporteur/compare/v3.2.0...master
+[unreleased]: https://github.com/codeschool/rapporteur/compare/v3.3.0...master
+[v3.3.0]: https://github.com/codeschool/rapporteur/compare/v3.2.0...v3.3.0
 [v3.2.0]: https://github.com/codeschool/rapporteur/compare/v3.1.0...v3.2.0
 [v3.1.0]: https://github.com/codeschool/rapporteur/compare/v3.0.2...v3.1.0
 [v3.0.2]: https://github.com/codeschool/rapporteur/compare/v3.0.1...v3.0.2

data/README.md

@@ -22,7 +22,7 @@ the current application Git revision and server time:
 ```
 
 When an application validation fails, an HTTP 500 response is returned with a
-collection of error messages, similar to the default Rails responders for model
+collection of error messages, similar to the Rails < 4.2 responders for model
 validations:
 
 ```json

data/app/controllers/statuses_controller.rb

@@ -1,8 +1,23 @@
 class StatusesController < ActionController::Base
-  self.responder = Rapporteur::Responder
-  respond_to :json
-
   def show
-    respond_with(Rapporteur.run)
+    respond_to do |format|
+      format.json do
+        resource = Rapporteur.run
+
+        if resource.errors.empty?
+          render({:json => resource})
+        else
+          display_errors(resource, :json)
+        end
+      end
+    end
+  end
+
+
+  private
+
+
+  def display_errors(resource, format)
+    render({format => {:errors => resource.errors}, :status => :internal_server_error})
   end
 end

data/config/routes.rb

@@ -1,3 +1,20 @@
+Rapporteur::Engine.routes.draw do
+  get("status.:format", {
+    :as => :status,
+    :constraints => {:format => "json"},
+    :defaults => {:format => "json"},
+    :to => "statuses#show"
+  })
+end
+
 Rails.application.routes.draw do
-  get 'status.:format', :to => 'statuses#show', :defaults => {:format => 'json'}, :constraints => {:format => 'json'}, :as => :status
+  unless Rails.application.routes.named_routes.routes[:status]
+    mount Rapporteur::Engine => "/"
+    get("/status.:format", {
+      :as => :status,
+      :constraints => {:format => "json"},
+      :defaults => {:format => "json"},
+      :to => "statuses#show"
+    })
+  end
 end

data/lib/rapporteur/checker.rb

@@ -163,8 +163,7 @@ module Rapporteur
     end
 
     ##
-    # Internal: Used by Rails' JSON serialization, specifically in
-    # ActionController::Responder.
+    # Internal: Used by Rails' JSON serialization.
     #
     def read_attribute_for_serialization(key)
       @messages[key]

data/lib/rapporteur/version.rb

@@ -1,3 +1,3 @@
 module Rapporteur
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/lib/rapporteur.rb

@@ -10,7 +10,6 @@ module Rapporteur
   autoload :CheckerDeprecations, 'rapporteur/checker_deprecations'
   autoload :Checks, 'rapporteur/checks'
   autoload :MessageList, 'rapporteur/message_list'
-  autoload :Responder, 'rapporteur/responder'
   autoload :Revision, 'rapporteur/revision'
 
 

data/rapporteur.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "combustion", "~> 0.5", ">= 0.5.1"
-  spec.add_development_dependency "rails", ">= 3.1", "< 4.2"
+  spec.add_development_dependency "rails", ">= 3.1", "< 4.3"
   spec.add_development_dependency "rspec-rails", "~> 3.0"
   spec.add_development_dependency "rspec-collection_matchers", "~> 1.0"
 end

data/spec/routing/routes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper.rb'
 
-describe "status routes", :type => :routing do
+describe "status route", :type => :routing do
   it 'routes /status.json to statuses#show' do
     expect({ :get => '/status.json'}).to route_to({
       :action => 'show',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapporteur
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Envy Labs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -82,7 +82,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,6 @@ files:
 - lib/rapporteur/checks/active_record_check.rb
 - lib/rapporteur/engine.rb
 - lib/rapporteur/message_list.rb
-- lib/rapporteur/responder.rb
 - lib/rapporteur/revision.rb
 - lib/rapporteur/rspec.rb
 - lib/rapporteur/rspec3.rb
@@ -194,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An engine that provides common status polling endpoint.

data/lib/rapporteur/responder.rb

@@ -1,32 +0,0 @@
-module Rapporteur
-  # A customization of the default Rails ActionController::Responder.
-  # Primarily, this is used to smooth out the differences between Rails
-  # responder versions and allow for error messages in GET requests.
-  #
-  class Responder < ActionController::Responder
-    # Internal: Overrides the default behavior by ignoring the HTTP verb and
-    # always responding with errors if the rendering resource contains errors.
-    #
-    def to_format
-      if has_errors?
-        display_errors
-      else
-        super
-      end
-    end
-
-
-    protected
-
-
-    if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 1
-      def display_errors
-        controller.render format => {:errors => resource.errors}, :status => :internal_server_error
-      end
-    else
-      def display_errors
-        controller.render format => resource_errors, :status => :internal_server_error
-      end
-    end
-  end
-end