tb_events 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62d8730ede7b8aed8931aba4790a22f605310a55
-  data.tar.gz: e34410c623e5c079f2a73ddd171052c6e5457146
+SHA256:
+  metadata.gz: e19d7ca4e2a12520dec1b46836f3fb0a9fceaf973b028ee85a341ece8635a323
+  data.tar.gz: 1090bda847f92900155a812cc7c08221e764a2c74a315c85580fb49039f9a1fc
 SHA512:
-  metadata.gz: 640e250412a1ced8da27f58c0eb9961c2b5160b7cb2f18d37301b73afc55a4395b2113339aec6aee53b9c241fa2daafd7a08151bc8288f9d6d4b677164223ab6
-  data.tar.gz: 783ee6db9798f88395d683a3c74973cca1fee061d9e7be723a0eae63d5fc61f073c7c45259061e31bdf5561637bbd6bbe15a94a9c0548c337437aaf4ef3b66fd
+  metadata.gz: a8d6a3e1ae6c08e9cd03cbe2bff49431147a815b435d9e1156d2fdc5ba19f6e1f9bbc36aa619a2c3c879b08f54179acbeb367cd41897646204de217d28a9114b
+  data.tar.gz: 667fd01ecad3c3e55f5dcc75a05430158ea517fa5304a168dab3f7a6a66104fdb6ea851215d7338870ffb3a8a73c1dc983f967ca362fc014f45c3a072d49e457

data/README.md

@@ -24,7 +24,7 @@ Configruations
 
 * Set the layout for the calendar pages (Defualt is layouts/spud/calendar)
 
-        Spud::Events.configure do |config|
+        SpudEvents.configure do |config|
           config.calendar_layout = 'application'
         end
 
@@ -36,6 +36,18 @@ Configruations
         *= require spud/events
         */
 
+## View Helpers
+
+TB Events comes with a handful of view helpers for generating calendars. See the Rdoc documentation for detailed information.
+
+Return a calendar as an html table for the given date:
+
+    spud_calendar_for_date(date)
+
+Return a calendar for the given date, populated with event data:
+
+    spud_calendar_for_events(events, date, opts)
+
 Testing
 -----------------
 

data/Rakefile

@@ -20,9 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rake'
+require 'rake'

data/app/assets/javascripts/admin/events/application.js

@@ -0,0 +1,16 @@
+//= require_self
+//= require_directory
+
+(function(){
+
+spud.admin.events = {
+  init: function(){
+    $(document).on('ajax:success','.js-spud-calendar-delete-action', deletedCalendar);
+  }
+};
+
+var deletedCalendar = function(){
+  $(this).closest('.spud_events_admin_calendar_legend_item').fadeOut(500, function(){ $(this).remove(); });
+};
+
+})();

data/app/assets/stylesheets/admin/events/application.css

@@ -0,0 +1,4 @@
+/*
+*= require_self
+*= require_directory
+*/

data/app/assets/stylesheets/{spud → admin/events}/calendars.css

@@ -49,10 +49,8 @@
 
 #spud_events_admin_calendar,
 #spud_events_calendar {
-  width: 700px;
-  padding-bottom: 50px;
+  margin: 0 0 20px;
   position: relative;
-  float: left;
 }
 #spud_events_calendar {
   width: auto;
@@ -66,7 +64,7 @@
   margin: 15px 0 0;
 }
 #spud_events_admin_calendar th,
-#spud_events_calendar th {
+#spud_events_calendar th { 
   text-align: center;
 }
 #spud_events_admin_calendar td,
@@ -78,21 +76,33 @@
   vertical-align: top;
   width: 98px;
 }
-.spud_events_admin_calendar_date_container,
-.spud_events_calendar_date_container {
-  display: block;
-  padding: 18px 5px 0;
-  position: relative;
-}
-span.spud_events_admin_calendar_date,
-span.spud_events_calendar_date {
+.calendar-day{
   position: absolute;
   top: 3px;
-  right: 3px;
+  left: 3px;
   font-size: 11px;
   line-height: 11px;
 }
 
+.not-month .calendar-day {
+    display: none;
+}
+.not-month .calendar-events {
+    display: none;
+}
+
+.calendar-events-list{
+  list-style: none;
+  margin: 10px 0 0;
+  padding: 0;
+}
+.calendar-events-list li{
+  margin: 4px;
+}
+.calendar-events-list a{
+  text-decoration: none;
+}
+
 /*  Calendar Legend
 ----------------------- */
 #spud_events_admin_calendar_legend,
@@ -100,7 +110,6 @@ span.spud_events_calendar_date {
   list-style: none;
   border: 1px solid #d9d9d9;
   padding: 0;
-  margin: 45px 0 0 725px;
 }
 #spud_events_admin_calendar_legend li,
 #spud_events_calendar_legend li {
@@ -120,17 +129,3 @@ span.spud_events_calendar_date {
 #spud_events_calendar_legend li:last-child {
   border: none;
 }
-.spud_events_admin_calendar_actions,
-.spud_events_calendar_actions {
-  text-align: right;
-}
-
-#spud_events_admin_calendar_legend  span,
-#spud_events_calendar_legend  span {
-  display: inline-block;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  padding: 2px 8px;
-  margin: 8px 0 0 8px;
-}

data/app/controllers/admin/calendar_events_controller.rb

@@ -1,21 +1,20 @@
 class Admin::CalendarEventsController < Admin::ApplicationController
-
-  add_breadcrumb "Events", :admin_list_spud_calendar_events_path
-  belongs_to_spud_app :events
+  add_breadcrumb 'Events', :admin_list_spud_calendar_events_path
+  belongs_to_app :events
 
   respond_to :html, :xml, :json
-  respond_to :js, :only => [:index, ]
+  respond_to :js, only: [:index]
 
   def index
     if params[:month]
-      year = params[:year] ? params[:year] : Time.new.year
+      year = params[:year] ? params[:year].to_i : Date.today.year
       begin
-        @calendar_date = Time.local(year, params[:month])
+        @calendar_date = Date.new(year, params[:month].to_i)
       rescue
-        @calendar_date = Time.new
+        @calendar_date = Date.today
       end
     else
-      @calendar_date = Time.new
+      @calendar_date = Date.today
     end
 
     if params[:spud_calendar] && calendar = SpudCalendar.find_by_title(params[:spud_calendar].titleize)
@@ -28,7 +27,7 @@ class Admin::CalendarEventsController < Admin::ApplicationController
     @calendars = SpudCalendar.all
     @current_calendar = params[:spud_calendar] ? params[:spud_calendar] : 0
 
-    respond_with(@calendars, :include => :events)
+    respond_with(@calendars, include: :events)
   end
 
   def new
@@ -45,25 +44,24 @@ class Admin::CalendarEventsController < Admin::ApplicationController
   def create
     @calendar_event = SpudCalendarEvent.new(calendar_event_params)
     flash[:notice] = 'Calendar event was successfully created.' if @calendar_event.save
-    respond_with(@calendar_event, :location => admin_list_spud_calendar_events_path)
+    respond_with(@calendar_event, location: admin_list_spud_calendar_events_path)
   end
 
   def update
     @calendar_event = SpudCalendarEvent.find(params[:id])
     flash[:notice] = 'Calendar event was successfully updated.' if @calendar_event.update_attributes(calendar_event_params)
-    respond_with(@calendar_event, :location =>admin_list_spud_calendar_events_path)
+    respond_with(@calendar_event, location: admin_list_spud_calendar_events_path)
   end
 
   def destroy
     @calendar_event = SpudCalendarEvent.find(params[:id])
-    @calendar_event.destroy
-    respond_with(@calendar_event, :location => admin_list_spud_calendar_events_path)
+    flash[:notice] = 'Calendar event deleted successfully' if @calendar_event.destroy
+    respond_with(@calendar_event, location: admin_list_spud_calendar_events_path)
   end
 
-private
+  private
 
   def calendar_event_params
     params.require(:spud_calendar_event).permit(:title, :description, :start_at, :end_at, :all_day, :spud_calendar_id, :spud_calendar, :location, :address, :address_2, :city, :state, :zip)
   end
-
 end

data/app/controllers/admin/calendars_controller.rb

@@ -1,13 +1,12 @@
 class Admin::CalendarsController < Admin::ApplicationController
+  add_breadcrumb 'Events', :admin_list_spud_calendar_events_path
 
-  add_breadcrumb "Events", :admin_list_spud_calendar_events_path
-
-  belongs_to_spud_app :events
+  belongs_to_app :events
 
   respond_to :html, :xml, :json, :js
 
   def new
-    @page_name = "New Calendar"
+    @page_name = 'New Calendar'
     @calendar = SpudCalendar.new
     respond_with(@calendar)
   end
@@ -17,12 +16,12 @@ class Admin::CalendarsController < Admin::ApplicationController
     if @calendar.save
       redirect_to admin_list_spud_calendar_events_path
     else
-      render :action => "new"
+      render action: 'new'
     end
   end
 
   def edit
-    @page_name = "Edit Calendar"
+    @page_name = 'Edit Calendar'
     @calendar = SpudCalendar.find(params[:id])
     respond_with(@calendar)
   end
@@ -33,7 +32,7 @@ class Admin::CalendarsController < Admin::ApplicationController
       flash[:notice] = 'Calendar was successfully updated.'
       redirect_to admin_list_spud_calendar_events_path
     else
-      render :action => "edit"
+      render action: 'edit'
     end
   end
 
@@ -44,14 +43,13 @@ class Admin::CalendarsController < Admin::ApplicationController
     end
     @calendar.destroy
     respond_with(@calendar) do |format|
-      format.js { render(:nothing => true) }
+      format.js { render(nothing: true) }
     end
   end
 
-private
+  private
 
   def calendar_params
-    params.require(:spud_calendar).permit(:title, :color)
+    params.require(:spud_calendar).permit(:title)
   end
-
 end

data/app/controllers/calendar_events_controller.rb

@@ -1,8 +1,14 @@
 class CalendarEventsController < ApplicationController
-  
-  layout Spud::Events.config.calendar_layout
-  
-	def show
-		@event = SpudCalendarEvent.find(params[:id])
-	end
+  respond_to :html, :json
+  layout SpudEvents.config.calendar_layout
+
+  def index
+    @events = SpudCalendarEvent.ordered.paginate(per_page: 10, page: params[:page])
+    respond_with @events
+  end
+
+  def show
+    @event = SpudCalendarEvent.find(params[:id])
+    respond_with @event
+  end
 end

data/app/controllers/calendars_controller.rb

@@ -1,30 +1,30 @@
 class CalendarsController < ApplicationController
-
-  layout Spud::Events.config.calendar_layout
+  respond_to :html, :json
+  layout SpudEvents.config.calendar_layout
+  before_action :calendar_date
 
   def show
-    if params[:month]
-      year = params[:year] ? params[:year] : Time.new.year
-      begin
-        @calendar_date = Time.local(year, params[:month])
-      rescue
-        @calendar_date = default_date
-      end
-    else
-      @calendar_date = default_date
-    end
     if params[:calendar] && calendar = SpudCalendar.find_by_title(params[:calendar].titleize)
-      @events = calendar.spud_calendar_events.where(["start_at >= ?",@calendar_date]).order(:start_at).to_a
+      @events = calendar.spud_calendar_events.in_month_of(@calendar_date).order(:start_at).to_a
     else
-      @events = SpudCalendarEvent.where(["start_at >= ?",@calendar_date]).order(:start_at).to_a
+      @events = SpudCalendarEvent.in_month_of(@calendar_date).order(:start_at).to_a
     end
     @current_calendar = params[:calendar] ? params[:calendar] : 0
-    @page_title = @calendar_date.strftime("Calendar - %B %Y")
+    respond_with @events
   end
 
-  def default_date
-    tempDate = Time.new
-    return Time.local(tempDate.year,tempDate.month)
+  private
 
+  def calendar_date
+    if params[:month]
+      year = params[:year] ? params[:year].to_i : Date.today.year
+      begin
+        @calendar_date = Date.new(year, params[:month].to_i)
+      rescue
+        @calendar_date = Date.today
+      end
+    else
+      @calendar_date = Date.today
+    end
   end
 end

data/app/helpers/admin/calendars_helper.rb

@@ -1,15 +1,13 @@
 module Admin::CalendarsHelper
-
-  def link_to_previous_admin_calendar_month(date, url_for_options)
-    date = date.advance(:months => -1)
+  def link_to_previous_admin_calendar_month(date, _url_for_options = {})
+    date = date.advance(months: -1)
     calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('« Previous Month'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link previous_calendar btn').html_safe
+    link_to('« Previous Month'.html_safe, admin_list_spud_calendar_events_path(month: date.month, year: date.year, calendar: calendar), class: 'spud_events_calendar_link previous_calendar btn btn-sm btn-default').html_safe
   end
 
-  def link_to_next_admin_calendar_month(date, url_for_options)
-    date = date.advance(:months => 1)
+  def link_to_next_admin_calendar_month(date, _url_for_options = {})
+    date = date.advance(months: 1)
     calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('Next Month »'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link next_calendar btn').html_safe
+    link_to('Next Month »'.html_safe, admin_list_spud_calendar_events_path(month: date.month, year: date.year, calendar: calendar), class: 'spud_events_calendar_link next_calendar btn btn-sm btn-default pull-right').html_safe
   end
-
 end

data/app/helpers/calendars_helper.rb

@@ -1,48 +1,79 @@
 module CalendarsHelper
-
-  def link_to_previous_calendar_month(date, url_for_options)
-    date = date.advance(:months => -1)
-    calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('« Previous Month'.html_safe, calendar_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link previous_calendar btn').html_safe
+  # Builds a calendar for the given date
+  #
+  # * date: Determines the month to be displayed. Given date will have the "today" css class
+  # * opts:
+  #   - headers: Array of weekday headers (optional)
+  #
+  def spud_calendar_for_date(date, opts = {}, &block)
+    events = SpudCalendarEvent.in_month_of(date)
+    spud_calendar_for_events(events, date, opts, &block)
   end
 
-  def link_to_next_calendar_month(date, url_for_options)
-    date = date.advance(:months => 1)
-    calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('Next Month »'.html_safe, calendar_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link next_calendar btn').html_safe
-  end
-  
-  def build_calendar_for(objects, *args, &block)
-    raise ArgumentError, "Missing block" unless block_given?
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    html_options = options[:html]
-    builder = options[:builder] || Spud::Events::CalendarBuilder
-    content = with_output_buffer{block.call(builder.new(objects||[], self, options))}
-    self.content_tag(:table, content, html_options, false)
-  end
-
-  def get_calendar_options(text_for_all)
-    options_for_select(SpudCalendar.all.collect { |f| [f.title, f.title.gsub(/([^A-Z0-9]+)/i, "-").downcase] }.insert(0, text_for_all), @current_calendar)
+  # Builds a calendar for the given date and identifier
+  #
+  # * identifier: Symbol for the SpudCalendar you wish to display
+  # * date: Determines the month to be displayed. Given date will have the "today" css class
+  # * opts:
+  #   - headers: Array of weekday headers (optional)
+  #
+  def spud_calendar_for_identifier(identifier, date, opts = {}, &block)
+    calendar = SpudCalendar.with_identifier(identifier)
+    if calendar.present?
+      events = calendar.spud_calendar_events.in_month_of(date)
+    else
+      logger.warn "Failed to load calendar by identifer '#{identifier}'. Does it exist?"
+      events = []
+    end
+    spud_calendar_for_events(events, date, opts, &block)
   end
 
-  def calendar_fore_color(backcolor)
-    fore_color = "ffffff"
-    if backcolor.length != 6
-      return fore_color
+  # Builds a calendar for the given date, with events
+  #
+  # * events: An array or relation of SpudCalendarEvent records
+  # * date: Determines the month to be displayed. Given date will have the "today" css class
+  # * opts:
+  #   - headers: Array of weekday headers (optional)
+  #
+  def spud_calendar_for_events(events, date, opts = {}, &block)
+    events_array = events.to_a
+    cache(['spud-calendar', date.to_s, events]) do
+      concat(
+        SpudEvents::CalendarBuilder.new(self, date, opts).table do |day|
+          events = extract_events_for_date(events_array, day)
+          if block
+            block.call(day, events)
+          else
+            concat content_tag(:span, day.day.to_s, class: 'calendar-day')
+            if events.length > 0
+              list_items = events.collect do |event|
+                '<li>' + link_to(event.title, calendar_event_path(event)) + '</li>'
+              end.join('')
+              concat content_tag(:ul, raw(list_items), class: 'events-list')
+            end
+          end
+        end
+      )
     end
+  end
 
-    red = backcolor[0,2].hex
-    green = backcolor[2,2].hex
-    blue = backcolor[4,2].hex
+  def link_to_previous_calendar_month(date)
+    date = date.advance(months: -1)
+    calendar = params[:calendar] ? params[:calendar] : nil
+    link_to('&laquo; Previous Month'.html_safe, calendar_path(month: date.month, year: date.year, calendar: calendar), class: 'spud_events_calendar_link previous_calendar btn').html_safe
+  end
 
-    perceived_brightness = Math.sqrt(red*red*0.241 + green*green*0.691 + blue*blue*0.068)
+  def link_to_next_calendar_month(date)
+    date = date.advance(months: 1)
+    calendar = params[:calendar] ? params[:calendar] : nil
+    link_to('Next Month &raquo;'.html_safe, calendar_path(month: date.month, year: date.year, calendar: calendar), class: 'spud_events_calendar_link next_calendar btn').html_safe
+  end
 
+  private
 
-    # average = (red+green+blue) / 3
-    if(perceived_brightness >= 130)
-      return "000000"
-    else
-      return fore_color
+  def extract_events_for_date(events, date)
+    events.select do |event|
+      date >= event.start_date && date <= event.end_date
     end
   end
 end