simple_calendar 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7f4f3e0cb295f0632eee3bac373fecfabfa70643
-  data.tar.gz: 013c371f81fe1487985b52dd3f33d9eadafa493f
+SHA256:
+  metadata.gz: 498acc5a1c5fac24d47d7cdb9d3da21744bfa262d593dd2c1ea38fd15285d35e
+  data.tar.gz: '0689bdad34c54a9e5aad30c200d22cc3502326431db2a4525eb944e15d6436ba'
 SHA512:
-  metadata.gz: 98ffbd3a7116c88b0e4d3d474f473c338378e8e7b4567f0a7c0bc2bd4dc9fc34479b68035c6b0f8234f956df911b8e8b52ff68cb425531562a61cad07c7698b9
-  data.tar.gz: 2a9ee6d963304596ae166bf2413a7bc352a81f0bccd65ba05599119f5ff2726842a3b1bf59104a9670f8270eb2f425473c2a3efd2a4f421783c9945f63aeae28
+  metadata.gz: 65ad74303562bb5f3126732963dd8776871463234ef3ae3c53a309e0462d24d393e5cc40ad9ec2eee57996d7456f2c9440237753e4fad13c5b98d49da4799539
+  data.tar.gz: a46c0c61bacb99afd4e3265a0eaf165c408fda9b005954221732408e7250124d60e9dd04649a3705893df89cbe5aee1077f58324c02f742c242c36fd1d20447a

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8

data/README.md

@@ -24,6 +24,16 @@ Just add this into your Gemfile followed by a bundle install:
 gem "simple_calendar", "~> 2.0"
 ```
 
+If you're using Bootstrap, the calendar should already have a border and
+nice spacing for days.
+
+Optionally, you can include the default stylesheet for the calendar in
+your `app/assets/stylesheets/application.css` file:
+
+```scss
+*= require simple_calendar
+```
+
 Usage
 -----
 
@@ -92,8 +102,6 @@ You can set a different partial name for calendars by passing the partial path.
 <% end %>
 ```
 
-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
@@ -197,7 +205,7 @@ edit to your heart's desire.
 Setting `Time.zone` will make sure the calendar start days are correctly computed
 in the right timezone. You can set this globally in your `application.rb` file or
 if you have a User model with a time_zone attribute, you can set it on every request by using
-a before_filter like the following example.
+a before_action like the following example.
 
 This code example uses [Devise](https://github.com/plataformatec/devise)'s
 `current_user` and `user_signed_in?` methods to retrieve the user's timezone and set it for the duration of the request.
@@ -206,7 +214,7 @@ using some other method of authentication.
 
 ```ruby
 class ApplicationController < ActionController::Base
-  before_filter :set_time_zone, if: :user_signed_in?
+  before_action :set_time_zone, if: :user_signed_in?
 
   private
 
@@ -226,7 +234,7 @@ config.time_zone = 'Central Time (US & Canada)'
 ### Beginning Of Week
 
 You can also change the beginning day of the week by setting
-`Date.beginning_of_week` in a `before_filter` just like in the previous
+`Date.beginning_of_week` in a `before_action` just like in the previous
 example. If you want to set this globally, you can put this line in
 `config/application.rb`:
 
@@ -234,18 +242,6 @@ example. If you want to set this globally, you can put this line in
 config.beginning_of_week = :sunday
 ```
 
-### Default Stylesheet
-
-If you're using Bootstrap, the calendar should already have a border and
-nice spacing for days.
-
-Optionally, you can include the default stylesheet for the calendar in
-your `app/assets/stylesheets/application.css` file:
-
-```scss
-*= require simple_calendar
-```
-
 ### Custom CSS Classes
 
 Setting classes on the table and elements are pretty easy.

data/lib/simple_calendar/calendar.rb

@@ -65,6 +65,10 @@ module SimpleCalendar
       view_context.url_for(@params.merge(start_date_param => date_range.first - 1.day))
     end
 
+    def date_range
+      (start_date..(start_date + additional_days.days)).to_a
+    end
+
     private
 
       def partial_name
@@ -116,10 +120,6 @@ module SimpleCalendar
         date_range.last
       end
 
-      def date_range
-        (start_date..(start_date + additional_days.days)).to_a
-      end
-
       def additional_days
         options.fetch(:number_of_days, 4) - 1
       end

data/lib/simple_calendar/month_calendar.rb

@@ -1,10 +1,8 @@
 module SimpleCalendar
   class MonthCalendar < SimpleCalendar::Calendar
-    private
-
-      def date_range
-        (start_date.beginning_of_month.beginning_of_week..start_date.end_of_month.end_of_week).to_a
-      end
+    def date_range
+      (start_date.beginning_of_month.beginning_of_week..start_date.end_of_month.end_of_week).to_a
+    end
   end
 end
 

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.2.7"
+  VERSION = "2.3.0"
 end

data/lib/simple_calendar/week_calendar.rb

@@ -13,13 +13,11 @@ module SimpleCalendar
       week_number + number_of_weeks - 1
     end
 
-    private
+    def date_range
+      starting = start_date.beginning_of_week
+      ending = (starting + (number_of_weeks - 1).weeks).end_of_week
 
-      def date_range
-        starting = start_date.beginning_of_week
-        ending = (starting + (number_of_weeks - 1).weeks).end_of_week
-
-        (starting..ending).to_a
-      end
+      (starting..ending).to_a
+    end
   end
 end

data/spec/calendar_spec.rb

@@ -1,23 +1,8 @@
 require 'spec_helper'
 require 'action_controller'
 require 'simple_calendar/calendar'
-
-class ViewContext
-  attr_accessor :start_date, :start_date_param
-
-  def initialize(start_date=nil, options={})
-    @start_date = start_date
-    @start_date_param = options.fetch(:start_date_param, :start_date)
-  end
-
-  def params
-    if @start_date.present?
-      ActionController::Parameters.new({start_date_param => @start_date})
-    else
-      ActionController::Parameters.new
-    end
-  end
-end
+require_relative 'support/fake_event'
+require_relative 'support/view_context'
 
 describe SimpleCalendar::Calendar do
   let(:calendar) { SimpleCalendar::Calendar.new(ViewContext.new) }
@@ -116,29 +101,76 @@ describe SimpleCalendar::Calendar do
   describe 'current week class' do
     it 'should have the current week' do
       calendar = SimpleCalendar::Calendar.new(ViewContext.new)
-      week = calendar.send(:date_range).each_slice(7).to_a[0]
+      week = calendar.date_range.each_slice(7).to_a[0]
       expect(calendar.send(:tr_classes_for, week)).to include('current-week')
     end
 
     it 'should not have the current week if it does not contain today' do
-      calendar = SimpleCalendar::MonthCalendar.new(ViewContext.new)
-      week = calendar.send(:date_range).each_slice(7).to_a[0]
+      calendar = SimpleCalendar::MonthCalendar.new(ViewContext.new(6.months.ago))
+      week = calendar.date_range.each_slice(7).to_a[0]
       expect(calendar.send(:tr_classes_for, week)).to_not include('current-week')
     end
   end
 
-  it 'has a param that determines the start date of the calendar'
-  it 'generates a default date if no start date is present'
-  it 'has a range of dates'
+  it 'has a param that determines the start date of the calendar' do
+    calendar = SimpleCalendar::Calendar.new(ViewContext.new)
+
+    rendering_variables = calendar.render[:locals]
+
+    expect(rendering_variables[:start_date]).not_to be_nil
+  end
+
+  it 'generates a default date if no start date is present' do
+    calendar = SimpleCalendar::Calendar.new(ViewContext.new)
+
+    calendar_start_date = calendar.render[:locals][:start_date]
+
+    expect(calendar_start_date).not_to be_nil
+    expect(calendar_start_date).to be_a(Date)
+  end
+
+  it 'has a range of dates' do
+    calendar = SimpleCalendar::Calendar.new(ViewContext.new)
+
+    calendar_date_range = calendar.date_range
+
+    expect(calendar_date_range).to be_an(Array)
+    expect(calendar_date_range).to all(be_an(Date))
+  end
 
   it 'can split the range of dates into weeks'
   it 'has a title'
   it 'has a next view link'
   it 'has a previous view link'
 
-  it 'accepts an array of events'
-  it 'sorts the events'
-  it 'yields the events for each day'
+  it 'accepts an array of events' do
+    first_event = FakeEvent.new('event1', Date.today)
+    second_event = FakeEvent.new('event2', Date.today + 1.day)
+    events = [first_event, second_event]
+    calendar = SimpleCalendar::Calendar.new(ViewContext.new, events: events)
 
+    calendar_sorted_events = calendar.render[:locals][:sorted_events]
+
+    expect(calendar_sorted_events.length).to eq(2)
+  end
+
+  it 'sorts the events' do
+    first_event = FakeEvent.new('event1', Date.today + 2.days)
+    second_event = FakeEvent.new('event2', Date.today + 1.day)
+    third_event = FakeEvent.new('event3', Date.today)
+    events = [first_event, third_event, second_event]
+    calendar = SimpleCalendar::Calendar.new(ViewContext.new, events: events)
+
+    calendar_sorted_events = calendar.render[:locals][:sorted_events]
+    first_key = calendar_sorted_events.keys[0]
+    second_key = calendar_sorted_events.keys[1]
+    third_key = calendar_sorted_events.keys[2]
+
+    expect(calendar_sorted_events[first_key][0]).to eq(third_event)
+    expect(calendar_sorted_events[second_key][0]).to eq(second_event)
+    expect(calendar_sorted_events[third_key][0]).to eq(first_event)
+  end
+
+  it 'yields the events for each day'
   it "doesn't crash when an event has a nil start_time"
 end

data/spec/calendars/month_calendar_spec.rb

@@ -1,7 +1,25 @@
 require 'spec_helper'
+require 'action_controller'
+require 'simple_calendar/calendar'
 require 'simple_calendar/month_calendar'
+require 'support/view_context'
 
 describe SimpleCalendar::MonthCalendar do
-  it 'renders a full calendar month'
-  it 'render the days of next and previous months on the edges of the calendar'
+  describe '#date_range' do
+    it 'renders a full calendar month' do
+      today = Date.today
+      calendar = SimpleCalendar::MonthCalendar.new(ViewContext.new, start_date: Date.today)
+
+      expect(calendar.date_range.min).to be < today.beginning_of_month
+      expect(calendar.date_range.max).to be > today.end_of_month
+    end
+
+    it 'render the days of next and previous months on the edges of the calendar' do
+      month = Date.new(2018, 8, 1)
+      calendar = SimpleCalendar::MonthCalendar.new(ViewContext.new, start_date: month)
+
+      expect(calendar.date_range.first).to eq Date.new(2018, 7, 30)
+      expect(calendar.date_range.last).to eq Date.new(2018, 9, 2)
+    end
+  end
 end

data/spec/support/fake_event.rb

@@ -0,0 +1,9 @@
+class FakeEvent
+  attr_accessor :name, :start_time, :end_time
+
+  def initialize(name='event', start_time=nil, end_time=nil)
+    @name       = name
+    @start_time = start_time
+    @end_time   = end_time
+  end
+end

data/spec/support/view_context.rb

@@ -0,0 +1,20 @@
+class ViewContext
+  attr_accessor :start_date, :start_date_param
+
+  def initialize(start_date=nil, options={})
+    @start_date = start_date
+    @start_date_param = options.fetch(:start_date_param, :start_date)
+  end
+
+  def params
+    if @start_date.present?
+      ActionController::Parameters.new({start_date_param => @start_date})
+    else
+      ActionController::Parameters.new
+    end
+  end
+
+  def render(options = {})
+    options
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,8 @@ files:
 - spec/calendars/month_calendar_spec.rb
 - spec/simple_calendar_spec.rb
 - spec/spec_helper.rb
+- spec/support/fake_event.rb
+- spec/support/view_context.rb
 - spec/views_generators_spec.rb
 homepage: https://github.com/excid3/simple_calendar
 licenses:
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_calendar
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A simple Rails calendar
@@ -101,4 +103,6 @@ test_files:
 - spec/calendars/month_calendar_spec.rb
 - spec/simple_calendar_spec.rb
 - spec/spec_helper.rb
+- spec/support/fake_event.rb
+- spec/support/view_context.rb
 - spec/views_generators_spec.rb