From 39f3aca881c9cd55f6a0d8bed8358cbcd82c807c Mon Sep 17 00:00:00 2001 From: Alfonso Uceda Pompa Date: Sat, 26 Dec 2015 14:26:53 +0100 Subject: [PATCH 1/3] Added ruby versions 2.1.8, 2.2.4 and 2.3.0 to travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 32fbc34e..7fff5cc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,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 - jruby-9000 - jruby-head - rbx-2 From 1321b469a5d0ab22048594beaffe26410740f6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Mon, 4 Jan 2016 07:21:49 +1100 Subject: [PATCH 2/3] Update copyright footer year [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a9fb4ee..9fb0eb64 100644 --- a/README.md +++ b/README.md @@ -850,4 +850,4 @@ __Lotus::View__ 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 From 2fe93731e5f84cd34de0d68e320b2e35db671a4a Mon Sep 17 00:00:00 2001 From: Luca Guidi Date: Thu, 7 Jan 2016 17:58:36 +0100 Subject: [PATCH 3/3] Prepare for v0.5.0 --- CHANGELOG.md | 2 +- LICENSE.md | 2 +- lib/lotus/view/configuration.rb | 2 +- lib/lotus/view/errors.rb | 4 ++-- lib/lotus/view/rendering/template.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c1c21d..6af0cd3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Lotus::View View layer for Lotus -## v0.5.0 - (unreleased) +## v0.5.0 - 2016-01-12 ### Added - [Luca Guidi] Added `Lotus::View::Configuration#default_encoding` to set the encoding for templates diff --git a/LICENSE.md b/LICENSE.md index c3ab5219..3eaf84f4 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2014 Luca Guidi +Copyright (c) 2014-2016 Luca Guidi MIT License diff --git a/lib/lotus/view/configuration.rb b/lib/lotus/view/configuration.rb index cf6571fb..f333817a 100644 --- a/lib/lotus/view/configuration.rb +++ b/lib/lotus/view/configuration.rb @@ -31,7 +31,7 @@ class Configuration # Default encoding # - # @since x.x.x + # @since 0.5.0 # @api private DEFAULT_ENCODING = 'utf-8'.freeze diff --git a/lib/lotus/view/errors.rb b/lib/lotus/view/errors.rb index f6b95a58..e63cae47 100644 --- a/lib/lotus/view/errors.rb +++ b/lib/lotus/view/errors.rb @@ -1,6 +1,6 @@ module Lotus module View - # @since x.x.x + # @since 0.5.0 class Error < ::StandardError end @@ -37,7 +37,7 @@ class MissingFormatError < Error # # This is raised at the runtime when Lotus::Layout cannot find it's template. # - # @since x.x.x + # @since 0.5.0 class MissingTemplateLayoutError < Error def initialize(template) super("Can't find layout template '#{ template }'") diff --git a/lib/lotus/view/rendering/template.rb b/lib/lotus/view/rendering/template.rb index be391e0f..4a6b2304 100644 --- a/lib/lotus/view/rendering/template.rb +++ b/lib/lotus/view/rendering/template.rb @@ -53,7 +53,7 @@ def scope Scope.new(@view, @options[:locals]) end - # @since x.x.x + # @since 0.5.0 # @api private def raise_missing_template_error raise MissingTemplateError.new(