simple_calendar 2.2.7 → 2.4.3

data/lib/simple_calendar/month_calendar.rb

@@ -1,10 +1,7 @@
 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/railtie.rb

@@ -1,7 +1,9 @@
 module SimpleCalendar
   class Engine < Rails::Engine
     initializer "simple_calendar.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers
+      ActiveSupport.on_load(:action_view) do
+        include ViewHelpers
+      end
     end
   end
 end

data/lib/simple_calendar/version.rb

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

data/lib/simple_calendar/view_helpers.rb

@@ -1,17 +1,17 @@
 module SimpleCalendar
   module ViewHelpers
-    def calendar(options={}, &block)
-      raise 'calendar requires a block' unless block_given?
+    def calendar(options = {}, &block)
+      raise "calendar requires a block" unless block
       SimpleCalendar::Calendar.new(self, options).render(&block)
     end
 
-    def month_calendar(options={}, &block)
-      raise 'month_calendar requires a block' unless block_given?
+    def month_calendar(options = {}, &block)
+      raise "month_calendar requires a block" unless block
       SimpleCalendar::MonthCalendar.new(self, options).render(&block)
     end
 
-    def week_calendar(options={}, &block)
-      raise 'week_calendar requires a block' unless block_given?
+    def week_calendar(options = {}, &block)
+      raise "week_calendar requires a block" unless block
       SimpleCalendar::WeekCalendar.new(self, options).render(&block)
     end
   end

data/lib/simple_calendar/week_calendar.rb

@@ -1,7 +1,7 @@
 module SimpleCalendar
   class WeekCalendar < SimpleCalendar::Calendar
     def week_number
-      format = (Date.beginning_of_week == :sunday) ? "%U" : "%W"
+      format = Date.beginning_of_week == :sunday ? "%U" : "%V"
       start_date.beginning_of_week.strftime(format).to_i
     end
 
@@ -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/simple_calendar.gemspec

@@ -1,23 +1,22 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "simple_calendar/version"
 
 Gem::Specification.new do |s|
-  s.name        = "simple_calendar"
-  s.version     = SimpleCalendar::VERSION
-  s.authors     = ["Chris Oliver"]
-  s.email       = ["excid3@gmail.com"]
-  s.homepage    = "https://github.com/excid3/simple_calendar"
-  s.summary     = %q{A simple Rails calendar}
-  s.description = %q{A simple Rails calendar}
-  s.license     = "MIT"
+  s.name = "simple_calendar"
+  s.version = SimpleCalendar::VERSION
+  s.authors = ["Chris Oliver"]
+  s.email = ["excid3@gmail.com"]
+  s.homepage = "https://github.com/excid3/simple_calendar"
+  s.summary = "A simple Rails calendar"
+  s.description = "A simple Rails calendar"
+  s.license = "MIT"
 
   s.rubyforge_project = "simple_calendar"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3.0'
-  s.add_development_dependency 'rspec'
+  s.add_dependency "rails", ">= 3.0"
+  s.add_development_dependency "rspec"
 end

data/spec/calendar_spec.rb

@@ -1,53 +1,38 @@
-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 "spec_helper"
+require "action_controller"
+require "simple_calendar/calendar"
+require_relative "support/fake_event"
+require_relative "support/view_context"
 
 describe SimpleCalendar::Calendar do
   let(:calendar) { SimpleCalendar::Calendar.new(ViewContext.new) }
 
-  it 'renders a partial with the same name as the class' do
+  it "renders a partial with the same name as the class" do
     expect(calendar.send(:partial_name)).to eq("simple_calendar/calendar")
   end
 
-  context 'event sorting attribute' do
-    it 'has start_time as the default attribute' do
+  context "event sorting attribute" do
+    it "has start_time as the default attribute" do
       expect(calendar.send(:attribute)).to eq(:start_time)
     end
 
-    it 'allows you to override the default attribute' do
+    it "allows you to override the default attribute" do
       expect(SimpleCalendar::Calendar.new(ViewContext.new, attribute: :starts_at).send(:attribute)).to eq(:starts_at)
     end
 
     it "set a default when `partial` option isn't present" do
-      expect(SimpleCalendar::Calendar.new(ViewContext.new).send(:partial_name)).to eq('simple_calendar/calendar')
-      expect(SimpleCalendar::MonthCalendar.new(ViewContext.new).send(:partial_name)).to eq('simple_calendar/month_calendar')
-      expect(SimpleCalendar::WeekCalendar.new(ViewContext.new).send(:partial_name)).to eq('simple_calendar/week_calendar')
+      expect(SimpleCalendar::Calendar.new(ViewContext.new).send(:partial_name)).to eq("simple_calendar/calendar")
+      expect(SimpleCalendar::MonthCalendar.new(ViewContext.new).send(:partial_name)).to eq("simple_calendar/month_calendar")
+      expect(SimpleCalendar::WeekCalendar.new(ViewContext.new).send(:partial_name)).to eq("simple_calendar/week_calendar")
     end
 
-    it 'allows to override the default partial' do
-      expect(SimpleCalendar::Calendar.new(ViewContext.new, partial: 'simple_calendar/custom_calendar').send(:partial_name)).to eq('simple_calendar/custom_calendar')
+    it "allows to override the default partial" do
+      expect(SimpleCalendar::Calendar.new(ViewContext.new, partial: "simple_calendar/custom_calendar").send(:partial_name)).to eq("simple_calendar/custom_calendar")
     end
   end
 
   describe "#sorted_events" do
-    it 'converts an array of events to a hash sorted by days' do
+    it "converts an array of events to a hash sorted by days" do
       today, tomorrow = Date.today, Date.tomorrow
 
       event1 = double(start_time: today.at_midnight)
@@ -63,7 +48,7 @@ describe SimpleCalendar::Calendar do
       expect(sorted_events[tomorrow]).to eq([event3])
     end
 
-    it 'converts an array of multi-day events to a hash sorted by days' do
+    it "converts an array of multi-day events to a hash sorted by days" do
       today, tomorrow = Date.today, Date.tomorrow
 
       event1 = double(start_time: today.at_midnight, end_time: tomorrow.at_midnight)
@@ -79,17 +64,17 @@ describe SimpleCalendar::Calendar do
       expect(sorted_events[tomorrow]).to eq([event1, event3])
     end
 
-    it 'handles events without a start time' do
+    it "handles events without a start time" do
       event = double(start_time: nil)
       calendar = SimpleCalendar::Calendar.new(ViewContext.new, events: [event])
 
-      expect{calendar.send(:sorted_events)}.not_to raise_error
+      expect { calendar.send(:sorted_events) }.not_to raise_error
     end
   end
 
   describe "#start_date" do
     it "defaults to today's date" do
-      view_context = ViewContext.new()
+      view_context = ViewContext.new
       calendar = SimpleCalendar::Calendar.new(view_context)
       expect(calendar.send(:start_date)).to eq(Date.today)
     end
@@ -113,32 +98,79 @@ describe SimpleCalendar::Calendar do
     end
   end
 
-  describe 'current week class' do
-    it 'should have the current week' 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]
-      expect(calendar.send(:tr_classes_for, week)).to include('current-week')
+      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]
-      expect(calendar.send(:tr_classes_for, week)).to_not include('current-week')
+    it "should not have the current week if it does not contain today" do
+      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)
 
-  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'
+    calendar_start_date = calendar.render[:locals][:start_date]
 
-  it 'accepts an array of events'
-  it 'sorts the events'
-  it 'yields the events for each day'
+    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" 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 'simple_calendar/month_calendar'
+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/simple_calendar_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
-require 'rails'
-require 'simple_calendar'
+require "spec_helper"
+require "rails"
+require "simple_calendar"
 
 describe SimpleCalendar do
-  it 'has a version number' do
+  it "has a version number" do
     expect(SimpleCalendar::VERSION).not_to be nil
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "active_support/all"
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -40,57 +42,55 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # These two settings work together to allow you to limit a spec run
+  #   # to individual examples or groups you care about by tagging them with
+  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  #   # get run.
+  #   config.filter_run :focus
+  #   config.run_all_when_everything_filtered = true
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = 'doc'
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 end