comfy_carousel 0.0.0 → 0.0.1

data/app/assets/javascripts/slides.min.jquery.js

@@ -0,0 +1,20 @@
+/*
+* Slides, A Slideshow Plugin for jQuery
+* Intructions: http://slidesjs.com
+* By: Nathan Searles, http://nathansearles.com
+* Version: 1.1.9
+* Updated: September 5th, 2011
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+(function(a){a.fn.slides=function(b){return b=a.extend({},a.fn.slides.option,b),this.each(function(){function w(g,h,i){if(!p&&o){p=!0,b.animationStart(n+1);switch(g){case"next":l=n,k=n+1,k=e===k?0:k,r=f*2,g=-f*2,n=k;break;case"prev":l=n,k=n-1,k=k===-1?e-1:k,r=0,g=0,n=k;break;case"pagination":k=parseInt(i,10),l=a("."+b.paginationClass+" li."+b.currentClass+" a",c).attr("href").match("[^#/]+$"),k>l?(r=f*2,g=-f*2):(r=0,g=0),n=k}h==="fade"?b.crossfade?d.children(":eq("+k+")",c).css({zIndex:10}).fadeIn(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1)}):d.children(":eq("+l+")",c).fadeOut(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing)}):d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing,function(){a.browser.msie&&a(this).get(0).style.removeAttribute("filter")}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+k+")").css({left:r,display:"block"}),b.autoHeight?d.animate({left:g,height:d.children(":eq("+k+")").outerHeight()},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1}):d.animate({left:g},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1})),b.pagination&&(a("."+b.paginationClass+" li."+b.currentClass,c).removeClass(b.currentClass),a("."+b.paginationClass+" li:eq("+k+")",c).addClass(b.currentClass))}}function x(){clearInterval(c.data("interval"))}function y(){b.pause?(clearTimeout(c.data("pause")),clearInterval(c.data("interval")),u=setTimeout(function(){clearTimeout(c.data("pause")),v=setInterval(function(){w("next",i)},b.play),c.data("interval",v)},b.pause),c.data("pause",u)):x()}a("."+b.container,a(this)).children().wrapAll('<div class="slides_control"/>');var c=a(this),d=a(".slides_control",c),e=d.children().size(),f=d.children().outerWidth(),g=d.children().outerHeight(),h=b.start-1,i=b.effect.indexOf(",")<0?b.effect:b.effect.replace(" ","").split(",")[0],j=b.effect.indexOf(",")<0?i:b.effect.replace(" ","").split(",")[1],k=0,l=0,m=0,n=0,o,p,q,r,s,t,u,v;if(e<2)return a("."+b.container,a(this)).fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()}),a("."+b.next+", ."+b.prev).fadeOut(0),!1;if(e<2)return;h<0&&(h=0),h>e&&(h=e-1),b.start&&(n=h),b.randomize&&d.randomize(),a("."+b.container,c).css({overflow:"hidden",position:"relative"}),d.children().css({position:"absolute",top:0,left:d.children().outerWidth(),zIndex:0,display:"none"}),d.css({position:"relative",width:f*3,height:g,left:-f}),a("."+b.container,c).css({display:"block"}),b.autoHeight&&(d.children().css({height:"auto"}),d.animate({height:d.children(":eq("+h+")").outerHeight()},b.autoHeightSpeed));if(b.preload&&d.find("img:eq("+h+")").length){a("."+b.container,c).css({background:"url("+b.preloadImage+") no-repeat 50% 50%"});var z=d.find("img:eq("+h+")").attr("src")+"?"+(new Date).getTime();a("img",c).parent().attr("class")!="slides_control"?t=d.children(":eq(0)")[0].tagName.toLowerCase():t=d.find("img:eq("+h+")"),d.find("img:eq("+h+")").attr("src",z).load(function(){d.find(t+":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){a(this).css({zIndex:5}),a("."+b.container,c).css({background:""}),o=!0,b.slidesLoaded()})})}else d.children(":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()});b.bigTarget&&(d.children().css({cursor:"pointer"}),d.children().click(function(){return w("next",i),!1})),b.hoverPause&&b.play&&(d.bind("mouseover",function(){x()}),d.bind("mouseleave",function(){y()})),b.generateNextPrev&&(a("."+b.container,c).after('<a href="#" class="'+b.prev+'">Prev</a>'),a("."+b.prev,c).after('<a href="#" class="'+b.next+'">Next</a>')),a("."+b.next,c).click(function(a){a.preventDefault(),b.play&&y(),w("next",i)}),a("."+b.prev,c).click(function(a){a.preventDefault(),b.play&&y(),w("prev",i)}),b.generatePagination?(b.prependPagination?c.prepend("<ul class="+b.paginationClass+"></ul>"):c.append("<ul class="+b.paginationClass+"></ul>"),d.children().each(function(){a("."+b.paginationClass,c).append('<li><a href="#'+m+'">'+(m+1)+"</a></li>"),m++})):a("."+b.paginationClass+" li a",c).each(function(){a(this).attr("href","#"+m),m++}),a("."+b.paginationClass+" li:eq("+h+")",c).addClass(b.currentClass),a("."+b.paginationClass+" li a",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$"),n!=q&&w("pagination",j,q),!1}),a("a.link",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$")-1,n!=q&&w("pagination",j,q),!1}),b.play&&(v=setInterval(function(){w("next",i)},b.play),c.data("interval",v))})},a.fn.slides.option={preload:!1,preloadImage:"/img/loading.gif",container:"slides_container",generateNextPrev:!1,next:"next",prev:"prev",pagination:!0,generatePagination:!0,prependPagination:!1,paginationClass:"pagination",currentClass:"current",fadeSpeed:350,fadeEasing:"",slideSpeed:350,slideEasing:"",start:1,effect:"slide",crossfade:!1,randomize:!1,play:0,pause:0,hoverPause:!1,autoHeight:!1,autoHeightSpeed:350,bigTarget:!1,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}},a.fn.randomize=function(b){function c(){return Math.round(Math.random())-.5}return a(this).each(function(){var d=a(this),e=d.children(),f=e.length;if(f>1){e.hide();var g=[];for(i=0;i<f;i++)g[g.length]=i;g=g.sort(c),a.each(g,function(a,c){var f=e.eq(c),g=f.clone(!0);g.show().appendTo(d),b!==undefined&&b(f,g),f.remove()})}})}})(jQuery)

data/app/controllers/admin/carousel/base_controller.rb

@@ -0,0 +1,10 @@
+class Admin::Carousel::BaseController < ComfyCarousel.config.admin_controller.to_s.constantize
+  
+  def load_carousel
+    @carousel = Carousel::Carousel.find(params[:carousel_id] || params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Carousel not found'
+    redirect_to admin_carousel_carousels_path
+  end
+  
+end

data/app/controllers/admin/carousel/carousels_controller.rb

@@ -0,0 +1,50 @@
+class Admin::Carousel::CarouselsController < Admin::Carousel::BaseController
+  
+  before_filter :build_carousel,  :only => [:new, :create]
+  before_filter :load_carousel,   :only => [:edit, :update, :destroy]
+  
+  def index
+    @carousels = Carousel::Carousel.all
+  end
+  
+  def new
+    render
+  end
+  
+  def edit
+    render
+  end
+  
+  def create
+    @carousel.save!
+    flash[:notice] = 'Carousel created'
+    redirect_to new_admin_carousel_carousel_slide_path(@carousel)
+  
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create Carousel'
+    render :action => :new
+  end
+  
+  def update
+    @carousel.update_attributes!(params[:carousel])
+    flash[:notice] = 'Carousel updated'
+    redirect_to :action => :edit, :id => @carousel
+    
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update Carousel'
+    render :action => :edit
+  end
+  
+  def destroy
+    @carousel.destroy
+    flash[:notice] = 'Carousel removed'
+    redirect_to :action => :index
+  end
+  
+protected
+  
+  def build_carousel
+    @carousel = Carousel::Carousel.new(params[:carousel])
+  end
+  
+end

data/app/controllers/admin/carousel/slides_controller.rb

@@ -1,10 +1,11 @@
-class Admin::Carousel::SlidesController < CmsAdmin::BaseController
+class Admin::Carousel::SlidesController < Admin::Carousel::BaseController
   
+  before_filter :load_carousel
   before_filter :build_slide, :only => [:new, :create]
   before_filter :load_slide,  :only => [:edit, :update, :destroy]
   
   def index
-    @slides = Slide.order('id DESC').page(params[:page])
+    @slides = @carousel.slides
   end
 
   def new
@@ -38,15 +39,22 @@ class Admin::Carousel::SlidesController < CmsAdmin::BaseController
     flash[:notice] = 'Slide deleted'
     redirect_to :action => :index
   end
+  
+  def reorder
+    (params[:carousel_slide] || []).each_with_index do |id, index|
+      Carousel::Slide.where(:id => id).update_all(:position => index)
+    end
+    render :nothing => true
+  end
 
 protected
 
   def build_slide
-    @slide = Slide.new(params[:slide])
+    @slide = @carousel.slides.new(params[:slide])
   end
 
   def load_slide
-    @slide = Slide.find(params[:id])
+    @slide = @carousel.slides.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Slide not found'
     redirect_to :action => :index

data/app/helpers/carousel/application_helper.rb

@@ -0,0 +1,12 @@
+module Carousel::ApplicationHelper
+  
+  def comfy_form_for(record_or_name_or_array, *args, &proc)
+    options = args.extract_options!
+    form_for(
+      record_or_name_or_array,
+      *(args << options.merge(:builder => ComfyCarousel.config.form_builder.to_s.constantize)),
+      &proc
+    )
+  end
+
+end

data/app/models/carousel/carousel.rb

@@ -0,0 +1,25 @@
+class Carousel::Carousel < ActiveRecord::Base
+  
+  self.table_name = :carousel_carousels
+  
+  # -- Relationships --------------------------------------------------------
+  has_many :slides,
+    :dependent => :destroy
+    
+  # -- Validations ----------------------------------------------------------
+  validates :label,
+    :presence => true
+  validates :identifier,
+    :presence => true,
+    :format   => { :with => /^\w[a-z0-9_-]*$/i }
+    
+  # -- Callbacks ------------------------------------------------------------
+  before_validation :assign_label
+  
+protected
+  
+  def assign_label
+    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
+  end
+  
+end

data/app/models/carousel/slide.rb

@@ -1,23 +1,27 @@
 class Carousel::Slide < ActiveRecord::Base
   
-  has_attached_file :slide, 
-    :styles => {
-                  :slide => "450x315#",
-                  :edit_page => "150x150>"
-               }
-    
-  attr_accessible :description,
-                  :url,
-                  :slide,
-                  :title,
-                  :sort
-                  
-  # -- Validations ----------------------------------------------------------
+  self.table_name = :carousel_slides
+  
+  has_attached_file :file
+  
+  # -- Relationships --------------------------------------------------------
+  belongs_to :carousel
+  
+  # -- Callbacks ------------------------------------------------------------
+  before_create :assign_position
   
-  validates :description,
-            :url,
-            :title,
-            :sort,
+  # -- Validations ----------------------------------------------------------
+  validates :carousel_id, :label,
     :presence => true
+    
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order('carousel_slides.position')
+  
+protected
+  
+  def assign_position
+    max = carousel.slides.maximum(:position)
+    self.position = max ? max + 1 : 0
+  end
   
 end

data/app/views/admin/carousel/_navigation.html.erb

@@ -0,0 +1 @@
+<li><%= active_link_to 'Carousels', admin_carousel_carousels_path %></li>

data/app/views/admin/carousel/carousels/_form.html.erb

@@ -0,0 +1,4 @@
+<%= form.text_field :label, :id => (@carousel.new_record?? 'slugify' : nil) %>
+<%= form.text_field :identifier, :id => 'slug' %>
+
+<%= form.submit (@carousel.new_record? ? 'Create Carousel' : 'Update Carousel') %>

data/app/views/admin/carousel/carousels/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Editing <%= @carousel.label.titleize %></h1>
+
+<%= comfy_form_for @carousel, :as => :carousel, :url => {:action => :update} do |form| %>
+  <%= render :partial => form %>
+<% end %>

data/app/views/admin/carousel/carousels/index.html.erb

@@ -0,0 +1,20 @@
+<%= link_to 'Add New Carousel', new_admin_carousel_carousel_path, :class => 'big button' %>
+
+<h1>Carousels</h1>
+
+<ul class='list'>
+  <% @carousels.each do |carousel| %>
+    <li>
+      <div class='item'>
+        <div class='icon'></div>
+        <div class='action_links'>
+          <%= link_to 'Edit', edit_admin_carousel_carousel_path(carousel) %>
+          <%= link_to 'Delete', admin_carousel_carousel_path(carousel), :method => :delete, :confirm => 'Are you sure?' %>
+        </div>
+        <div class='label'>
+          <%= link_to carousel.label, admin_carousel_carousel_slides_path(carousel) %>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>

data/app/views/admin/carousel/carousels/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Carousel</h1>
+
+<%= comfy_form_for @carousel, :as => :carousel, :url => {:action => :create} do |form| %>
+  <%= render :partial => form %>
+<% end %>

data/app/views/admin/carousel/slides/_form.html.erb

@@ -1,15 +1,13 @@
-- content_for :right_column do
-  = render :partial => 'cms_admin/files/index'
-  
-= form.text_field :title
-= form.text_field :sort
-= form.file_field :slide, :label => "Slide Image"
-- if @slide.slide.url
-  .form_element
-    .label
-      %label Current Image
-    .value= image_tag @slide.slide.url(:edit_page)
-= form.text_field :url, :label => "Link to"
-= form.text_area :description
+<%= form.text_field :label %>
+<%= form.text_area :content %>
+<%= form.text_field :url %>
+<%= form.file_field :file %>
 
-= form.submit @slide.new_record?? 'Create Slide' : 'Update Slide'
+<% if defined?(ComfortableMexicanSofa) %>
+  <% content_for :right_column do %>
+    <%= render :partial => 'cms_admin/files/index' %>
+  <% end %>
+  <%= cms_hook :carousel_slide, :locals => { :form => form } %>
+<% end %>
+
+<%= form.submit (@slide.new_record? ? 'Create Slide' : 'Update Slide') %>

data/app/views/admin/carousel/slides/edit.html.erb

@@ -1,4 +1,5 @@
-%h1 Editing Slide
+<h1>Editing Slide</h1>
 
-= cms_form_for @slide, :url => {:action => :update} do |form|
-  = render :partial => 'form', :object => form
+<%= comfy_form_for @slide, :as => :slide, :url => {:action => :update} do |form| %>
+  <%= render :partial => form %>
+<% end %>

data/app/views/admin/carousel/slides/index.html.erb

@@ -1,23 +1,22 @@
-= link_to span_tag('Create Slide'), new_admin_slide_path, :class => 'big button'
-%h1 Slides
+<%= link_to 'Add New Slide', new_admin_carousel_carousel_slide_path(@carousel), :class => 'big button' %>
 
-= will_paginate @slides
+<h1>Slides</h1>
 
-%table.formatted
-  %tr
-    %th.main Title
-    %th Link
-    %th Image
-    %th Sort
-    %th Actions
-  - @slides.each do |slide|
-    %tr
-      %td= slide.title
-      %td= slide.url
-      %td= slide.slide_file_name
-      %td= slide.sort
-      %td.action_links
-        = link_to "Edit", edit_admin_slide_path(slide)
-        = link_to "Delete", admin_slide_path(slide), :method => :delete, :confirm => "Are you sure?"
-
-= will_paginate @slides
+<ul class='list sortable'>
+  <% @slides.each do |slide| %>
+    <li id='carousel_slide_<%= slide.id %>'>
+      <div class='item'>
+        <div class='icon'>
+          <div class='dragger'><span>order</span></div>
+        </div>
+        <div class='action_links'>
+          <%= link_to 'Edit', edit_admin_carousel_carousel_slide_path(@carousel, slide) %>
+          <%= link_to 'Delete', admin_carousel_carousel_slide_path(@carousel, slide), :method => :delete, :confirm => 'Are you sure?' %>
+        </div>
+        <div class='label'>
+          <%= link_to slide.label, edit_admin_carousel_carousel_slide_path(@carousel, slide) %>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>

data/app/views/admin/carousel/slides/new.html.erb

@@ -1,4 +1,5 @@
-%h1 New Slide
+<h1>New Slide</h1>
 
-= cms_form_for @slide, :url => {:action => :create} do |form|
-  = render :partial => 'form', :object => form
+<%= comfy_form_for @slide, :as => :slide, :url => {:action => :create} do |form| %>
+  <%= render :partial => form %>
+<% end %>

data/comfy_carousel.gemspec

@@ -0,0 +1,112 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "comfy_carousel"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Oleg Khabarov", "The Working Group Inc."]
+  s.date = "2012-02-07"
+  s.description = ""
+  s.email = "oleg@twg.ca"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "app/assets/javascripts/slides.jquery.js",
+    "app/assets/javascripts/slides.min.jquery.js",
+    "app/controllers/admin/carousel/base_controller.rb",
+    "app/controllers/admin/carousel/carousels_controller.rb",
+    "app/controllers/admin/carousel/slides_controller.rb",
+    "app/controllers/application_controller.rb",
+    "app/helpers/carousel/application_helper.rb",
+    "app/models/.gitkeep",
+    "app/models/carousel/carousel.rb",
+    "app/models/carousel/slide.rb",
+    "app/views/admin/carousel/_navigation.html.erb",
+    "app/views/admin/carousel/carousels/_form.html.erb",
+    "app/views/admin/carousel/carousels/edit.html.erb",
+    "app/views/admin/carousel/carousels/index.html.erb",
+    "app/views/admin/carousel/carousels/new.html.erb",
+    "app/views/admin/carousel/slides/_form.html.erb",
+    "app/views/admin/carousel/slides/edit.html.erb",
+    "app/views/admin/carousel/slides/index.html.erb",
+    "app/views/admin/carousel/slides/new.html.erb",
+    "app/views/layouts/application.html.erb",
+    "comfy_carousel.gemspec",
+    "config.ru",
+    "config/application.rb",
+    "config/boot.rb",
+    "config/database.yml",
+    "config/environment.rb",
+    "config/environments/development.rb",
+    "config/environments/test.rb",
+    "config/initializers/comfy_carousel.rb",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "db/migrate/01_create_comfy_carousel.rb",
+    "db/schema.rb",
+    "doc/README_FOR_APP",
+    "lib/comfy_carousel.rb",
+    "lib/comfy_carousel/configuration.rb",
+    "lib/comfy_carousel/engine.rb",
+    "lib/comfy_carousel/form_builder.rb",
+    "lib/generators/comfy/carousel/README",
+    "lib/generators/comfy/carousel/carousel_generator.rb",
+    "lib/tasks/.gitkeep",
+    "lib/tasks/comfy_carousel.rake",
+    "log/.gitkeep",
+    "script/rails",
+    "test/fixtures/.gitkeep",
+    "test/fixtures/carousel/carousels.yml",
+    "test/fixtures/carousel/slides.yml",
+    "test/fixtures/files/image.jpg",
+    "test/functional/.gitkeep",
+    "test/functional/admin/carousel/carousels_controller_test.rb",
+    "test/functional/admin/carousel/slides_controller_test.rb",
+    "test/integration/.gitkeep",
+    "test/performance/browsing_test.rb",
+    "test/test_helper.rb",
+    "test/unit/.gitkeep",
+    "test/unit/carousel_test.rb",
+    "test/unit/configuration_test.rb",
+    "test/unit/slide_test.rb",
+    "vendor/assets/javascripts/.gitkeep",
+    "vendor/assets/stylesheets/.gitkeep",
+    "vendor/plugins/.gitkeep"
+  ]
+  s.homepage = "http://github.com/comfy/comfy_carousel"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "ComfyCarousel is a carousel engine for Rails 3.1+ apps (and ComfortableMexicanSofa)"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<jquery-rails>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.0"])
+    else
+      s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
+      s.add_dependency(%q<paperclip>, [">= 2.3.0"])
+    end
+  else
+    s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
+    s.add_dependency(%q<paperclip>, [">= 2.3.0"])
+  end
+end
+