simple_calendar 2.4.2 → 3.0.0

data/gemfiles/rails_main.gemfile.lock

@@ -0,0 +1,246 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: c9cdd800d30ec38f079b3df0772ab47f4ba4b11f
+  specs:
+    actioncable (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      globalid (>= 0.3.6)
+    activemodel (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+    activerecord (7.1.0.alpha)
+      activemodel (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      timeout (>= 0.4.0)
+    activestorage (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      marcel (~> 1.0)
+    activesupport (7.1.0.alpha)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    rails (7.1.0.alpha)
+      actioncable (= 7.1.0.alpha)
+      actionmailbox (= 7.1.0.alpha)
+      actionmailer (= 7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      actiontext (= 7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activemodel (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      bundler (>= 1.15.0)
+      railties (= 7.1.0.alpha)
+    railties (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+
+GIT
+  remote: https://github.com/thoughtbot/appraisal.git
+  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+
+PATH
+  remote: ..
+  specs:
+    simple_calendar (3.0.0)
+      rails (>= 6.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ast (2.4.2)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.3)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.7.3)
+      reline (>= 0.3.6)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
+    net-imap (0.3.6)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.15.3-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.3-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    puma (6.3.0)
+      nio4r (~> 2.0)
+    racc (1.7.1)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    reline (0.3.6)
+      io-console (~> 0.5)
+    rexml (3.2.5)
+    rubocop (1.52.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    sqlite3 (1.6.3)
+      mini_portile2 (~> 2.8.0)
+    sqlite3 (1.6.3-x86_64-darwin)
+    sqlite3 (1.6.3-x86_64-linux)
+    standard (1.30.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.52.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.1.1)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.18.0)
+    thor (1.2.2)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.8)
+
+PLATFORMS
+  ruby
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal!
+  puma
+  rails!
+  simple_calendar!
+  sqlite3
+  standard
+
+BUNDLED WITH
+   2.4.16

data/lib/simple_calendar/calendar.rb

@@ -6,9 +6,11 @@ module SimpleCalendar
 
     attr_accessor :view_context, :options
 
-    def initialize(view_context, opts = {})
+    def initialize(view_context, options = {}, &block)
       @view_context = view_context
-      @options = opts
+      @locals = options.delete(:locals) || {}
+      @options = options
+      @block = block
 
       # Next and previous view links should use the same params as the current view
       @params = @view_context.respond_to?(:params) ? @view_context.params : {}
@@ -19,16 +21,20 @@ module SimpleCalendar
       @params.merge!(@options.fetch(:params, {}))
     end
 
-    def render(&block)
+    def render_in(view_context)
       view_context.render(
         partial: partial_name,
-        locals: {
-          passed_block: block,
-          calendar: self,
-          date_range: date_range,
-          start_date: start_date,
-          sorted_events: sorted_events
-        }
+        locals: locals
+      )
+    end
+
+    def locals(&block)
+      @locals.merge(
+        passed_block: @block,
+        calendar: self,
+        date_range: date_range,
+        start_date: start_date,
+        sorted_events: sorted_events
       )
     end
 
@@ -62,15 +68,17 @@ module SimpleCalendar
     end
 
     def url_for_previous_view
-      view_context.url_for(@params.merge(start_date_param => (date_range.first - 1.day).iso8601))
+      view_context.url_for(@params.merge(start_date_param => (date_range.first - date_range.count.days).iso8601))
+    end
+
+    def url_for_today_view
+      view_context.url_for(@params.merge(start_date_param => Time.current.to_date.iso8601))
     end
 
     def date_range
       (start_date..(start_date + additional_days.days)).to_a
     end
 
-    private
-
     def partial_name
       @options[:partial] || self.class.name.underscore
     end
@@ -94,12 +102,16 @@ module SimpleCalendar
       end
     end
 
+    def sorted_events_for(day)
+      sorted_events.fetch(day, [])
+    end
+
     def group_events_by_date(events)
       events_grouped_by_date = Hash.new { |h, k| h[k] = [] }
 
       events.each do |event|
         event_start_date = event.send(attribute).to_date
-        event_end_date = event.respond_to?(end_attribute) && !event.send(end_attribute).nil? ? event.send(end_attribute).to_date : event_start_date
+        event_end_date = (event.respond_to?(end_attribute) && !event.send(end_attribute).nil?) ? event.send(end_attribute).to_date : event_start_date
         (event_start_date..event_end_date.to_date).each do |enumerated_date|
           events_grouped_by_date[enumerated_date] << event
         end

data/lib/simple_calendar/{railtie.rb → engine.rb}

@@ -1,7 +1,9 @@
 module SimpleCalendar
   class Engine < Rails::Engine
     initializer "simple_calendar.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers
+      ActiveSupport.on_load(:action_view) do
+        include ViewHelpers
+      end
     end
   end
 end

data/lib/simple_calendar/month_calendar.rb

@@ -3,5 +3,9 @@ module SimpleCalendar
     def date_range
       (start_date.beginning_of_month.beginning_of_week..start_date.end_of_month.end_of_week).to_a
     end
+
+    def url_for_previous_view
+      view_context.url_for(@params.merge(start_date_param => (date_range.first - 1.day).iso8601))
+    end
   end
 end

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.4.2"
+  VERSION = "3.0.0"
 end

data/lib/simple_calendar/view_helpers.rb

@@ -2,17 +2,17 @@ module SimpleCalendar
   module ViewHelpers
     def calendar(options = {}, &block)
       raise "calendar requires a block" unless block
-      SimpleCalendar::Calendar.new(self, options).render(&block)
+      render SimpleCalendar::Calendar.new(self, options, &block)
     end
 
     def month_calendar(options = {}, &block)
       raise "month_calendar requires a block" unless block
-      SimpleCalendar::MonthCalendar.new(self, options).render(&block)
+      render SimpleCalendar::MonthCalendar.new(self, options, &block)
     end
 
     def week_calendar(options = {}, &block)
       raise "week_calendar requires a block" unless block
-      SimpleCalendar::WeekCalendar.new(self, options).render(&block)
+      render SimpleCalendar::WeekCalendar.new(self, options, &block)
     end
   end
 end

data/lib/simple_calendar/week_calendar.rb

@@ -1,7 +1,7 @@
 module SimpleCalendar
   class WeekCalendar < SimpleCalendar::Calendar
     def week_number
-      format = Date.beginning_of_week == :sunday ? "%U" : "%V"
+      format = (Date.beginning_of_week == :sunday) ? "%U" : "%V"
       start_date.beginning_of_week.strftime(format).to_i
     end
 
@@ -19,5 +19,9 @@ module SimpleCalendar
 
       (starting..ending).to_a
     end
+
+    def url_for_previous_view
+      view_context.url_for(@params.merge(start_date_param => (date_range.first - 1.day).iso8601))
+    end
   end
 end

data/lib/simple_calendar.rb

@@ -1,6 +1,13 @@
+require "simple_calendar/engine"
 require "simple_calendar/calendar"
 require "simple_calendar/month_calendar"
 require "simple_calendar/week_calendar"
-require "simple_calendar/railtie"
 require "simple_calendar/version"
 require "simple_calendar/view_helpers"
+
+module SimpleCalendar
+  autoload :Calendar, "simple_calendar/calendar"
+  autoload :MonthCalendar, "simple_calendar/month_calendar"
+  autoload :WeekCalendar, "simple_calendar/week_calendar"
+  autoload :ViewHelpers, "simple_calendar/view_helpers"
+end

data/simple_calendar.gemspec

@@ -14,9 +14,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "simple_calendar"
 
   s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 3.0"
-  s.add_development_dependency "rspec"
+  s.add_dependency "rails", ">= 6.1"
 end

data/test/calendars/calendar_test.rb

@@ -0,0 +1,154 @@
+require "test_helper"
+
+class CalendarTest < ActionView::TestCase
+  attr_reader :calendar
+
+  setup do
+    @calendar = SimpleCalendar::Calendar.new(view)
+  end
+
+  test "renders a partial with the same name as the class" do
+    assert_equal "simple_calendar/calendar", calendar.partial_name
+  end
+
+  test "has start_time as the default attribute" do
+    assert_equal :start_time, calendar.attribute
+  end
+
+  test "allows you to override the default attribute" do
+    assert_equal :starts_at, SimpleCalendar::Calendar.new(view, attribute: :starts_at).attribute
+  end
+
+  test "set a default when `partial` option isn't present" do
+    assert_equal "simple_calendar/calendar", SimpleCalendar::Calendar.new(view).partial_name
+    assert_equal "simple_calendar/month_calendar", SimpleCalendar::MonthCalendar.new(view).partial_name
+    assert_equal "simple_calendar/week_calendar", SimpleCalendar::WeekCalendar.new(view).partial_name
+  end
+
+  test "allows to override the default partial" do
+    assert_equal "simple_calendar/custom_calendar", SimpleCalendar::Calendar.new(view, partial: "simple_calendar/custom_calendar").partial_name
+  end
+
+  test "converts an array of events to a hash sorted by days" do
+    today, tomorrow = Date.today, Date.tomorrow
+
+    event1 = Meeting.new(start_time: today.at_midnight)
+    event2 = Meeting.new(start_time: today.at_noon)
+    event3 = Meeting.new(start_time: tomorrow.at_noon)
+
+    events = [event1, event2, event3].shuffle
+    calendar = SimpleCalendar::Calendar.new(view, events: events)
+
+    sorted_events = calendar.sorted_events
+
+    assert_equal [event1, event2], sorted_events[today]
+    assert_equal [event3], sorted_events[tomorrow]
+  end
+
+  test "converts an array of multi-day events to a hash sorted by days" do
+    today, tomorrow = Date.today, Date.tomorrow
+
+    event1 = Meeting.new(start_time: today.at_midnight, end_time: tomorrow.at_midnight)
+    event2 = Meeting.new(start_time: today.at_noon)
+    event3 = Meeting.new(start_time: tomorrow.at_noon)
+
+    events = [event1, event2, event3].shuffle
+    calendar = SimpleCalendar::Calendar.new(view, events: events)
+
+    assert_equal [event1, event2], calendar.sorted_events[today]
+    assert_equal [event1, event3], calendar.sorted_events[tomorrow]
+  end
+
+  test "handles events without a start time" do
+    event = Meeting.new(start_time: nil)
+    calendar = SimpleCalendar::Calendar.new(view, events: [event])
+
+    assert_nothing_raised do
+      calendar.sorted_events
+    end
+  end
+
+  test "defaults to today's date" do
+    calendar = SimpleCalendar::Calendar.new(view)
+    assert_equal Date.today, calendar.start_date
+  end
+
+  test "uses the view context's params start_date to override" do
+    params[:start_date] = Date.yesterday
+    calendar = SimpleCalendar::Calendar.new(view)
+    assert_equal Date.yesterday, calendar.start_date
+  end
+
+  test "uses the optional argument's start_date to override view_context's start_date" do
+    params[:start_date] = Date.yesterday
+    calendar = SimpleCalendar::Calendar.new(view, start_date: Date.tomorrow)
+    assert_equal Date.tomorrow, calendar.start_date
+  end
+
+  test "takes an option to override the start_date parameter" do
+    params[:date] = Date.yesterday
+    calendar = SimpleCalendar::Calendar.new(view, start_date_param: :date)
+    assert_equal Date.yesterday, calendar.start_date
+  end
+
+  test "should have the current week" do
+    calendar = SimpleCalendar::Calendar.new(view)
+    week = calendar.date_range.each_slice(7).to_a[0]
+    assert_includes calendar.tr_classes_for(week), "current-week"
+  end
+
+  test "should not have the current week if it does not contain today" do
+    params[:start_date] = 6.months.ago
+    calendar = SimpleCalendar::MonthCalendar.new(view)
+    week = calendar.date_range.each_slice(7).to_a[0]
+    assert_not_includes calendar.tr_classes_for(week), "current-week"
+  end
+
+  test "has a param that determines the start date of the calendar" do
+    calendar = SimpleCalendar::Calendar.new(view)
+    rendering_variables = calendar.locals
+    assert_not_nil rendering_variables[:start_date]
+  end
+
+  test "generates a default date if no start date is present" do
+    calendar = SimpleCalendar::Calendar.new(view)
+    calendar_start_date = calendar.locals[:start_date]
+    assert_not_nil calendar_start_date
+    assert_kind_of Date, calendar_start_date
+  end
+
+  test "has a range of dates" do
+    calendar = SimpleCalendar::Calendar.new(view)
+    calendar_date_range = calendar.date_range
+    assert_kind_of Array, calendar_date_range
+    calendar_date_range.each do |date|
+      assert_kind_of Date, date
+    end
+  end
+
+  test "accepts an array of events" do
+    first_event = Meeting.new(name: "event1", start_time: Date.today)
+    second_event = Meeting.new(name: "event2", start_time: Date.today + 1.day)
+    events = [first_event, second_event]
+    calendar = SimpleCalendar::Calendar.new(view, events: events)
+    calendar_sorted_events = calendar.locals[:sorted_events]
+
+    assert_equal 2, calendar_sorted_events.length
+  end
+
+  test "sorts the events" do
+    first_event = Meeting.new(name: "event1", start_time: Date.today + 2.days)
+    second_event = Meeting.new(name: "event2", start_time: Date.today + 1.day)
+    third_event = Meeting.new(name: "event3", start_time: Date.today)
+    events = [first_event, third_event, second_event]
+    calendar = SimpleCalendar::Calendar.new(view, events: events)
+    calendar_sorted_events = calendar.locals[:sorted_events]
+    first_key = calendar_sorted_events.keys[0]
+    second_key = calendar_sorted_events.keys[1]
+    third_key = calendar_sorted_events.keys[2]
+
+    assert_equal third_event, calendar_sorted_events[first_key][0]
+    assert_equal second_event, calendar_sorted_events[second_key][0]
+    assert_equal first_event, calendar_sorted_events[third_key][0]
+  end
+end

data/test/calendars/month_calendar_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+class MonthCalendarTest < ActionView::TestCase
+  test "date_range returns a full calendar month" do
+    today = Date.today
+    calendar = SimpleCalendar::MonthCalendar.new(view, start_date: today)
+    assert calendar.date_range.min <= today.beginning_of_month
+    assert calendar.date_range.max >= today.end_of_month
+  end
+
+  test "date_range returns the days of next and previous months on the edges of the calendar" do
+    calendar = SimpleCalendar::MonthCalendar.new(view, start_date: Date.new(2018, 8, 1))
+    assert_equal Date.new(2018, 7, 30), calendar.date_range.first
+    assert_equal Date.new(2018, 9, 2), calendar.date_range.last
+  end
+end

data/test/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative "config/application"
+
+Rails.application.load_tasks

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_directory ../stylesheets

data/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1 @@
+/* Application styles */

data/test/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/test/dummy/app/controllers/meetings_controller.rb

@@ -0,0 +1,59 @@
+class MeetingsController < ApplicationController
+  before_action :set_meeting, only: %i[show edit update destroy]
+
+  # GET /meetings
+  def index
+    @meetings = Meeting.all
+  end
+
+  # GET /meetings/1
+  def show
+  end
+
+  # GET /meetings/new
+  def new
+    @meeting = Meeting.new
+  end
+
+  # GET /meetings/1/edit
+  def edit
+  end
+
+  # POST /meetings
+  def create
+    @meeting = Meeting.new(meeting_params)
+
+    if @meeting.save
+      redirect_to @meeting, notice: "Meeting was successfully created."
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /meetings/1
+  def update
+    if @meeting.update(meeting_params)
+      redirect_to @meeting, notice: "Meeting was successfully updated."
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /meetings/1
+  def destroy
+    @meeting.destroy
+    redirect_to meetings_url, notice: "Meeting was successfully destroyed."
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_meeting
+    @meeting = Meeting.find(params[:id])
+  end
+
+  # Only allow a list of trusted parameters through.
+  def meeting_params
+    params.require(:meeting).permit(:name, :start_time, :end_time)
+  end
+end