simple_calendar 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae043df3828ea514cfbc68ed0d1284434251f1c2
-  data.tar.gz: a79029db7a1b2cdd7e306214e471c416c572cb28
+  metadata.gz: b59a6e0877e1ff3b71901bc01ba95dc961d03313
+  data.tar.gz: c2e415e9f1a24e92f970d50cc6119e8becd37615
 SHA512:
-  metadata.gz: b6c0a2d71036917b42732c22c2c4625fc3bb7ff1d3b9878ef1a9beffce7a2f47e423eecaf98aec0e50d0f3fcc0ae592dfdaa275fcc7d6dd1e1ef52a3734acd78
-  data.tar.gz: 006074a747db645038610dd7b541bdf069b5af6a0f7195fed0263efc40307784acacbbea2a7238641cf7a5ac9e2781bab24e7a3a576cf4fad468efdeee1dcbbc
+  metadata.gz: 1baea65b91560b3d247c717dccc9daac1d789a214b7df9db56adb94d9d68877dfaf66e3e8f2023c7db92b93b443c594f0b7be7cdc6cf378f2276b983989a33e6
+  data.tar.gz: 410701770d8ff9cc6f66132037f37a79e34dc61afc420049fc333f448cfe2ec37a06c3ba71994f893da14d3e3ea589bd300edd6386f6081a30f03e765b8f1857

data/README.md

@@ -69,6 +69,17 @@ 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 Parameter Name
+
+You can pass in `start_date_param` to change the name of the parameter
+in the URL for the current calendar view.
+
+```erb
+<%= calendar start_date_param: :my_date do |date| %>
+  <%= date %>
+<% end %>
+```
+
 ### Custom Partial
 
 You can set a different partial name for calendars by passing the partial path.

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

@@ -1,8 +1,12 @@
 <div class="simple-calendar">
   <div class="calendar-heading">
     <%= link_to t('simple_calendar.previous', default: 'Previous'), calendar.url_for_previous_view %>
-    <span class="calendar-title">Week <%= calendar.week_number %></span>
-    <%= link_to t('simple_calendar.next', default: 'Next'), calendar.url_for_next_view %>
+    <% if calendar.number_of_weeks == 1 %>
+      <span class="calendar-title">Week <%= calendar.week_number %></span>
+    <%else%>
+        <span class="calendar-title">Week <%= calendar.week_number %> - <%= calendar.end_week %></span>
+    <%end%>
+        <%= link_to t('simple_calendar.next', default: 'Next'), calendar.url_for_next_view %>
   </div>
 
   <table class="table table-striped">

data/lib/simple_calendar/calendar.rb

@@ -46,11 +46,11 @@ module SimpleCalendar
     end
 
     def url_for_next_view
-      view_context.url_for(@params.merge(start_date: date_range.last + 1.day))
+      view_context.url_for(@params.merge(start_date_param => date_range.last + 1.day))
     end
 
     def url_for_previous_view
-      view_context.url_for(@params.merge(start_date: date_range.first - 1.day))
+      view_context.url_for(@params.merge(start_date_param => date_range.first - 1.day))
     end
 
     private
@@ -67,6 +67,10 @@ module SimpleCalendar
         options.fetch(:end_attribute, :end_time).to_sym
       end
 
+      def start_date_param
+        options.fetch(:start_date_param, :start_date).to_sym
+      end
+
       def sorted_events
         @sorted_events ||= begin
                              events = options.fetch(:events, []).reject { |e| e.send(attribute).nil? }.sort_by(&attribute)
@@ -92,7 +96,7 @@ module SimpleCalendar
         if options.has_key?(:start_date)
           options.fetch(:start_date).to_date
         else
-          view_context.params.fetch(:start_date, Date.current).to_date
+          view_context.params.fetch(start_date_param, Date.current).to_date
         end
       end
 

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

data/lib/simple_calendar/week_calendar.rb

@@ -5,6 +5,14 @@ module SimpleCalendar
       start_date.beginning_of_week.strftime(format).to_i
     end
 
+    def number_of_weeks
+      options.fetch(:number_of_weeks, 1)
+    end
+
+    def end_week
+      week_number + number_of_weeks - 1
+    end
+
     private
 
       def date_range
@@ -13,9 +21,5 @@ module SimpleCalendar
 
         (starting..ending).to_a
       end
-
-      def number_of_weeks
-        options.fetch(:number_of_weeks, 1)
-      end
   end
 end

data/spec/calendar_spec.rb

@@ -3,15 +3,16 @@ require 'action_controller'
 require 'simple_calendar/calendar'
 
 class ViewContext
-  attr_accessor :start_date
+  attr_accessor :start_date, :start_date_param
 
-  def initialize(start_date=nil)
+  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: @start_date})
+      ActionController::Parameters.new({start_date_param => @start_date})
     else
       ActionController::Parameters.new
     end
@@ -104,6 +105,12 @@ describe SimpleCalendar::Calendar do
       calendar = SimpleCalendar::Calendar.new(view_context, start_date: Date.tomorrow)
       expect(calendar.send(:start_date)).to eq(Date.tomorrow)
     end
+
+    it "takes an option to override the start_date parameter" do
+      view_context = ViewContext.new(Date.yesterday, start_date_param: :date)
+      calendar = SimpleCalendar::Calendar.new(view_context, start_date_param: :date)
+      expect(calendar.send(:start_date)).to eq(Date.yesterday)
+    end
   end
 
   it 'has a param that determines the start date of the calendar'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_calendar
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Rails calendar