tb_events 1.2.0.beta1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce1daf8729504d0663c17b5eea3fe706f86965da
-  data.tar.gz: fa913c71926dacde2922cb5d538d64599968c512
+SHA256:
+  metadata.gz: d8495699ef036385ff906c76c7d34b616b024c3c167f4e543d929d8cc15c95bf
+  data.tar.gz: c384b0864d671436b70da6aedd9877657f95d588227958fcb73569771ac3fa21
 SHA512:
-  metadata.gz: c2f3c7f6768a50f6a29150c72cdbc13644c31c9d91dd8a4a18fecc4cef78c3ef90f251c7210ec08ea858d8490315438b5c8d8d3a1e7ad2798c73c40c4d983a61
-  data.tar.gz: 1a9e8432f194112a8051958f4d5a6710774f46de4ad04c42ffb729ab443a4ccc143a5a38d4792f39409813b736044cacb783da08864e1964c156c2866b2f4eb0
+  metadata.gz: 9473623e16c4e10a2184574bf4c5fc9b5e6bc5bf2c18f725dce12dc6696b97a85761b223446ad2b341be0095cc1f04fb99e005da86bddb1a7b1781fb2cb23a7b
+  data.tar.gz: 441459722f410fc0aff5508b49345c359953ad722a3dabdc75f34799b8afaa7cecc6064dacc6335284dda39c4f4d5312084e4c8c7e5718a25b64ff75f02e6888

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/stylesheets/admin/events/calendars.css

@@ -64,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,
@@ -83,9 +83,18 @@
   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: 20px 0 0;
+  margin: 10px 0 0;
+  padding: 0;
 }
 .calendar-events-list li{
   margin: 4px;

data/app/controllers/admin/calendar_events_controller.rb

@@ -1,10 +1,9 @@
 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]
@@ -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)
   end
-
 end

data/app/controllers/calendar_events_controller.rb

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

data/app/controllers/calendars_controller.rb

@@ -1,8 +1,7 @@
 class CalendarsController < ApplicationController
-
   respond_to :html, :json
   layout SpudEvents.config.calendar_layout
-  before_action :get_calendar_date
+  before_action :calendar_date
 
   def show
     if params[:calendar] && calendar = SpudCalendar.find_by_title(params[:calendar].titleize)
@@ -14,9 +13,9 @@ class CalendarsController < ApplicationController
     respond_with @events
   end
 
-private
+  private
 
-  def get_calendar_date
+  def calendar_date
     if params[:month]
       year = params[:year] ? params[:year].to_i : Date.today.year
       begin
@@ -28,5 +27,4 @@ private
       @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 btn-sm btn-default').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 btn-sm btn-default pull-right').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,12 +1,11 @@
 module CalendarsHelper
-
   # 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)
+  def spud_calendar_for_date(date, opts = {}, &block)
     events = SpudCalendarEvent.in_month_of(date)
     spud_calendar_for_events(events, date, opts, &block)
   end
@@ -18,7 +17,7 @@ module CalendarsHelper
   # * opts:
   #   - headers: Array of weekday headers (optional)
   #
-  def spud_calendar_for_identifier(identifier, date, opts={}, &block)
+  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)
@@ -36,21 +35,21 @@ module CalendarsHelper
   # * opts:
   #   - headers: Array of weekday headers (optional)
   #
-  def spud_calendar_for_events(events, date, opts={}, &block)
-    events_grouped = events.group_by(&:start_date)
+  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 = events_grouped[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')
+            concat content_tag(:span, day.day.to_s, class: 'calendar-day')
             if events.length > 0
-              list_items = events.collect{ |event|
+              list_items = events.collect do |event|
                 '<li>' + link_to(event.title, calendar_event_path(event)) + '</li>'
-              }.join('')
-              concat content_tag(:ul, raw(list_items), :class => 'events-list')
+              end.join('')
+              concat content_tag(:ul, raw(list_items), class: 'events-list')
             end
           end
         end
@@ -59,15 +58,22 @@ module CalendarsHelper
   end
 
   def link_to_previous_calendar_month(date)
-    date = date.advance(:months => -1)
+    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
+    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
 
   def link_to_next_calendar_month(date)
-    date = date.advance(:months => 1)
+    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
+    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
+
+  def extract_events_for_date(events, date)
+    events.select do |event|
+      date >= event.start_date && date <= event.end_date
+    end
+  end
 end

data/app/models/spud_calendar.rb

@@ -1,34 +1,32 @@
 class SpudCalendar < ActiveRecord::Base
-  has_many :spud_calendar_events, :dependent => :destroy
+  has_many :spud_calendar_events, dependent: :destroy
   validates_presence_of :title
-  validates :identifier, :presence => true, :uniqueness => true
+  validates :identifier, presence: true, uniqueness: true
 
   before_validation :set_identifier
 
   def self.with_identifier(identifier)
-    where(:identifier => identifier).first
+    where(identifier: identifier).first
   end
 
   def color
-    modulo = (self.id-1) % COLORS.length
-    return COLORS[modulo]
+    modulo = (id - 1) % COLORS.length
+    COLORS[modulo]
   end
 
-  COLORS = [
-    '4D854B',
-    'f89406',
-    'b94a48',
-    '3a87ad',
-    '999999',
-    '333333'
-  ]
+  COLORS = %w(
+    4D854B
+    f89406
+    b94a48
+    3a87ad
+    999999
+    333333)
 
-private
+  private
 
   def set_identifier
     if identifier.nil? && title.present?
       self.identifier = title.parameterize.underscore
     end
   end
-
 end

data/app/models/spud_calendar_event.rb

@@ -1,3 +1,2 @@
-class SpudCalendarEvent < Spud::SpudCalendarEventModel
-
+class SpudCalendarEvent < SpudEvents::CalendarEventModel
 end

data/app/models/spud_events/calendar_event_model.rb

@@ -0,0 +1,31 @@
+class SpudEvents::CalendarEventModel < ActiveRecord::Base
+  self.table_name = 'spud_calendar_events'
+
+  belongs_to :spud_calendar
+  validates_presence_of :title, :start_at, :end_at, :spud_calendar_id
+
+  scope :ordered, -> { order('start_at desc') }
+  scope :in_month_of, lambda { |date|
+    where('start_at BETWEEN ? AND ? OR end_at BETWEEN ? AND ?', date.beginning_of_month, date.end_of_month, date.beginning_of_month, date.end_of_month).order('start_at asc')
+    # where(:start_at => date.beginning_of_month...date.end_of_month)
+  }
+  scope :upcoming, ->(limit = false) { where('start_at >= ?', Date.today).order('start_at asc').limit(limit) }
+
+  def start_date
+    start_at.to_date
+  end
+
+  def end_date
+    end_at.to_date
+  end
+
+  def days_span
+    (end_at.to_date - start_at.to_date).to_i + 1
+  end
+
+  def falls_on?(day)
+    start_date = start_at.beginning_of_day.to_date
+    end_date = end_at.end_of_day.to_date
+    day >= start_date && day <= end_date
+  end
+end

data/app/views/admin/calendar_events/_form.html.erb

@@ -4,8 +4,8 @@
   <%= f.tb_select :spud_calendar_id, options_from_collection_for_select(SpudCalendar.all, :id, :title, @calendar_event.spud_calendar_id) %>
 
   <%= f.tb_text_field :title %>
-  <%= f.tb_text_area :description %>
-
+  <%= f.tb_text_area :description, :style => "width:100%;", :class => 'tinymce full-width' %>
+  
   <%= f.tb_datetime_select :start_at, :ampm => true, :minute_step => 5 %>
   <%= f.tb_datetime_select :end_at, :ampm => true, :minute_step => 5 %>
 
@@ -16,6 +16,6 @@
   <%= f.tb_text_field :state %>
   <%= f.tb_text_field :zip %>
 
-  <%= f.tb_save_buttons 'Event', admin_list_spud_calendar_events_path %>
+  <%= f.tb_save_buttons 'Event', admin_list_spud_calendar_events_path, @calendar_event.id ? admin_calendar_event_path(@calendar_event) : nil %>
 
-<% end %>
+<% end %>

data/config/routes.rb

@@ -1,13 +1,11 @@
 Rails.application.routes.draw do
-
   # Calendar
-  get 'calendar(/:month/:year)' => "calendars#show", :as => :calendar
-  resources :calendar_events, :only => [:index, :show], :path => '/events'
-
-	namespace :admin do
-    resources :calendar_events, :except => [:index]
-    resources :calendars, :except => [:index]
-    get 'events(/:month(/:year(/:calendar)))' => "calendar_events#index", :as => "list_spud_calendar_events"
-	end
+  get 'calendar(/:month/:year)' => 'calendars#show', :as => :calendar
+  resources :calendar_events, only: [:index, :show], path: '/events'
 
+  namespace :admin do
+    resources :calendar_events, except: [:index]
+    resources :calendars, except: [:index]
+    get 'events(/:month(/:year(/:calendar)))' => 'calendar_events#index', :as => 'list_spud_calendar_events'
+  end
 end

data/db/migrate/20120216191833_create_spud_calendars.rb

@@ -3,10 +3,10 @@ class CreateSpudCalendars < ActiveRecord::Migration
     create_table :spud_calendars do |t|
       t.string :title
       t.column :color, 'binary(6)'
-      
+
       t.timestamps
     end
-    
+
     add_index :spud_calendars, :title
   end
 end

data/db/migrate/20140730182213_remove_color_from_spud_calendars.rb

@@ -2,6 +2,7 @@ class RemoveColorFromSpudCalendars < ActiveRecord::Migration
   def up
     remove_column :spud_calendars, :color
   end
+
   def down
     add_column :spud_calendars, :color, 'binary(6)'
   end

data/lib/spud_events/calendar_builder.rb

@@ -1,9 +1,8 @@
 class SpudEvents::CalendarBuilder
-
-  DEFAULT_HEADERS = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday]
+  DEFAULT_HEADERS = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
   START_DAY = :sunday
 
-  delegate :content_tag, :to => :view
+  delegate :content_tag, to: :view
   attr_accessor :view, :date, :callback
 
   def initialize(view, date, opts)
@@ -14,16 +13,16 @@ class SpudEvents::CalendarBuilder
 
   def table(&block)
     @callback = block
-    content_tag :table, :class => "calendar" do
+    content_tag :table, class: 'calendar' do
       header + week_rows
     end
   end
 
-private
+  private
 
   def header
     content_tag :tr do
-      @headers.map { |day| content_tag :th, day, :class => 'day-header' }.join.html_safe
+      @headers.map { |day| content_tag :th, day, class: 'day-header' }.join.html_safe
     end
   end
 
@@ -41,9 +40,9 @@ private
 
   def day_classes(day)
     classes = ['day-cell']
-    classes << "today" if day == Date.today
-    classes << "not-month" if day.month != date.month
-    classes.empty? ? nil : classes.join(" ")
+    classes << 'today' if day == Date.today
+    classes << 'not-month' if day.month != date.month
+    classes.empty? ? nil : classes.join(' ')
   end
 
   def weeks

data/lib/spud_events/engine.rb

@@ -2,18 +2,22 @@ require 'tb_core'
 
 module SpudEvents
   class Engine < Rails::Engine
-		engine_name :tb_events
+    engine_name :tb_events
     config.autoload_paths << "#{root}/lib"
 
-		initializer :admin do
-			Spud::Core.configure do |config|
-			  config.admin_applications += [{:name => "Events", :thumbnail => "spud/admin/events_thumb.png", :url => "/admin/events",:order => 10}]
-			end
-		end
+    initializer :admin do
+      TbCore.configure do |config|
+        config.admin_applications += [{ name: 'Events', thumbnail: 'spud/admin/events_thumb.png', url: '/admin/events', order: 10 }]
+      end
+    end
 
-		initializer :assets do |config|
-      Spud::Core.append_admin_stylesheets('admin/events/application')
-      Spud::Core.append_admin_javascripts('admin/events/application')
-		end
+    initializer :assets do |_config|
+      TbCore.append_admin_stylesheets('admin/events/application')
+      TbCore.append_admin_javascripts('admin/events/application')
+    end
+
+    initializer 'tb_events.assets' do
+      Rails.application.config.assets.precompile += ['spud/admin/events_thumb.png']
+    end
   end
 end

data/lib/spud_events/version.rb

@@ -1,3 +1,3 @@
 module SpudEvents
-  VERSION = "1.2.0.beta1"
+  VERSION = '1.3.0'
 end

data/lib/tb_events.rb

@@ -1,6 +1,6 @@
 module Spud
-	module Events
-		require 'spud_events/configuration'
-		require 'spud_events/engine' if defined?(Rails)
-	end
+  module Events
+    require 'spud_events/configuration'
+    require 'spud_events/engine' if defined?(Rails)
+  end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tb_events
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.3.0
 platform: ruby
 authors:
-- Westlake Design
-autorequire: 
+- Moser Consulting
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -52,107 +52,93 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
-description: 
+        version: '0'
+description:
 email:
-- greg@westlakedesign.com
+- greg.woods@moserit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -173,9 +159,9 @@ files:
 - app/helpers/admin/calendar_events_helper.rb
 - app/helpers/admin/calendars_helper.rb
 - app/helpers/calendars_helper.rb
-- app/models/spud/spud_calendar_event_model.rb
 - app/models/spud_calendar.rb
 - app/models/spud_calendar_event.rb
+- app/models/spud_events/calendar_event_model.rb
 - app/views/admin/calendar_events/_calendar.html.erb
 - app/views/admin/calendar_events/_form.html.erb
 - app/views/admin/calendar_events/edit.html.erb
@@ -200,10 +186,10 @@ files:
 - lib/spud_events/engine.rb
 - lib/spud_events/version.rb
 - lib/tb_events.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,13 +200,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Twice Baked Events engine
 test_files: []

data/app/models/spud/spud_calendar_event_model.rb

@@ -1,25 +0,0 @@
-class Spud::SpudCalendarEventModel < ActiveRecord::Base
-  self.table_name = 'spud_calendar_events'
-
-  belongs_to :spud_calendar
-  validates_presence_of :title, :start_at, :end_at, :spud_calendar_id
-
-  scope :ordered, ->{ order('start_at desc') }
-  scope :in_month_of, ->(date){ where(:start_at => date.beginning_of_month...date.end_of_month) }
-  scope :upcoming, ->(limit=false){ where('start_at >= ?', Date.today).order('start_at asc').limit(limit) }
-
-  def start_date
-    return start_at.to_date
-  end
-
-  def days_span
-    return (end_at.to_date - start_at.to_date).to_i + 1
-  end
-
-  def falls_on?(day)
-    start_date = start_at.beginning_of_day.to_date
-    end_date = end_at.end_of_day.to_date
-    return day >= start_date && day <= end_date
-  end
-
-end