simple_calendar 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf7dd7da58c164946cc463de914d5dccaa6c276
-  data.tar.gz: 41e7930f9ca72998c17c2e3696f4d3f42cbd5ac8
+  metadata.gz: 9f1bef2fdf230945b581621112f8c7b46b9cb9d9
+  data.tar.gz: 40d6aab11c406a80bdbb4a53dbfdecc7eec80870
 SHA512:
-  metadata.gz: 9de2b8ede0f7af25ae69cde985e6904ee0b45072b7fc788d7e78de6e0abb857b0251686f7aa8ed9d61a5e01765b40caccb1bfd57154275c266c293c838e4e54c
-  data.tar.gz: d85e2eca8b75807c5dc9a3dd27693b2ba30825052186c9d3a21cb1f84b4707c0d5c68943fe0ae623d5153a805b1a8d970a94f037a8b69b71937ad0bdb77872a6
+  metadata.gz: e13e563237199144c692d14266d37f60855ca9011700ea63f0756943015af38b331948012d0dea4d374763d3c1f0115615e69bd6a1f9e19ae5fd7073ee41bfc3
+  data.tar.gz: 9dac84908ee7a8405b8702fab311f487e32220a26876a87e24a434fb3e7ce9de87162be6964a1e8b3ca253700650a89b7750bc9b0b53ff9b974ad93c26db91cc

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in simple_calendar.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'pry'
+end

data/README.md

@@ -6,14 +6,14 @@ Theming is up to you, but it works nicely with Twitter Bootstrap. It's
 compatible with pure Ruby classes, ActiveRecord, Mongoid, and any other
 ORM.
 
-Thanks to Josh Chernoff and all other contributors.
+Thanks to all of the awesome contributors!
 
 Installation
 ------------
 
 Just add this into your Gemfile followed by a bundle install:
 
-    gem "simple_calendar", "~> 0.1.9"
+    gem "simple_calendar", "~> 0.1.10"
 
 Usage
 -----
@@ -124,6 +124,16 @@ represents the day that has no events.
     <%= event.name %>
   <% end %>
 ```
+The `not_empty_date` option accepts a block that will be called when a day
+in the calendar has at least one event. It will be called with the date object that
+represents the day that has some events.
+
+```erb
+  <%= calendar @events, not_empty_date: lambda{ |date| "hello from #{date}" } do |event| %>
+    <%= event.name %>
+  <% end %>
+```
+
 
 CSS
 ---

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/simple_calendar/view_helpers.rb

@@ -4,20 +4,11 @@ module SimpleCalendar
     def calendar(events, options={}, &block)
       raise 'SimpleCalendar requires a block to be passed in' unless block_given?
 
-
-      opts = {
-          :year       => (params[:year] || Time.zone.now.year).to_i,
-          :month      => (params[:month] || Time.zone.now.month).to_i,
-          :prev_text  => raw("«"),
-          :next_text  => raw("»"),
-          :start_day  => :sunday,
-          :class      => "table table-bordered table-striped calendar",
-          :params     => {}
-      }
+      opts = default_options
       options.reverse_merge! opts
       events       ||= []
       selected_month = Date.new(options[:year], options[:month])
-      current_date   = Date.today
+      current_date   = Time.zone.now.to_date
       range          = build_range selected_month, options
       month_array    = range.each_slice(7).to_a
 
@@ -25,7 +16,19 @@ module SimpleCalendar
     end
 
     private
-
+    def default_options
+      {
+        :year           => (params[:year] || Time.zone.now.year).to_i,
+        :month          => (params[:month] || Time.zone.now.month).to_i,
+        :prev_text      => raw("«"),
+        :next_text      => raw("»"),
+        :start_day      => :sunday,
+        :class          => "table table-bordered table-striped calendar",
+        :params         => {},
+        :time_selector  => "start_time"
+      }
+    end
+    # Returns array of dates between start date and end date for selected month
     def build_range(selected_month, options)
       start_date = selected_month.beginning_of_month.beginning_of_week(options[:start_day])
       end_date   = selected_month.end_of_month.end_of_week(options[:start_day])
@@ -36,16 +39,16 @@ module SimpleCalendar
     # Renders the calendar table
     def draw_calendar(selected_month, month, current_date, events, options, block)
       tags = []
-      today = Date.today
+      today = Time.zone.now.to_date
       content_tag(:table, :class => options[:class]) do
         tags << month_header(selected_month, options)
         day_names = I18n.t("date.abbr_day_names")
         day_names = day_names.rotate((Date::DAYS_INTO_WEEK[options[:start_day]] + 1) % 7)
-        tags << content_tag(:thead, content_tag(:tr, day_names.collect { |name| content_tag :th, name, :class => (selected_month.month == Date.today.month && Date.today.strftime("%a") == name ? "current-day" : nil)}.join.html_safe))
+        tags << content_tag(:thead, content_tag(:tr, day_names.collect { |name| content_tag :th, name, :class => (selected_month.month == today.month && today.strftime("%a") == name ? "current-day" : nil)}.join.html_safe))
         tags << content_tag(:tbody, :'data-month'=>selected_month.month, :'data-year'=>selected_month.year) do
 
           month.collect do |week|
-            content_tag(:tr, :class => (week.include?(Date.today) ? "current-week week" : "week")) do
+            content_tag(:tr, :class => (week.include?(today) ? "current-week week" : "week")) do
 
               week.collect do |date|
                 td_class = ["day"]
@@ -55,7 +58,7 @@ module SimpleCalendar
                 td_class << "future" if today < date
                 td_class << "wday-#{date.wday.to_s}" # <- to enable different styles for weekend, etc
 
-                cur_events = day_events(date, events)
+                cur_events = day_events(date, events, options[:time_selector])
 
                 td_class << (cur_events.any? ? "events" : "no-events")
 
@@ -67,6 +70,9 @@ module SimpleCalendar
                     if cur_events.empty? && options[:empty_date]
                       concat options[:empty_date].call(date)
                     else
+                      if options[:not_empty_date]
+                        concat options[:not_empty_date].call(date)
+                      end
                       divs << cur_events.collect{ |event| block.call(event) }
                     end
 
@@ -85,8 +91,8 @@ module SimpleCalendar
     end
 
     # Returns an array of events for a given day
-    def day_events(date, events)
-      events.select { |e| e.start_time.to_date == date }.sort_by { |e| e.start_time }
+    def day_events(date, events, time_selector)
+      events.select { |e| e.send(time_selector).to_date == date }.sort_by { |e| e.send(time_selector) }
     end
 
     # Generates the header that includes the month and next and previous months

data/spec/helper.rb

@@ -0,0 +1,24 @@
+require 'pathname'
+require 'rubygems'
+require 'bundler'
+require 'pry'
+require 'active_support/all'
+require 'action_view'
+
+root_path = Pathname(__FILE__).dirname.join('..').expand_path
+lib_path  = root_path.join('lib')
+
+Dir[root_path.join("spec/support/*.rb")].each { |f| require f }
+Dir[lib_path.join("simple_calendar/*.rb")].each { |f| require f }
+
+Bundler.setup(:default)
+
+RSpec.configure do |config|
+  config.fail_fast = true
+
+  config.filter_run :focused => true
+  config.alias_example_to :fit, :focused => true
+  config.alias_example_to :xit, :pending => true
+  config.run_all_when_everything_filtered = true
+end
+Time.zone = "UTC"

data/spec/simple_calendar_spec.rb

@@ -0,0 +1,94 @@
+require 'helper'
+
+class View
+  include SimpleCalendar::ViewHelpers
+  include ActionView::Helpers
+  include ActionView::Context
+
+  def raw(argument)
+    argument
+  end
+
+end
+
+describe "SimpleCalendar" do
+  subject { View.new }
+
+  before do
+    subject.stub(:params => {:year => 2013, :month => 5})
+  end
+
+  describe "#calendar" do
+    context "with invalid arguments" do
+      it "should raise an error" do
+        expect { subject.calendar("foo") }.to raise_error(StandardError, /block/)
+      end
+    end
+
+    context "with valid arguments" do
+      it "should draw a calendar" do
+        subject.should_receive(:draw_calendar)
+        subject.calendar("foo") { "test" }
+      end
+
+      it "should not overwrite passed in arguments" do
+        subject.should_receive(:build_range).and_return([2,2,3])
+        subject.should_receive(:draw_calendar)
+        subject.calendar("foo") { "test" }
+      end
+    end
+  end
+
+  describe "#build_range" do
+    it "should return an array representing the days of the month" do
+      selected_month = Date.new(2013, 1)
+      options        = {:start_day => :tuesday}
+      result         = subject.send(:build_range, selected_month, options)
+      result.class.should == Array
+      result.first.class.should == Date
+      result.last.class.should == Date
+    end
+  end
+
+  describe "#draw_calendar" do
+    it "should render a calendar table" do
+      #TODO: refactor draw_calendar to not require so much build up
+      subject.should_receive(:month_header)
+      selected_month = Date.new(2013, 1)
+      month          = []
+      current_date   = Date.new(2013, 1, 14)
+      events         = {}
+      options        = {:start_day => :monday}
+      block          = Proc.new {}
+      subject.send(:draw_calendar, selected_month, month, current_date, events, options, block).should match(/^<table/)
+    end
+  end
+
+  describe "#day_events" do
+    it "should return an array of events for a given day" do
+      date           = Date.new(2013, 1, 14)
+      matching_event = stub(:start_time => Date.new(2013, 1, 14))
+      other_event    = stub(:start_time => Date.new(2013,1,15))
+      events = [matching_event, other_event]
+      subject.send(:day_events, date, events, "start_time").should == [matching_event]
+    end
+  end
+
+  describe "#month_header" do
+    it "should generate html including the month, next and previous month" do
+      subject.should_receive(:month_link).exactly(2)
+      selected_month = Date.new(2013, 1)
+      options = {}
+      #TODO: add coverage for actual output other than just the starting tag
+      subject.send(:month_header, selected_month, options).should match(/^<h2/)
+    end
+  end
+
+  describe "#month_link" do
+    it "should return a link" do
+      #TODO: test even needed?
+      subject.should_receive(:link_to)
+      subject.send(:month_link, "previous", Date.new(2013, 1), {})
+    end
+  end
+end

data/spec/support/railtie.rb

@@ -0,0 +1,9 @@
+module SimpleCalendar
+  class Rails
+    class Railtie
+      def self.initializer(object)
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -40,6 +41,9 @@ files:
 - lib/simple_calendar/version.rb
 - lib/simple_calendar/view_helpers.rb
 - simple_calendar.gemspec
+- spec/helper.rb
+- spec/simple_calendar_spec.rb
+- spec/support/railtie.rb
 homepage: https://github.com/excid3/simple_calendar
 licenses: []
 metadata: {}
@@ -59,8 +63,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_calendar
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A simple Rails 3 calendar
-test_files: []
+test_files:
+- spec/helper.rb
+- spec/simple_calendar_spec.rb
+- spec/support/railtie.rb