semantic_date_time_tags 0.1.19 → 0.2.0

data/lib/semantic_date_time_tags/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SemanticDateTimeTags
-  VERSION = '0.1.19'.freeze
+  VERSION = "0.2.0"
 end

data/lib/semantic_date_time_tags/view_helpers.rb

@@ -1,10 +1,12 @@
-require 'action_view'
+# frozen_string_literal: true
 
-require_relative 'tag'
-require_relative 'tag/date_range'
-require_relative 'tag/date_time'
-require_relative 'tag/date'
-require_relative 'tag/time'
+require "action_view"
+
+require_relative "tag"
+require_relative "tag/date_range"
+require_relative "tag/date_time"
+require_relative "tag/date"
+require_relative "tag/time"
 
 module SemanticDateTimeTags
   module ViewHelpers
@@ -14,8 +16,6 @@ module SemanticDateTimeTags
       end
     end
 
-    # =====================================================================
-
     # accepts datetime and date
     def semantic_date_range_tag(date_from, date_to, options = {})
       SemanticDateTimeTags::Tag::DateRange.new(date_from, date_to, options).to_html

data/semantic_date_time_tags.gemspec

@@ -1,28 +1,31 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'semantic_date_time_tags/version'
+require "semantic_date_time_tags/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'semantic_date_time_tags'
+  spec.name          = "semantic_date_time_tags"
   spec.version       = SemanticDateTimeTags::VERSION
-  spec.authors       = ['Tomas Celizna']
-  spec.email         = ['tomas.celizna@gmail.com']
-  spec.summary       = 'Rails helpers for handling dates and time.'
-  spec.homepage      = 'https://github.com/tomasc/semantic_date_time_tags'
-  spec.license       = 'MIT'
+  spec.authors       = ["Tomas Celizna"]
+  spec.email         = ["tomas.celizna@gmail.com"]
+  spec.summary       = "Rails helpers for handling dates and time."
+  spec.homepage      = "https://github.com/tomasc/semantic_date_time_tags"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "rails", ">= 3"
 
-  spec.add_dependency 'rails', '>= 3'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rake"
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-minitest'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency "rubocop-rails_config"
 end

data/test/semantic_date_time_tags/format_parser_test.rb

@@ -1,82 +1,82 @@
-require 'semantic_date_time_tags/format_parser'
-require 'test_helper'
+# frozen_string_literal: true
+
+require "semantic_date_time_tags/format_parser"
+require "test_helper"
 
 describe SemanticDateTimeTags::FormatParser do
   subject { SemanticDateTimeTags::FormatParser.new(format, string) }
   let(:to_html) { subject.to_html }
 
-  # ---------------------------------------------------------------------
-
-  describe '#to_html' do
-    describe 'd / m / Y' do
-      let(:format) { '%d / %m / %Y' }
-      let(:string) { '12 / 12 / 2014' }
+  describe "#to_html" do
+    describe "d / m / Y" do
+      let(:format) { "%d / %m / %Y" }
+      let(:string) { "12 / 12 / 2014" }
 
-      it 'wraps the components into span tags' do
-        to_html.must_equal '<span class="day d">12</span><span class="sep"> / </span><span class="month m">12</span><span class="sep"> / </span><span class="year Y">2014</span>'
+      it "wraps the components into span tags" do
+        _(to_html).must_equal '<span class="day d">12</span><span class="sep"> / </span><span class="month m">12</span><span class="sep"> / </span><span class="year Y">2014</span>'
       end
     end
 
-    describe 'd m Y' do
-      let(:format) { '%-d %b %Y' }
-      let(:string) { '12 December 2014' }
+    describe "d m Y" do
+      let(:format) { "%-d %b %Y" }
+      let(:string) { "12 December 2014" }
 
-      it 'wraps the components into span tags' do
-        to_html.must_equal '<span class="day d">12</span><span class="sep"> </span><span class="month b">December</span><span class="sep"> </span><span class="year Y">2014</span>'
+      it "wraps the components into span tags" do
+        _(to_html).must_equal '<span class="day d">12</span><span class="sep"> </span><span class="month b">December</span><span class="sep"> </span><span class="year Y">2014</span>'
       end
     end
 
-    describe 'd / m / Y' do
-      let(:format) { '%I.%M %p' }
-      let(:string) { '10.00 AM' }
+    describe "d / m / Y" do
+      let(:format) { "%I.%M %p" }
+      let(:string) { "10.00 AM" }
 
-      it 'wraps the components into span tags' do
-        to_html.must_equal '<span class="hours I">10</span><span class="sep">.</span><span class="minutes M">00</span><span class="sep"> </span><span class="ampm p">AM</span>'
+      it "wraps the components into span tags" do
+        _(to_html).must_equal '<span class="hours I">10</span><span class="sep">.</span><span class="minutes M">00</span><span class="sep"> </span><span class="ampm p">AM</span>'
       end
     end
 
-    describe 'd / m / Y' do
-      let(:format) { '%a, %b %e, %Y' }
-      let(:string) { 'Sun, Jan 1, 2015' }
+    describe "d / m / Y" do
+      let(:format) { "%a, %b %e, %Y" }
+      let(:string) { "Sun, Jan 1, 2015" }
 
-      it 'wraps the components into span tags' do
-        to_html.must_equal '<span class="day a">Sun</span><span class="sep">, </span><span class="month b">Jan</span><span class="sep"> </span><span class="day e">1</span><span class="sep">, </span><span class="year Y">2015</span>'
+      it "wraps the components into span tags" do
+        _(to_html).must_equal '<span class="day a">Sun</span><span class="sep">, </span><span class="month b">Jan</span><span class="sep"> </span><span class="day e">1</span><span class="sep">, </span><span class="year Y">2015</span>'
       end
     end
 
-    describe 'A d / m / Y' do
-      let(:format) { '%A %d / %m / %Y' }
-      let(:string) { 'Saturday 12 / 12 / 2014' }
+    describe "A d / m / Y" do
+      let(:format) { "%A %d / %m / %Y" }
+      let(:string) { "Saturday 12 / 12 / 2014" }
 
-      it 'wraps the components into span tags' do
-        to_html.must_equal '<span class="day A">Saturday</span><span class="sep"> </span><span class="day d">12</span><span class="sep"> / </span><span class="month m">12</span><span class="sep"> / </span><span class="year Y">2014</span>'
+      it "wraps the components into span tags" do
+        _(to_html).must_equal '<span class="day A">Saturday</span><span class="sep"> </span><span class="day d">12</span><span class="sep"> / </span><span class="month m">12</span><span class="sep"> / </span><span class="year Y">2014</span>'
       end
     end
 
-    describe '%-l:%M %P' do
-      let(:format) { '%-l:%M %P' }
-      let(:string) { '12:30 am' }
+    describe "%-l:%M %P" do
+      let(:format) { "%-l:%M %P" }
+      let(:string) { "12:30 am" }
 
-      it 'marks up the am/pm' do
-        to_html.must_include '<span class="ampm P">'
+      it "marks up the am/pm" do
+        _(to_html).must_include '<span class="ampm P">'
       end
     end
 
-    describe ':cs' do
-      let(:format) { '%A, %-d. %B, %Y' }
+    describe ":cs" do
+      let(:format) { "%A, %-d. %B, %Y" }
       let(:string) { "Čtvrtek, 16. Červen, 2016" }
 
-      it 'deals fine with accented characters' do
-        to_html.must_equal "<span class=\"day A\">Čtvrtek</span><span class=\"sep\">, </span><span class=\"day d\">16</span><span class=\"sep\">. </span><span class=\"month B\">Červen</span><span class=\"sep\">, </span><span class=\"year Y\">2016</span>"
+      it "deals fine with accented characters" do
+        _(to_html).must_equal "<span class=\"day A\">Čtvrtek</span><span class=\"sep\">, </span><span class=\"day d\">16</span><span class=\"sep\">. </span><span class=\"month B\">Červen</span><span class=\"sep\">, </span><span class=\"year Y\">2016</span>"
       end
     end
 
-    describe 'additional string' do
-      let(:format) { '%d.%m.%Y %H.%M hrs' }
+    describe "additional string" do
+      let(:format) { "%d.%m.%Y %H.%M hrs" }
       let(:string) { "09.09.2014 19.00 hrs" }
 
-      it 'preserves additional strings' do
-        to_html.must_equal "<span class=\"day d\">09</span><span class=\"sep\">.</span><span class=\"month m\">09</span><span class=\"sep\">.</span><span class=\"year Y\">2014</span><span class=\"sep\"> </span><span class=\"hours H\">19</span><span class=\"sep\">.</span><span class=\"minutes M\">00</span><span class=\"str\"> hrs</span>"
+      it "preserves additional strings" do
+        _(to_html).must_equal "<span class=\"day d\">09</span><span class=\"sep\">.</span><span class=\"month m\">09</span><span class=\"sep\">.</span><span class=\"year Y\">2014</span><span class=\"sep\"> </span><span class=\"hours H\">19</span><span class=\"sep\">.</span><span class=\"minutes M\">00</span><span class=\"str\"> hrs</span>"
       end
     end
   end

data/test/semantic_date_time_tags/semantic_date_range_test.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "semantic_date_time_tags/view_helpers"
+
+describe SemanticDateTimeTags::ViewHelpers do
+  include SemanticDateTimeTags::ViewHelpers
+
+  let(:date_object) { Date.parse("31/10/#{Date.today.year}") }
+  let(:date_tomorrow_object) { Date.parse("31/10/#{Date.today.year}") + 1.day }
+  let(:time_object) { Time.parse("31/10/#{Date.today.year}") }
+
+  describe "#semantic_date_range_tag" do
+    let(:date_time_object_from) { DateTime.parse("31/10/#{Date.today.year}") }
+    let(:date_time_object_to) { DateTime.parse("11/11/#{Date.today.year}") }
+
+    let(:date_time_object_from_morning) { DateTime.parse("14/11/#{Date.today.year} 11:00") }
+    let(:date_time_object_to_afternoon) { DateTime.parse("14/11/#{Date.today.year} 15:00") }
+
+    it "returns the from date wrapped correctly" do
+      _(semantic_date_range_tag(date_object, date_tomorrow_object)).must_match(/<time.+?semantic.+?date.+?from.+?>.+?<time.+?semantic.+?date.+?to.+?>/)
+    end
+
+    it "adds same_year and current_year class to wrapping span" do
+      _(semantic_date_range_tag(date_object, date_tomorrow_object)).must_match(/\A<span.+?date_range.+?same_year.+?current_year.+?>/)
+    end
+
+    it "adds same_day to wrapping span" do
+      _(semantic_date_range_tag(date_time_object_from, date_time_object_from)).must_match(/\A<span.+?date_range.+?same_day.+?>/)
+    end
+
+    it "adds same_time to wrapping span" do
+      _(semantic_date_range_tag(date_time_object_from, date_time_object_from)).must_match(/\A<span.+?date_range.+?same_day.+?same_time.+?>/)
+    end
+
+    it "adds am to wrapping span if both times in morning" do
+      _(semantic_date_range_tag(date_time_object_from_morning - 1.hour, date_time_object_from_morning)).must_match(/\A<span.+?date_range.+?same_meridian.+?>/)
+      _(semantic_date_range_tag(date_time_object_from_morning, date_time_object_to_afternoon)).wont_match(/\A<span.+?date_range.+?same_meridian.+?>/)
+      _(semantic_date_range_tag(date_time_object_to_afternoon, date_time_object_to_afternoon + 1.hour)).must_match(/\A<span.+?date_range.+?same_meridian.+?>/)
+    end
+
+    it "accepts datetime objects" do
+      _(semantic_date_range_tag(date_time_object_from, date_time_object_to)).must_match(/<time.+?from.+?<\/time>/)
+      _(semantic_date_range_tag(date_time_object_from, date_time_object_to)).must_match(/<time.+?to.+?<\/time>/)
+    end
+
+    it "has an alias of semantic_date_tim_range_tag" do
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object)).must_match(/<time.+?semantic.+?date.+?from.+?>/)
+    end
+
+    it "adds locale class" do
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object)).must_match(/class=\".+\s#{I18n.locale}\s.+\"/i)
+    end
+
+    it "does not include separator attribute" do
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object, separator: "–")).wont_match(/separator=/)
+    end
+
+    it "allows to pass :format" do
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object, format: :test)).must_include "~"
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object, format: :test)).must_include 'data-format="test"'
+      _(semantic_time_tag(time_object, format: "%a, %b %-d, %Y, %-l:%M %P")).must_include 'data-format="%a, %b %-d, %Y, %-l:%M %P"'
+      _(semantic_time_tag(time_object, format: "%a, %b %-d, %Y, %-l:%M %P")).wont_include " format="
+    end
+
+    it "allows to pass data attributes as a Hash" do
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object, data: { name: "value" })).must_match /\<span.+?data-name="value".+?\>/
+      _(semantic_date_time_range_tag(date_object, date_tomorrow_object, time_data: { time_name: "time value" })).must_match /\<time.+?data-time-name="time value".+?\>/
+    end
+  end
+end

data/test/semantic_date_time_tags/semantic_date_tag_test.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "semantic_date_time_tags/view_helpers"
+
+describe SemanticDateTimeTags::ViewHelpers do
+  include SemanticDateTimeTags::ViewHelpers
+
+  let(:date_object) { Date.parse("31/10/#{Date.today.year}") }
+  let(:date_tomorrow_object) { Date.parse("31/10/#{Date.today.year}") + 1.day }
+  let(:time_object) { Time.parse("31/10/#{Date.today.year}") }
+
+  describe "#semantic_date_tag" do
+    let(:date_object_day) { date_object.strftime("%-d") }
+    let(:date_object_month) { date_object.strftime("%-m") }
+    let(:date_object_year) { date_object.year }
+
+    it "should only work with a date or datetime object" do
+      _(proc { semantic_date_tag(time_object) }).must_raise RuntimeError
+    end
+
+    it "wraps everything in a time tag by default" do
+      _(semantic_date_tag(date_object)).must_match(/\A<time.+?<\/time>\z/)
+    end
+
+    it "wraps everything in a span tag if passed as argument" do
+      _(semantic_date_tag(date_object, tag_name: :span)).must_match(/\A<span.+?<\/span>\z/)
+    end
+
+    it "returns year, month and day wrapped in a span tags" do
+      _(semantic_date_tag(date_object)).must_match(Regexp.new("<span.+?year.+?>#{date_object_year}</span>"))
+      _(semantic_date_tag(date_object)).must_match(Regexp.new("<span.+?month.+?>#{date_object_month}</span>"))
+      _(semantic_date_tag(date_object)).must_match(Regexp.new("<span.+?day.+?>#{date_object_day}</span>"))
+    end
+
+    it "adds current_date class if date is today" do
+      _(semantic_date_tag(Date.today)).must_include "current_date"
+      _(semantic_date_tag(Date.today - 1.day)).wont_include "current_date"
+    end
+
+    it "adds current class to year span if date is this year" do
+      _(semantic_date_tag(Date.today)).must_include "current_year"
+      _(semantic_date_tag(Date.today - 1.year)).wont_include "current_year"
+    end
+
+    it "adds locale class" do
+      _(semantic_date_tag(Date.today)).must_match(/class=\".+\s#{I18n.locale}\s.+\"/i)
+    end
+
+    it "allows to pass :format" do
+      _(semantic_date_tag(Date.today, format: :test)).must_include "~"
+      _(semantic_date_tag(Date.today, format: :test)).must_include 'data-format="test"'
+      _(semantic_date_tag(Date.today, format: "%a, %b %-d, %Y")).must_include 'data-format="%a, %b %-d, %Y"'
+      _(semantic_date_tag(Date.today, format: "%a, %b %-d, %Y")).wont_include " format="
+    end
+
+    it "allows to pass data attributes as a Hash" do
+      _(semantic_date_tag(Date.today, data: { name: "value" })).must_include 'data-name="value"'
+    end
+  end
+end

data/test/semantic_date_time_tags/semantic_date_time_tag_test.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "semantic_date_time_tags/view_helpers"
+
+describe SemanticDateTimeTags::ViewHelpers do
+  include SemanticDateTimeTags::ViewHelpers
+
+  let(:date_object) { Date.parse("31/10/#{Date.today.year}") }
+  let(:date_tomorrow_object) { Date.parse("31/10/#{Date.today.year}") + 1.day }
+  let(:time_object) { Time.parse("31/10/#{Date.today.year}") }
+
+  describe "#semantic_date_time_tag" do
+    let(:date_time_object) { DateTime.parse("31/10/#{Date.today.year}") }
+    let(:date_time_object_noon) { DateTime.parse("31/10/#{Date.today.year}").noon }
+    let(:date_time_object_midnight) { DateTime.parse("31/10/#{Date.today.year}").midnight }
+
+    it "only works with a time or date_time object" do
+      _(proc { semantic_date_time_tag(time_object) }).must_raise RuntimeError
+    end
+
+    it "wraps the whole thing in a time tag" do
+      _(semantic_date_time_tag(date_time_object)).must_match(/\A<time.+?<\/time>\z/)
+    end
+
+    it "adds noon as data-in-words if time is noon" do
+      _(semantic_date_time_tag(date_time_object_noon)).must_match(/\A<time.+?data-in-words=\"noon\".+?<\/time>\z/)
+    end
+
+    it "adds midnight as data-in-words if time is midnight" do
+      _(semantic_date_time_tag(date_time_object_midnight)).must_match(/\A<time.+?data-in-words=\"midnight\".+?<\/time>\z/)
+    end
+
+    it "adds locale class" do
+      _(semantic_date_time_tag(date_time_object)).must_match(/class=\".+\s#{I18n.locale}\s.+\"/i)
+    end
+
+    it "allows to pass :format" do
+      _(semantic_date_time_tag(date_time_object, format: :test)).must_include "~"
+      _(semantic_date_time_tag(date_time_object, format: :test)).must_include 'data-format="test"'
+      _(semantic_date_time_tag(date_time_object, format: "%a, %b %-d, %Y, %-l:%M %P")).must_include 'data-format="%a, %b %-d, %Y, %-l:%M %P"'
+      _(semantic_date_time_tag(date_time_object, format: "%a, %b %-d, %Y, %-l:%M %P")).wont_include " format="
+    end
+
+    it "allows to pass data attributes as a Hash" do
+      _(semantic_date_time_tag(date_time_object, data: { name: "value" })).must_include 'data-name="value"'
+    end
+  end
+end

data/test/semantic_date_time_tags/semantic_time_tag_test.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "semantic_date_time_tags/view_helpers"
+
+describe SemanticDateTimeTags::ViewHelpers do
+  include SemanticDateTimeTags::ViewHelpers
+
+  let(:date_object) { Date.parse("31/10/#{Date.today.year}") }
+  let(:date_tomorrow_object) { Date.parse("31/10/#{Date.today.year}") + 1.day }
+  let(:time_object) { Time.parse("31/10/#{Date.today.year}") }
+
+  describe "#semantic_time_tag" do
+    let(:time_object_hours) { time_object.strftime("%H") }
+    let(:time_object_midnight) { Time.new(Date.today.year, 11, 3, 24, 00) }
+    let(:time_object_minutes) { time_object.strftime("%M") }
+    let(:time_object_noon) { Time.new(Date.today.year, 11, 3, 12, 00) }
+    let(:time_object_whole_hour) { Time.new(2014, 8, 21, 15) }
+    let(:time_object_whole_minute) { Time.new(2014, 8, 21, 15, 30) }
+    let(:time_object_before_noon) { Time.new(2014, 8, 21, 11, 00) }
+    let(:time_object_after_noon) { Time.new(2014, 8, 21, 12, 01) }
+
+    it "does not work with a date object" do
+      _(proc { semantic_time_tag(date_object) }).must_raise RuntimeError
+    end
+
+    it "returns hours wrapped in a span tag" do
+      _(semantic_time_tag(time_object)).must_match(Regexp.new("<span.+?hours.+?H.+?>#{time_object_hours}</span>"))
+    end
+
+    it "returns minutes wrapped in a span tag" do
+      _(semantic_time_tag(time_object)).must_match(Regexp.new("<span.+?minutes.+?M.+?>#{time_object_minutes}</span>"))
+    end
+
+    it "wraps the whole thing in a time tag by default" do
+      _(semantic_time_tag(time_object)).must_match(/\A<time.+?<\/time>\z/)
+    end
+
+    it "wraps the whole thing in a span tag if passed as argument" do
+      _(semantic_time_tag(time_object, tag_name: :span)).must_match(/\A<span.+?<\/span>\z/)
+    end
+
+    it "adds whole_hour class if time is whole hour" do
+      _(semantic_time_tag(time_object_whole_hour)).must_match(/\A<time.+?whole_hour.+?<\/time>\z/)
+    end
+
+    it "adds whole_minute class if time is whole minute" do
+      _(semantic_time_tag(time_object_whole_minute)).must_match(/\A<time.+?whole_minute.+?<\/time>\z/)
+    end
+
+    it "adds noon class if time is noon" do
+      _(semantic_time_tag(time_object_noon)).must_match(/\A<time.+?noon.+?<\/time>\z/)
+    end
+
+    it "adds midnight class if time is midnight" do
+      _(semantic_time_tag(time_object_midnight)).must_match(/\A<time.+?midnight.+?<\/time>\z/)
+    end
+
+    it "adds am class if time is before noon" do
+      _(semantic_time_tag(time_object_before_noon)).must_match(/\A<time.+?am.+?<\/time>\z/)
+    end
+
+    it "adds pm class if time is after noon" do
+      _(semantic_time_tag(time_object_after_noon)).must_match(/\A<time.+?pm.+?<\/time>\z/)
+    end
+
+    it "adds noon as data-in-words if time is noon" do
+      _(semantic_time_tag(time_object_noon)).must_match(/\A<time.+?data-in-words=\"noon\".+?<\/time>\z/)
+    end
+
+    it "adds midnight as data-in-words if time is midnight" do
+      _(semantic_time_tag(time_object_midnight)).must_match(/\A<time.+?data-in-words=\"midnight\".+?<\/time>\z/)
+    end
+
+    it "adds locale class" do
+      _(semantic_time_tag(time_object)).must_match(/class=\".+\s#{I18n.locale}\s.+\"/i)
+    end
+
+    it "allows to pass :format" do
+      _(semantic_time_tag(time_object, format: :test)).must_include "~"
+      _(semantic_time_tag(time_object, format: :test)).must_include 'data-format="test"'
+      _(semantic_time_tag(time_object, format: "%-l:%M %P")).must_include 'data-format="%-l:%M %P"'
+      _(semantic_time_tag(time_object, format: "%-l:%M %P")).wont_include " format="
+    end
+
+    it "allows to pass data attributes as a Hash" do
+      _(semantic_time_tag(time_object, data: { name: "value" })).must_include 'data-name="value"'
+    end
+  end
+end