simple_calendar 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc01558b04833e1dde44995688b8237f19f4a985
-  data.tar.gz: 584182fd18a1e913047d43b4db6f772c47469ac0
+  metadata.gz: 69891494cb62017e3108ade832d816c2fef2b021
+  data.tar.gz: f19a0f244c702b7aa4a0598793fa65a224905d71
 SHA512:
-  metadata.gz: 8fe7ea4dea3cd558d4e966d4cdeb3c580cdf8ca59239846c5fd2db41fecd66e892e441b5e26487bcf109b2edf48c2b25855738b1abc6b358b40789a27732263b
-  data.tar.gz: 9a43df2512a7e534589dd83e5de394ef6ff6ff4148754c7242253e80b615b9de766087bebf7c9a0de29e0ccc46a37713c94b3a57066a2aef3a82d30d31918d97
+  metadata.gz: 11c97daf53d52237fa6495af26fc1a6b630bd8879cc14d4dbd7cb0e72f8f9f388244a033e5c9348277cd2da095f160ae51516ba78b0c9856595d37304774b76a
+  data.tar.gz: f39d52be3eae79ea61b22cb814f53768a59a83c43ca1b6acfb3041ed16783a23d262b6ddcac1b4db90aaedd6aba7ca9cbc913f6e0690e390a6fa42f5aa5394db

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.ruby-version
+.ruby-gemset

data/README.md

@@ -92,6 +92,16 @@ pass it in as the `attribute` option**
   <%= day %>
 <% 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
+    ## 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
+end
+```
 
 In your controller, query for these meetings and store them in an instance
 variable. Normally you'll want to search for the ones that only show up
@@ -298,7 +308,7 @@ To render this in the view, you can do:
 
 ```erb
 <%= SimpleCalendar::BusinessWeekCalendar.new(self).render do |date| %>
-  <%= day %>
+  <%= date %>
 <% end %>
 ```
 

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

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

data/lib/simple_calendar/calendar.rb

@@ -66,7 +66,11 @@ module SimpleCalendar
       end
 
       def start_date
-        view_context.params.fetch(:start_date, Date.today).to_date
+        if options.has_key?(:start_date)
+          options.fetch(:start_date).to_date
+        else
+          view_context.params.fetch(:start_date, Date.today).to_date
+        end
       end
 
       def date_range

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.0.3"
+  VERSION = "2.0.5"
 end

data/spec/calendar_spec.rb

@@ -45,11 +45,17 @@ describe SimpleCalendar::Calendar do
       expect(calendar.send(:start_date)).to eq(Date.today)
     end
 
-    it "uses the params start_date to override" do
+    it "uses the view context's params start_date to override" do
       view_context = ViewContext.new(Date.yesterday)
       calendar = SimpleCalendar::Calendar.new(view_context)
       expect(calendar.send(:start_date)).to eq(Date.yesterday)
     end
+
+    it "uses the optional argument's start_date to override view_context's start_date" do
+      view_context = ViewContext.new(Date.yesterday)
+      calendar = SimpleCalendar::Calendar.new(view_context, start_date: Date.tomorrow)
+      expect(calendar.send(:start_date)).to eq(Date.tomorrow)
+    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.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails