Merge branch 'master' into 0.5.x

hanami · Jan 7, 2016 · 853eb32 · 853eb32
2 parents a231d19 + f5906d5
commit 853eb32
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,13 @@ rvm:
   - 2.1.5
   - 2.1.6
   - 2.1.7
+  - 2.1.8
   - 2.2.0
   - 2.2.1
   - 2.2.2
   - 2.2.3
+  - 2.2.4
+  - 2.3.0
   - rbx-2
   - jruby-head
   - jruby-9000

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Lotus::Controller
 Complete, fast and testable actions for Rack
 
-## v0.5.0 - (unreleased)
+## v0.5.0 - 2016-01-12
 ### Added
 - [Luca Guidi] Allow to force HTTP header for status code that according to RFC shouldn't include them (eg. `204`)
 - [Luca Guidi] Reference a raised exception in Rack env's `rack.exception`. Compatibility with exception reporting SaaS.

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright © 2014-2015 Luca Guidi
+Copyright © 2014-2016 Luca Guidi
 
 MIT License
 

diff --git a/README.md b/README.md
@@ -1202,4 +1202,4 @@ __Lotus::Controller__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2015 Luca Guidi – Released under MIT License
+Copyright © 2014-2016 Luca Guidi – Released under MIT License
diff --git a/lib/lotus/action/head.rb b/lib/lotus/action/head.rb
@@ -77,7 +77,7 @@ def _requires_no_body?
       # It returns a <tt>204</tt> but still wants to specify the rate limit
       # quota via <tt>X-Rate-Limit</tt>.
       #
-      # @since x.x.x
+      # @since 0.5.0
       # @api public
       #
       # @see Lotus::Action::HEAD#finish

diff --git a/lib/lotus/action/throwable.rb b/lib/lotus/action/throwable.rb
@@ -20,7 +20,7 @@ module Throwable
       # Exception notifiers use <tt>rack.exception</tt> instead of
       # <tt>rack.errors</tt>, so we need to support it.
       #
-      # @since x.x.x
+      # @since 0.5.0
       # @api private
       #
       # @see Lotus::Action::Throwable::RACK_ERRORS

diff --git a/lib/lotus/controller/error.rb b/lib/lotus/controller/error.rb
@@ -1,6 +1,6 @@
 module Lotus
   module Controller
-    # @since x.x.x
+    # @since 0.5.0
     class Error < ::StandardError
     end
   end

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -5,10 +5,10 @@
   require 'simplecov'
   require 'coveralls'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
-  ]
+  ])
 
   SimpleCov.start do
     command_name 'test'