simple_calendar 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59a6e0877e1ff3b71901bc01ba95dc961d03313
-  data.tar.gz: c2e415e9f1a24e92f970d50cc6119e8becd37615
+  metadata.gz: d48c34ef8c59455fb303e967c9974f5fe8f8cd8e
+  data.tar.gz: ddb4c3b79eed4ce5c40b699720e81e7008f1e4f5
 SHA512:
-  metadata.gz: 1baea65b91560b3d247c717dccc9daac1d789a214b7df9db56adb94d9d68877dfaf66e3e8f2023c7db92b93b443c594f0b7be7cdc6cf378f2276b983989a33e6
-  data.tar.gz: 410701770d8ff9cc6f66132037f37a79e34dc61afc420049fc333f448cfe2ec37a06c3ba71994f893da14d3e3ea589bd300edd6386f6081a30f03e765b8f1857
+  metadata.gz: f62df456ab1f6cd88d39c47ca837da47e5fdc8e25c5ec3c509fa31181bc60a4fd8eb361debadd006b97bf98a891af7bf2734383a4e032994fd7d24c6eae6d30d
+  data.tar.gz: 10dfbc74095af375642fcda64b032f153d3284257bd71531bb0c3c73a0b13da819fc2a857318e89cf4cb5afd195fa3ae0703cf147abb9e26caf9647d921eff3d

data/README.md

@@ -45,6 +45,8 @@ method.
 <% end %>
 ```
 
+To show the day of the month instead of the date, use `<%= date.day %>`
+
 ### Week Calendar
 
 You can generate a week calendar with the `week_calendar` method.
@@ -110,17 +112,26 @@ $ rails g scaffold Meeting name start_time:datetime
 $ rails g scaffold Meeting name start_time:datetime end_time:datetime
 ```
 
-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 or end_time, just
-pass it in as the `attribute` or `end_attribute` options respectively**
+By default it uses `start_time` as the attribute name.  
+**If you'd like to use another attribute other than start_time, just
+pass it in as the `attribute`**
 
 ```erb
 <%= month_calendar(attribute: :starts_at) do |date| %>
   <%= date %>
 <% end %>
 ```
+
+Optionally the `end_time` attribute can be used which enables multi-day event rendering.
+
+**Just pass in the `attribute` and `end_attribute` options respectively**
+
+```erb
+<%= month_calendar(attribute: :start_date, end_attribute: :end_date) do |date| %>
+  <%= date %>
+<% end %>
+```
+
 **If you already have a model with a start time attribute called something other than `start_time` or accesses it through a relationship, you can alias the attribute by defining a `start_time` method in the my_model.rb file and not have to specify it separately as in the above example**
 ```ruby
 class MyModel
@@ -319,7 +330,7 @@ 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
+class SimpleCalendar::BusinessWeekCalendar < SimpleCalendar::Calendar
   private
 
     def date_range
@@ -333,7 +344,7 @@ end
 To render this in the view, you can do:
 
 ```erb
-<%= SimpleCalendar::BusinessWeekCalendar.new(self).render do |date| %>
+<%= SimpleCalendar::BusinessWeekCalendar.new(self, {}).render do |date| %>
   <%= date %>
 <% end %>
 ```

data/lib/simple_calendar/calendar.rb

@@ -10,9 +10,13 @@ module SimpleCalendar
       @view_context = view_context
       @options = opts
 
+      # Next and previous view links should use the same params as the current view
       @params = @view_context.respond_to?(:params) ? @view_context.params : Hash.new
       @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
       @params = @params.with_indifferent_access.except(*PARAM_KEY_BLACKLIST)
+
+      # Add in any additonal params the user passed in
+      @params.merge!(@options.fetch(:params, {}))
     end
 
     def render(&block)

data/lib/simple_calendar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails