refinerycms-sl-calendar 2.0.6.1 → 2.0.6.2

data/app/controllers/refinery/calendar/events_controller.rb

@@ -7,8 +7,8 @@ module Refinery
       def index
         d = Date.parse(params[:date]) rescue nil
         @events = d.nil? ?
-          Event.upcoming.order('refinery_calendar_events.from DESC') :
-          Event.on_day(d).order('refinery_calendar_events.from DESC')
+          Event.upcoming.order('refinery_calendar_events.starts_at DESC') :
+          Event.on_day(d).order('refinery_calendar_events.starts_at DESC')
 
         # you can use meta fields from your model instead (e.g. browser_title)
         # by swapping @page for @event in the line below:
@@ -24,7 +24,7 @@ module Refinery
       end
 
       def archive
-        @events = Event.archive.order('refinery_calendar_events.from DESC')
+        @events = Event.archive.order('refinery_calendar_events.starts_at DESC')
         render :template => 'refinery/calendar/events/index'
       end
 

data/app/models/refinery/calendar/event.rb

@@ -17,12 +17,24 @@ module Refinery
 
       attr_accessor :locale
 
+      alias_attribute :from, :starts_at
+      alias_attribute :to, :ends_at
+
       delegate :name, :address,
                 :to => :venue,
                 :prefix => true,
                 :allow_nil => true
 
-      scope :on_day, lambda {|day| where('(refinery_calendar_events.`from` = ?) OR (refinery_calendar_events.`to` = ?) OR (refinery_calendar_events.`from` < ? AND (refinery_calendar_events.`to` > ?))', day, day, day, day) }
+      scope :starting_on_day, lambda {|day| where(starts_at: day.beginning_of_day..day.tomorrow.beginning_of_day) }
+      scope :ending_on_day, lambda {|day| where(ends_at: day.beginning_of_day..day.tomorrow.beginning_of_day) }
+
+      scope :on_day, lambda {|day|
+        where(
+          arel_table[:starts_at].in(day.beginning_of_day..day.tomorrow.beginning_of_day).
+          or(arel_table[:ends_at].in(day.beginning_of_day..day.tomorrow.beginning_of_day)).
+          or( arel_table[:starts_at].lt(day.beginning_of_day).and(arel_table[:ends_at].gt(day.tomorrow.beginning_of_day)) )
+        )
+      }
 
       class Translation
         attr_accessible :locale
@@ -30,7 +42,7 @@ module Refinery
 
       class << self
         def upcoming
-          where('refinery_calendar_events.from >= ?', Time.now).with_globalize
+          where('refinery_calendar_events.starts_at >= ?', Time.now).with_globalize
         end
 
         def featured
@@ -38,7 +50,7 @@ module Refinery
         end
 
         def archive
-          where('refinery_calendar_events.from < ?', Time.now).with_globalize
+          where('refinery_calendar_events.starts_at < ?', Time.now).with_globalize
         end
 
         # Wrap up the logic of finding the events based on the translations table.

data/app/views/refinery/calendar/events/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <section id="events">
     <%= render @events %>
   </section>

data/db/migrate/5_change_from_to_attributes_in_events.rb

@@ -0,0 +1,25 @@
+class ChangeFromToAttributesInEvents < ActiveRecord::Migration
+  def up
+
+    add_column :refinery_calendar_events, :starts_at, :datetime
+    add_column :refinery_calendar_events, :ends_at, :datetime
+
+    Refinery::Calendar::Event.update_all '"starts_at" = "from", "ends_at" = "to"'
+
+    remove_column :refinery_calendar_events, :from, :datetime
+    remove_column :refinery_calendar_events, :to, :datetime
+
+  end
+
+  def down
+
+    add_column :refinery_calendar_events, :starts_at, :datetime
+    add_column :refinery_calendar_events, :ends_at, :datetime
+
+    Refinery::Calendar::Event.update_all '"starts_at" = "from", "ends_at" = "to"'
+
+    remove_column :refinery_calendar_events, :from, :datetime
+    remove_column :refinery_calendar_events, :to, :datetime
+
+  end
+end

data/readme.md

@@ -1,5 +1,7 @@
 # Calendar extension for Refinery CMS.
 
+[![Build Status](https://secure.travis-ci.org/simplelogica/refinerycms-calendar.png)](http://travis-ci.org/simplelogica/refinerycms-calendar)
+
 This is a calendar gem for refinery forked from (https://github.com/refinery/refinerycms-calendar) with some additional features such as:
 
   * I18n support in models using Globalize3
@@ -9,7 +11,7 @@ This is a calendar gem for refinery forked from (https://github.com/refinery/ref
 
 ```ruby
 # in Gemfile:
-gem 'refinerycms-sl-calendar', '2.0.6'
+gem 'refinerycms-sl-calendar', '~> 2.0.6.2'
 ```
 
 ```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-sl-calendar
 version: !ruby/object:Gem::Version
-  version: 2.0.6.1
+  version: 2.0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -98,6 +98,7 @@ files:
 - config/database.yml.sqlite3
 - db/seeds.rb
 - db/migrate/4_create_calendar_venues_translations.rb
+- db/migrate/5_change_from_to_attributes_in_events.rb
 - db/migrate/1_create_calendar_events.rb
 - db/migrate/3_create_calendar_events_translations.rb
 - db/migrate/2_create_calendar_venues.rb