tb_events 1.0.2 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmMyNDc4N2IzN2I4NWVlYTlkNTM5ODM3NTQ0YTVkY2ZiZjFhYWE3NA==
-  data.tar.gz: !binary |-
-    NDgzMTViOGY5MjNkMGI1Zjg3ZDBjZDU4Y2M4ZjZiZWQwZTU5YzFkOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDAzOWU5ZDIwNDY1NDVkNWQ0ZDg2MzliYjA0Yjg0NzgxNWIxN2RiNDhlMzI5
-    Y2M2ODk2ODA4Yjg2ODg1OTk3OTc0ZTVjMjIyNTNkNWQ4MzQ1ZTY0YzhhZDNl
-    NmIxNzc4MTdmMTJjOTRlZjYyNzI3YmQ2N2Y3Njk1MzhjOGJjMWE=
-  data.tar.gz: !binary |-
-    MzdhZWI5Yzk2NWY3ZmUyOGU5ZjNjMjliMDk3NjlhZGM0ZTU0Njk2YzBlYTA2
-    NGU5ZWYzOTM2ODEzZGM5MGQwYWUxZjZkNjQ0ZTU3NWU3NzVkN2IzNTgwM2Q4
-    NTg1NGM1NTExNDlkY2ZkODUzYTk5OTE0ZGI5Njg0ZDA1ZDg2ZDE=
+SHA256:
+  metadata.gz: d8495699ef036385ff906c76c7d34b616b024c3c167f4e543d929d8cc15c95bf
+  data.tar.gz: c384b0864d671436b70da6aedd9877657f95d588227958fcb73569771ac3fa21
+SHA512:
+  metadata.gz: 9473623e16c4e10a2184574bf4c5fc9b5e6bc5bf2c18f725dce12dc6696b97a85761b223446ad2b341be0095cc1f04fb99e005da86bddb1a7b1781fb2cb23a7b
+  data.tar.gz: 441459722f410fc0aff5508b49345c359953ad722a3dabdc75f34799b8afaa7cecc6064dacc6335284dda39c4f4d5312084e4c8c7e5718a25b64ff75f02e6888

data/README.md

@@ -1,15 +1,15 @@
-Spud Events
+TB Events
 ===========
 
-Spud Events is an event and calendaring engine for the Spud Engine
+TB Events is an event and calendaring engine for Twice Baked.
 
 Installation/Usage
 ------------------
 
 1. Add the following to your Gemfile
 
-        gem 'spud_core'
-        gem 'spud_events', :git => "git://github.com/davydotcom/spud_events.git"
+        gem 'tb_core'
+        gem 'tb_events'
 
 2. Run ```bundle install```
 3. Copy the database migrations in to your rails project
@@ -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

@@ -0,0 +1,67 @@
+class Admin::CalendarEventsController < Admin::ApplicationController
+  add_breadcrumb 'Events', :admin_list_spud_calendar_events_path
+  belongs_to_app :events
+
+  respond_to :html, :xml, :json
+  respond_to :js, only: [:index]
+
+  def index
+    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
+
+    if params[:spud_calendar] && calendar = SpudCalendar.find_by_title(params[:spud_calendar].titleize)
+      @calendar_events = calendar.events
+    else
+      @calendar_events = SpudCalendarEvent
+    end
+    @calendar_events = @calendar_events.in_month_of(@calendar_date).order('spud_calendar_events.start_at ASC').to_a
+
+    @calendars = SpudCalendar.all
+    @current_calendar = params[:spud_calendar] ? params[:spud_calendar] : 0
+
+    respond_with(@calendars, include: :events)
+  end
+
+  def new
+    @calendar_event = SpudCalendarEvent.new
+    if params[:spud_calendar]
+      @calendar_event.spud_calendar_id = SpudCalendar.find_by_title(params[:spud_calendar].titleize).id
+    end
+  end
+
+  def edit
+    @calendar_event = SpudCalendarEvent.find(params[:id])
+  end
+
+  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)
+  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)
+  end
+
+  def destroy
+    @calendar_event = SpudCalendarEvent.find(params[:id])
+    flash[:notice] = 'Calendar event deleted successfully' if @calendar_event.destroy
+    respond_with(@calendar_event, location: admin_list_spud_calendar_events_path)
+  end
+
+  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/{spud/admin → admin}/calendars_controller.rb

@@ -1,40 +1,38 @@
-class Spud::Admin::CalendarsController < Spud::Admin::ApplicationController
+class Admin::CalendarsController < Admin::ApplicationController
+  add_breadcrumb 'Events', :admin_list_spud_calendar_events_path
 
-  layout 'spud/admin/detail'
-  add_breadcrumb "Events", :spud_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
 
   def create
-    @calendar = SpudCalendar.new(params[:spud_calendar])
+    @calendar = SpudCalendar.new(calendar_params)
     if @calendar.save
-      redirect_to spud_admin_list_spud_calendar_events_path
+      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
 
   def update
     @calendar = SpudCalendar.find(params[:id])
-    if @calendar.update_attributes(params[:spud_calendar])
+    if @calendar.update_attributes(calendar_params)
       flash[:notice] = 'Calendar was successfully updated.'
-      redirect_to spud_admin_list_spud_calendar_events_path
+      redirect_to admin_list_spud_calendar_events_path
     else
-      render :action => "edit"
+      render action: 'edit'
     end
   end
 
@@ -45,8 +43,13 @@ class Spud::Admin::CalendarsController < Spud::Admin::ApplicationController
     end
     @calendar.destroy
     respond_with(@calendar) do |format|
-      format.js { render(:nothing => true) }
+      format.js { render(nothing: true) }
     end
   end
 
+  private
+
+  def calendar_params
+    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 || 'spud/calendar'
-  
-	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 || 'spud/calendar'
+  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).all
+      @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).all
+      @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/calendar_events_helper.rb

@@ -0,0 +1,2 @@
+module Admin::CalendarEventsHelper
+end

data/app/helpers/admin/calendars_helper.rb

@@ -0,0 +1,13 @@
+module Admin::CalendarsHelper
+  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 btn-sm btn-default').html_safe
+  end
+
+  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 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