simple_calendar 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f7a64081a152d2de429dcccfa3fc41f87cf8653
-  data.tar.gz: 750684fef64d82960c570d366190e6641c0c96ce
+  metadata.gz: 1111d9baa8fca2e69d5e1891e1df353a6725e703
+  data.tar.gz: acc48d21cb13b6596b2981161d8104a05e176b49
 SHA512:
-  metadata.gz: b0a9596ed759fb06e21f9f5ce0614e8d446533869f034873b0328ab111df54aa28d820b9a127ac30bbc4576503a1c833a4e18b08641b81335fe312f0b1b3811b
-  data.tar.gz: 60c46c14dc99e633a591e2a54062b3bb2c6c72dc1af6bafa2f172723234f9744407498e88b13faa98a716aa17be972957efd8ff554d72037c8574afcd167a6fa
+  metadata.gz: 6a9501ebb265c7721b7fea63d3dff1a979444800a2b82119696ada6fc4e43287889b522df95b859f6da6ef2fa5283901f1f7bad007c2c6a09084447c9e7bd4eb
+  data.tar.gz: 4bd2cd2f82f5ab03d12fdd363b672ab1918fded1fe6d82f70a28732977136cb2978f54a82ed1f6810d3325b7ec0bfa3f6693d1db2d76bc51393602bfaa899144

data/README.md

@@ -66,25 +66,25 @@ Setting `number_of_days` is optional and defaults to 4.
 
 ## Rendering Events
 
-What's a calendar without events in it? There are two simple steps for
-creating calendars with events.
+What's a calendar without events in it? There are two simple steps for creating
+calendars with events.
 
 The first step is to add the following to your model. We'll be using a
-model called Event, but you can add this to any model or Ruby object.
+model called Meeting, but you can add this to any model or Ruby object.
 
 Here's an example model:
 
 ```bash
-rails g scaffold Event name starts_at:datetime
+rails g scaffold Meeting name starts_at:datetime
 ```
 
 We use the `has_calendar` method to tell simple_calendar how to filter
-and sort the events on the different calendar days. This should be the
-start date/time of your event. By default it uses `starts_at` as the
+and sort the meetings on the different calendar days. This should be the
+start date/time of your meeting. By default it uses `starts_at` as the
 attribute name.
 
 ```ruby
-class Event < ActiveRecord::Base
+class Meeting < ActiveRecord::Base
   extend SimpleCalendar
   has_calendar
 
@@ -93,32 +93,32 @@ class Event < ActiveRecord::Base
 end
 ```
 
-In your controller, query for these events and store them in an instance
-variable. We'll just load up all the events for this example.
+In your controller, query for these meetings and store them in an instance
+variable. We'll just load up all the meetings for this example.
 
 ```ruby
 def index
-  @events = Event.all
+  @meetings = Meeting.all
 end
 ```
 
 Then in your view, you can pass in the `events` option to render. The
-events will automatically be filtered out by day for you.
+meetings will automatically be filtered out by day for you.
 
 ```erb
-<%= month_calendar events: @events do |date, events| %>
+<%= month_calendar events: @meetings do |date, meetings| %>
   <%= date %>
 
-  <% events.each do |event| %>
+  <% meetings.each do |meeting| %>
     <div>
-      <%= event.name %>
+      <%= meeting.name %>
     </div>
   <% end %>
 <% end %>
 ```
 
 If you pass in objects that don't respond to the attribute method (like
-starts_at), then all the events will be yielded each day. This lets you
+starts_at), then all the meetings will be yielded each day. This lets you
 do custom filtering however you want.
 
 ## Customizing The Calendar
@@ -151,6 +151,13 @@ class ApplicationController < ActionController::Base
     end
 end
 ```
+On the other hand, you can always pass a ``ActiveSupport::TimeZone`` object as an option to avoid possible timezone pollution:
+
+```erb
+<%= calendar timezone: ActiveSupport::TimeZone.new('Taipei') do |date, events| %>
+<% end %>
+```
+
 If you want to set the time zone globally, you can set the following in
 `config/application.rb`:
 

data/lib/simple_calendar/calendar.rb

@@ -7,6 +7,7 @@ module SimpleCalendar
     def initialize(view_context, opts={})
       @view_context = view_context
       @events       = opts.delete(:events) { [] }
+      @timezone     = opts.fetch(:timezone, Time.zone)
 
       opts.reverse_merge!(
         header: {class: "calendar-header"},
@@ -72,7 +73,7 @@ module SimpleCalendar
     def events_for_date(current_date)
       if events.any? && events.first.respond_to?(:simple_calendar_start_time)
         events.select do |e|
-          current_date == e.send(:simple_calendar_start_time).to_date
+          current_date == @timezone.utc_to_local(e.send(:simple_calendar_start_time)).to_date
         end.sort_by(&:simple_calendar_start_time)
       else
         events

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails