Merge branch 'master' into 0.2.x

hanami · Jan 29, 2015 · 5893ce4 · 5893ce4
2 parents f7c803c + d8b3cec
commit 5893ce4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Lotus::Router
 Rack compatible HTTP router for Ruby
 
+## v0.2.1 - 2015-01-30
+### Added
+- [Alfonso Uceda Pompa] Lotus::Action compat: invoke `.call` if defined, otherwise fall back to `#call`.
+
 ## v0.2.0 - 2014-12-23
 ### Added
 - [Luca Guidi & Alfonso Uceda Pompa] Introduced routes inspector for CLI

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

diff --git a/README.md b/README.md
@@ -539,4 +539,4 @@ Thanks to Joshua Hull ([@joshbuddy](https://github.com/joshbuddy)) for his
 
 ## Copyright
 
-Copyright 2014 Luca Guidi – Released under MIT License
+Copyright © 2014-2015 Luca Guidi – Released under MIT License
diff --git a/lib/lotus/router/version.rb b/lib/lotus/router/version.rb
@@ -1,5 +1,6 @@
 module Lotus
   class Router
-    VERSION = '0.2.0'.freeze
+    # @since 0.1.0
+    VERSION = '0.2.1'.freeze
   end
 end
diff --git a/test/version_test.rb b/test/version_test.rb
@@ -2,6 +2,6 @@
 
 describe Lotus::Router::VERSION do
   it 'exposes version' do
-    Lotus::Router::VERSION.must_equal '0.2.0'
+    Lotus::Router::VERSION.must_equal '0.2.1'
   end
 end