simple_calendar 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee54f122b99caa56554d7a2460d03ce4f908d601
-  data.tar.gz: ade58551f991b9c6d3509c40168dc759d55c52f5
+  metadata.gz: 8eae1b807d337ea3455ee73edfc5f72347d76f03
+  data.tar.gz: 31892462fa9549830caacf088c2bf5e29257e3be
 SHA512:
-  metadata.gz: b095272aa825af1b5f0e86f1dcba946a226bd259c12d0a010dee842c7cf9fbb62e132cfe36ec8eef7e15512e91768f42c84baafa6aa914dcdf407446049b9b9a
-  data.tar.gz: c489d8ed9b0d466880194c0e40153428b9639e5b084c5cfbfae585d9181979a52462485ed6e21a19e2f11928b4ab7c0634f3caf4784ce84a6030acd521b70244
+  metadata.gz: 6b1f60f31bc3f24e674bfabb1b29a4b8976fb9e0750b8cdb4a74ce443e6ebcce13903c25aa9591bfc9682895b534c077c66283af42f84f23f876ea9b05aeba2e
+  data.tar.gz: b5ee956d4ee2764ddee313684693f36fecaa5bf4120d98d69d7b4a6995845d3334bdc11ecb5d92478b3bb9afaffa7dc0c2f2a5a77bdd048dd52a66a1df59a898

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.2.2
-  - 2.1.6
-  - 2.0.0
+  - 2.3.1
+  - 2.2.5

data/README.md

@@ -20,8 +20,9 @@ Installation
 ------------
 
 Just add this into your Gemfile followed by a bundle install:
-
-    gem "simple_calendar", "~> 2.0"
+```ruby
+gem "simple_calendar", "~> 2.0"
+```
 
 Usage
 -----
@@ -68,6 +69,18 @@ You can generate calendars of any length by passing in the number of days you wa
 
 Setting `number_of_days` is optional and defaults to 4.
 
+### Custom Partial
+
+You can set a different partial name for calendars by passing the partial path.
+
+```erb
+<%= calendar partial: 'products/calendar' do |date| %>
+  <%= date %>
+<% 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
@@ -79,13 +92,18 @@ model called Meeting, but you can add this to any model or Ruby object.
 Here's an example model:
 
 ```bash
-rails g scaffold Meeting name start_time:datetime
+# single day events
+$ rails g scaffold Meeting name start_time:datetime
+
+# multi-day events
+$ rails g scaffold Meeting name start_time:datetime end_time:datetime
 ```
 
-By default it uses `start_time` as the attribute name.
+By default it uses `start_time` as the attribute name.  Optionally the `end_time`
+attribute can be used which enables multi-day event rendering.
 
-**If you'd like to use another attribute other than start_time, just
-pass it in as the `attribute` option**
+**If you'd like to use another attribute other than start_time or end_time, just
+pass it in as the `attribute` or `end_attribute` options respectively**
 
 ```erb
 <%= month_calendar(attribute: :starts_at) do |date| %>
@@ -96,7 +114,7 @@ pass it in as the `attribute` option**
 ```ruby
 class MyModel
     ## Other code related to your model lives here
-    
+
     def start_time
         self.my_related_model.start ##Where 'start' is a attribute of type 'Date' accessible through MyModel's relationship
     end
@@ -146,7 +164,7 @@ You can customize the layouts for each of the calendars by running the
 generators for simple_calendar:
 
 ```bash
-rails g simple_calendar:views
+$ rails g simple_calendar:views
 ```
 
 This will generate a folder in app/views called simple_calendar that you
@@ -210,9 +228,6 @@ your `app/assets/stylesheets/application.css` file:
 
 Setting classes on the table and elements are pretty easy.
 
-You can simply run the following command to install the calendar views
-and then add your own helpers to the table, rows, headers, and days.
-
 simple_calendar comes with a handful of useful classes for each day in
 the calendar that you can use:
 
@@ -292,14 +307,14 @@ it will correspond to the name of the template it will try to render.
 The main method you'll need to implement is the `date_range` so that
 your calendar can have a custom length.
 
-```
+```ruby
 class SimpleCalendar::BusinessWeekCalendar
   private
 
     def date_range
       beginning = start_date.beginning_of_week + 1.day
       ending    = start_date.end_of_week - 1.day
-      (beginning..ending)
+      (beginning..ending).to_a
     end
 end
 ```
@@ -338,7 +353,6 @@ With modifications as appropriate.
 
 ## TODO
 
-- Multi-day events
 - Rspec tests for Calendar
 - Rspec tests for MonthCalendar
 - Rspec tests for WeekCalendar

data/lib/simple_calendar/calendar.rb

@@ -56,18 +56,34 @@ module SimpleCalendar
     private
 
       def partial_name
-        self.class.name.underscore
+        @options[:partial] || self.class.name.underscore
       end
 
       def attribute
         options.fetch(:attribute, :start_time).to_sym
       end
 
+      def end_attribute
+        options.fetch(:end_attribute, :end_time).to_sym
+      end
+
       def sorted_events
         events = options.fetch(:events, []).sort_by(&attribute)
-
         scheduled = events.reject { |e| e.send(attribute).nil? }
-        scheduled.group_by { |e| e.send(attribute).to_date }
+        group_events_by_date(scheduled)
+      end
+
+      def group_events_by_date(events)
+        events_grouped_by_date = Hash.new {|h,k| h[k] = [] }
+
+        events.each do |event|
+          event_start_date = event.send(attribute).to_date
+          event_end_date = (event.respond_to?(end_attribute) && !event.respond_to?(end_attribute).nil?) ? event.send(end_attribute).to_date : event_start_date
+          (event_start_date..event_end_date).to_a.each do |enumerated_date|
+            events_grouped_by_date[enumerated_date] << event
+          end
+        end
+        events_grouped_by_date
       end
 
       def start_date
@@ -78,6 +94,10 @@ module SimpleCalendar
         end
       end
 
+      def end_date
+        date_range.last
+      end
+
       def date_range
         (start_date..(start_date + additional_days.days)).to_a
       end

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.1.5"
+  VERSION = "2.2.0"
 end

data/simple_calendar.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency 'rails', '>= 3.0'

data/spec/calendar_spec.rb

@@ -33,6 +33,16 @@ describe SimpleCalendar::Calendar 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')
+    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')
+    end
   end
 
   describe "#sorted_events" do
@@ -52,6 +62,22 @@ 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
+      today, tomorrow = Date.today, Date.tomorrow
+
+      event1 = double(start_time: today.at_midnight, end_time: tomorrow.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(ViewContext.new, events: events)
+
+      sorted_events = calendar.send(:sorted_events)
+
+      expect(sorted_events[today]).to eq([event1, event2])
+      expect(sorted_events[tomorrow]).to eq([event1, event3])
+    end
+
     it 'handles events without a start time' do
       event = double(start_time: nil)
       calendar = SimpleCalendar::Calendar.new(ViewContext.new, events: [event])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,9 +41,7 @@ dependencies:
 description: A simple Rails 3 and Rails 4 calendar
 email:
 - excid3@gmail.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: