simple_calendar 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85669f41ecd3dd528d09f115f81cfefd06cd4b30
-  data.tar.gz: f87d40f4648b321822b95a9a7dab9be787db0024
+  metadata.gz: 30f9a905897bec1f2aa6ca50db79a859af2e1620
+  data.tar.gz: 7f2e0f099aa7bdb9bb2630aaf28a3b8f5c58dcca
 SHA512:
-  metadata.gz: 6e124dcfe0427ffbfc7cf4f6fef1e1bff46c615f3efd6817242473b3fcc4058b1b656ca56ee246b96c8bd6f9acb21271fbd0be8404afedd91412e30138b3af05
-  data.tar.gz: 54c24e93b348ac200ebcd7d266a7f33ae590e7c44bbb6368ac2a4383f5fe37eda004daa66f2d2af37de6a2089d3c86f795290ac25b31d85545b9be654476390c
+  metadata.gz: f5665ddcfa19aca666994ec0dacbe3ad4fba3be565a5ace251fb104b829732e94c933d116d714664992fcb053e76a5edbb55d0389758bc88e677db0405e88675
+  data.tar.gz: 83b695471fc4da275e318c2575c608a7e458935ee991f67a8ad9c153637568455b413eb61fc1d7eb870070a4ca967c3ca372cdef151931dde28da10811b0ab30

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.2.2
   - 2.1.6
   - 2.0.0

data/app/views/simple_calendar/_calendar.html.erb

@@ -1,7 +1,7 @@
 <div class="simple-calendar">
-  <%= link_to "Previous", url_for(params.merge(start_date: date_range.first - 1.day)) %>
+  <%= link_to "Previous", calendar.url_for_previous_view %>
   <%= I18n.t("date.month_names")[start_date.month] %> <%= start_date.year %>
-  <%= link_to "Next", url_for(params.merge(start_date: date_range.last + 1.day)) %>
+  <%= link_to "Next", calendar.url_for_next_view %>
 
   <table class="table table-striped">
     <thead>

data/app/views/simple_calendar/_month_calendar.html.erb

@@ -1,7 +1,7 @@
 <div class="simple-calendar">
-  <%= link_to "Previous", url_for(params.merge(start_date: date_range.first - 1.day)) %>
+  <%= link_to "Previous", calendar.url_for_previous_view %>
   <%= I18n.t("date.month_names")[start_date.month] %> <%= start_date.year %>
-  <%= link_to "Next", url_for(params.merge(start_date: date_range.last + 1.day))  %>
+  <%= link_to "Next", calendar.url_for_next_view %>
 
   <table class="table table-striped">
     <thead>

data/app/views/simple_calendar/_week_calendar.html.erb

@@ -1,7 +1,7 @@
 <div class="simple-calendar">
-  <%= link_to "Previous", url_for(params.merge(start_date: date_range.first - 1.day)) %>
+  <%= link_to "Previous", calendar.url_for_previous_view %>
   Week <%= start_date.strftime("%U").to_i %>
-  <%= link_to "Next", url_for(params.merge(start_date: date_range.last + 1.day)) %>
+  <%= link_to "Next", calendar.url_for_next_view %>
 
   <table class="table table-striped">
     <thead>

data/lib/simple_calendar/calendar.rb

@@ -2,11 +2,17 @@ require 'rails'
 
 module SimpleCalendar
   class Calendar
+    PARAM_KEY_BLACKLIST = :authenticity_token, :commit, :utf8, :_method, :script_name
+
     attr_accessor :view_context, :options
 
     def initialize(view_context, opts={})
       @view_context = view_context
       @options = opts
+
+      @params = @view_context.params
+      @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
+      @params = @params.with_indifferent_access.except(*PARAM_KEY_BLACKLIST)
     end
 
     def render(&block)
@@ -39,6 +45,14 @@ module SimpleCalendar
       td_class
     end
 
+    def url_for_next_view
+      view_context.url_for(@params.merge(start_date: date_range.last + 1.day))
+    end
+
+    def url_for_previous_view
+      view_context.url_for(@params.merge(start_date: date_range.first - 1.day))
+    end
+
     private
 
       def partial_name
@@ -51,18 +65,9 @@ module SimpleCalendar
 
       def sorted_events
         events = options.fetch(:events, []).sort_by(&attribute)
-        sorted = {}
-
-        events.each do |event|
-          start_time = event.send(attribute)
-          if start_time.present?
-            date = start_time.to_date
-            sorted[date] ||= []
-            sorted[date] << event
-          end
-        end
 
-        sorted
+        scheduled = events.reject { |e| e.send(attribute).nil? }
+        scheduled.group_by { |e| e.send(attribute).to_date }
       end
 
       def start_date

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 end

data/spec/calendar_spec.rb

@@ -35,7 +35,28 @@ describe SimpleCalendar::Calendar do
   end
 
   describe "#sorted_events" do
-    it 'converts an array of events to a hash sorted by days'
+    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)
+      event2 = double(start_time: today.at_noon)
+      event3 = double(start_time: tomorrow.at_noon)
+
+      events = [event1, event2, event3].shuffle
+      calendar = SimpleCalendar::Calendar.new(nil, events: events)
+
+      sorted_events = calendar.send(:sorted_events)
+
+      expect(sorted_events[today]).to eq([event1, event2])
+      expect(sorted_events[tomorrow]).to eq([event3])
+    end
+
+    it 'handles events without a start time' do
+      event = double(start_time: nil)
+      calendar = SimpleCalendar::Calendar.new(nil, events: [event])
+
+      expect{calendar.send(:sorted_events)}.not_to raise_error
+    end
   end
 
   describe "#start_date" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_calendar
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Rails 3 and Rails 4 calendar