micalender 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88cbadbf2982860f10b64e81633aa89c1bbec4e7
-  data.tar.gz: b46bbe0ec0b7500b89ae2dc8d3457910ec1a697e
+  metadata.gz: e3428558f7c85c8f265c55ac41f77508b88f1ae3
+  data.tar.gz: e7329bca577e0407f0cd144f632428d08336f02e
 SHA512:
-  metadata.gz: b116e4c9ce55412b60d7d5d5ddc058bbcc0e10c209a4c150fcdb963e17c285f310c59291c647de7be4c9758f24701e049f924716051cbb0f8a00426bb61b034d
-  data.tar.gz: d6bb41bb59cb0774cdbf66f49e0b5c66a268173a6c685d7e2e4c44b9afab6a567412996d03db0c3007c903822d03428220cdb1ddb4c12325c73c2c73bc332f75
+  metadata.gz: c21d39bd7d18a6943d5270b5d8c1748504fdf5c276deb45cca3a71c2854dbe255157f693f40c1a228f21e5820e3d0b231793e9883d9b5a4fb370ab1e51488279
+  data.tar.gz: 0acca9dda4da859b070eceaef61bfdea0ad7762970baecaee2c5b23c8cab497e5a83af806cc62828995ff3c10c011c7b2a659c0c88df18ffae22db820d47d880

data/app/assets/stylesheets/micalender.scss

@@ -0,0 +1,78 @@
+.micalendar {
+  table {
+    -webkit-border-horizontal-spacing: 0px;
+    -webkit-border-vertical-spacing: 0px;
+    background-color: rgba(0, 0, 0, 0);
+    border: 1px solid rgb(221, 221, 221);
+    border-collapse: collapse;
+    box-sizing: border-box;
+    max-width: 100%;
+    width: 100%;
+  }
+
+  tr {
+    border-collapse: collapse;
+  }
+
+  th {
+    padding: 6px;
+    border-bottom: 2px solid rgb(221, 221, 221);
+    border-collapse: collapse;
+    border-left: 1px solid rgb(221, 221, 221);
+    border-right: 1px solid rgb(221, 221, 221);
+    border-top: 0px none rgb(51, 51, 51);
+    box-sizing: border-box;
+    text-align: left;
+  }
+
+  td {
+    padding: 6px;
+    vertical-align: top;
+    width: 14%;
+
+    border: 1px solid #ddd;
+    border-top-color: rgb(221, 221, 221);
+    border-top-style: solid;
+    border-top-width: 1px;
+    border-right-color: rgb(221, 221, 221);
+    border-right-style: solid;
+    border-right-width: 1px;
+    border-bottom-color: rgb(221, 221, 221);
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-left-color: rgb(221, 221, 221);
+    border-left-style: solid;
+    border-left-width: 1px;
+  }
+
+  .day {
+    height: 80px;
+  }
+
+  .wday-0 {}
+  .wday-1 {}
+  .wday-2 {}
+  .wday-3 {}
+  .wday-4 {}
+  .wday-5 {}
+  .wday-6 {}
+
+  .today {
+    background: #FFFFC0
+  }
+
+  .past {}
+  .future {}
+
+  .start-date {}
+
+  .prev-month {
+    background: #DDD;
+  }
+  .next-month {
+    background: #DDD;
+  }
+  .current-month {}
+
+  .has-events {}
+}

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

@@ -0,0 +1,33 @@
+<div class="micalendar">
+  <div class="calendar-heading">
+    <%= link_to t('micalendar.previous', default: 'Previous'), calendar.url_for_previous_view %>
+    <span class="calendar-title"><%= t('date.month_names')[start_date.month] %> <%= start_date.year %></span>
+    <%= link_to t('micalendar.next', default: 'Next'), calendar.url_for_next_view %>
+  </div>
+
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <% date_range.slice(0, 7).each do |day| %>
+          <th><%= t('date.abbr_day_names')[day.wday] %></th>
+        <% end %>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% date_range.each_slice(7) do |week| %>
+        <%= content_tag :tr, class: calendar.tr_classes_for(week) do %>
+          <% week.each do |day| %>
+            <%= content_tag :td, class: calendar.td_classes_for(day) do %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &block) %>
+              <% else %>
+                <% block.call day, sorted_events.fetch(day, []) %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/micalender/_month_calendar.html.erb

@@ -0,0 +1,33 @@
+<div class="micalendar">
+  <div class="calendar-heading">
+    <%= link_to t('micalendar.previous', default: 'Previous'), calendar.url_for_previous_view %>
+    <span class="calendar-title"><%= t('date.month_names')[start_date.month] %> <%= start_date.year %></span>
+    <%= link_to t('micalendar.next', default: 'Next'), calendar.url_for_next_view %>
+  </div>
+
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <% date_range.slice(0, 7).each do |day| %>
+          <th><%= t('date.abbr_day_names')[day.wday] %></th>
+        <% end %>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% date_range.each_slice(7) do |week| %>
+        <tr>
+          <% week.each do |day| %>
+            <%= content_tag :td, class: calendar.td_classes_for(day) do %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &block) %>
+              <% else %>
+                <% block.call day, sorted_events.fetch(day, []) %>
+              <% end %>
+            <% end %>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,37 @@
+<div class="micalendar">
+  <div class="calendar-heading">
+    <%= link_to t('micalendar.previous', default: 'Previous'), calendar.url_for_previous_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('micalendar.next', default: 'Next'), calendar.url_for_next_view %>
+  </div>
+
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <% date_range.slice(0, 7).each do |day| %>
+          <th><%= t('date.abbr_day_names')[day.wday] %></th>
+        <% end %>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% date_range.each_slice(7) do |week| %>
+        <tr>
+          <% week.each do |day| %>
+            <%= content_tag :td, class: calendar.td_classes_for(day) do %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &block) %>
+              <% else %>
+                <% block.call day, sorted_events.fetch(day, []) %>
+              <% end %>
+            <% end %>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/lib/generators/micalender/views_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Micalender
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../../..", __FILE__)
+
+      def copy_views
+        directory 'app/views/micalender', 'app/views/micalender'
+      end
+    end
+  end
+end

data/lib/micalender.rb

@@ -1,6 +1,9 @@
 require "micalender/version"
 require_relative "./micalender/view_helpers"
 require_relative "./micalender/railtie"
+require_relative "./micalender/calendar"
+require_relative "./micalender/month_calendar"
+require_relative "./micalender/week_calendar"
 
 module Micalender
   class Engine < Rails::Engine

data/lib/micalender/calendar.rb

@@ -0,0 +1,127 @@
+require 'rails'
+
+module Micalender
+  class Calendar
+    PARAM_KEY_BLACKLIST = :authenticity_token, :commit, :utf8, :_method, :script_name
+
+    attr_accessor :view_context, :options
+
+    def initialize(view_context, opts={})
+      @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)
+      view_context.render(
+        partial: partial_name,
+        locals: {
+          block: block,
+          calendar: self,
+          date_range: date_range,
+          start_date: start_date,
+          sorted_events: sorted_events
+        }
+      )
+    end
+
+    def td_classes_for(day)
+      today = Date.current
+
+      td_class = ['day']
+      td_class << "wday-#{day.wday.to_s}"
+      td_class << 'today'         if today == day
+      td_class << 'past'          if today > day
+      td_class << 'future'        if today < day
+      td_class << 'start-date'    if day.to_date == start_date.to_date
+      td_class << 'prev-month'    if start_date.month != day.month && day < start_date
+      td_class << 'next-month'    if start_date.month != day.month && day > start_date
+      td_class << 'current-month' if start_date.month == day.month
+      td_class << 'has-events'    if sorted_events.fetch(day, []).any?
+
+      td_class
+    end
+
+    def tr_classes_for(week)
+      today = Date.current
+      tr_class = ['week']
+      tr_class << 'current-week' if week.include?(today)
+
+      tr_class
+    end
+
+    def url_for_next_view
+      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_param => date_range.first - 1.day))
+    end
+
+    def date_range
+      (start_date..(start_date + additional_days.days)).to_a
+    end
+
+    private
+
+      def partial_name
+        @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 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)
+                             group_events_by_date(events)
+                           end
+      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.send(end_attribute).nil?) ? event.send(end_attribute).to_date : event_start_date
+          (event_start_date..event_end_date.to_date).each do |enumerated_date|
+            events_grouped_by_date[enumerated_date] << event
+          end
+        end
+
+        events_grouped_by_date
+      end
+
+      def start_date
+        if options.has_key?(:start_date)
+          options.fetch(:start_date).to_date
+        else
+          view_context.params.fetch(start_date_param, Date.current).to_date
+        end
+      end
+
+      def end_date
+        date_range.last
+      end
+
+      def additional_days
+        options.fetch(:number_of_days, 4) - 1
+      end
+  end
+end

data/lib/micalender/month_calendar.rb

@@ -0,0 +1,7 @@
+module Micalender
+  class MonthCalendar < Micalender::Calendar
+    def date_range
+      (start_date.beginning_of_month.beginning_of_week..start_date.end_of_month.end_of_week).to_a
+    end
+  end
+end

data/lib/micalender/version.rb

@@ -1,3 +1,3 @@
 module Micalender
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/micalender/view_helpers.rb

@@ -1,150 +1,18 @@
 module Micalender
   module ViewHelpers
-    def month_calendar(param_name=:start_date, options={}, &block)
-      start_date = (params[param_name] || Time.zone.now).to_date
+     def calendar(options={}, &block)
+      raise 'calendar requires a block' unless block_given?
+      Micalender::Calendar.new(self, options).render(&block)
+     end
 
-      options.reverse_merge!(
-        td: day_classes,
-        prev_link: ->(range) { link_to raw("«"), param_name => range.first - 1.day },
-        header: month_header,
-        next_link: ->(range) { link_to raw("»"), param_name => range.last + 1.day },
-        start_date: start_date,
-      )
-      render_calendar month_range(start_date), options, &block
+    def month_calendar(options={}, &block)
+      raise 'month_calendar requires a block' unless block_given?
+      Micalender::MonthCalendar.new(self, options).render(&block)
     end
 
-    def week_calendar(param_name=:start_date, options={}, &block)
-      start_date = (params[param_name] || Time.zone.now).to_date
-      number_of_weeks = options.fetch(:number_of_weeks, 1)
-
-      options.reverse_merge!(
-        td: day_classes,
-        prev_link: ->(range) { link_to raw("«"), param_name => range.first - 1.day },
-        header: false,
-        next_link: ->(range) { link_to raw("»"), param_name => range.last + 1.day },
-        start_date: start_date,
-      )
-      render_calendar week_range(start_date, number_of_weeks), options, &block
-    end
-
-    def calendar(param_name=:start_date, options={}, &block)
-      start_date = (params[param_name] || Time.zone.now).to_date
-      number_of_days_to_advance = options.fetch(:number_of_days, 4) - 1
-
-      options.reverse_merge!(
-        td: day_classes,
-        prev_link: ->(range) { link_to raw("«"), param_name => range.first - 1.day },
-        header: false,
-        next_link: ->(range) { link_to raw("»"), param_name => range.last + 1.day },
-        start_date: start_date,
-      )
-      render_calendar calendar_range(start_date, number_of_days_to_advance), options, &block
-    end
-
-    def month_range(start_date)
-      start_date.beginning_of_month.beginning_of_week.to_date..start_date.end_of_month.end_of_week.to_date
-    end
-
-    def week_range(start_date, number_of_weeks)
-      number_of_days_to_advance = (number_of_weeks * 7) - 1
-      starting_day              = start_date.beginning_of_week.to_date
-      ending_day                = starting_day + number_of_days_to_advance.days
-      starting_day..ending_day
-    end
-
-    def calendar_range(start_date, number_of_days_to_advance)
-      start_date..(start_date + number_of_days_to_advance.days)
-    end
-
-    def render_calendar(range, options, &block)
-      raise 'SimpleCalendar requires a block' unless block_given?
-
-      @block      = block
-      @options    = options.reverse_merge default_options
-      @start_date = options.fetch(:start_date)
-
-      capture do
-        concat render_header(@start_date, range)
-        concat render_table(range)
-      end
-    end
-
-    def render_header(start_date, range)
-      capture do
-        content_tag :div do
-          concat get_options(@options[:prev_link], range)
-          concat get_options(@options[:header], start_date)
-          concat get_options(@options[:next_link], range)
-        end
-      end
-    end
-
-    def render_table(range)
-      content_tag(:table, get_options(@options[:table])) do
-        content_tag(:tbody) do
-          render_weeks(range)
-        end
-      end
-    end
-
-
-    def render_weeks(range)
-      weeks = []
-      range.each_slice(7) do |week|
-        weeks << content_tag(:tr, get_options(@options[:tr], week)) do
-          render_week(week)
-        end
-      end
-      safe_join weeks
-    end
-
-    def render_week(week)
-      results = week.map do |day|
-        content_tag :td, get_options(@options[:td], @start_date, day) do
-          @block.call(day)
-        end
-      end
-      safe_join results
-    end
-
-    def get_options(options, *params)
-      case options
-      when Hash
-        options
-      when String
-        send(options, *params)
-      when Symbol
-        send(options, *params)
-      else
-        options.call(*params) if options.respond_to? :call
-      end
-    end
-
-    def default_options
-      { table: {}, tr: {}, td: {}, }
-    end
-
-    def day_classes
-      ->(start_date, current_calendar_date) {
-        today = Time.zone.now.to_date
-        td_class = ["day"]
-
-        td_class << "today"  if today == current_calendar_date
-        td_class << "past"   if today > current_calendar_date
-        td_class << "future" if today < current_calendar_date
-        td_class << "prev-month"    if start_date.month != current_calendar_date.month && current_calendar_date < start_date
-        td_class << "next-month"    if start_date.month != current_calendar_date.month && current_calendar_date > start_date
-        td_class << "current-month" if start_date.month == current_calendar_date.month
-        td_class << "wday-#{current_calendar_date.wday.to_s}"
-
-        { class: td_class.join(" ") }
-      }
-    end
-
-    def month_header
-      ->(start_date) {
-        content_tag :span, "#{I18n.t("date.month_names")[start_date.month]} #{start_date.year}", class: "calendar-header"
-      }
+    def week_calendar(options={}, &block)
+      raise 'week_calendar requires a block' unless block_given?
+      Micalender::WeekCalendar.new(self, options).render(&block)
     end
   end
 end

data/lib/micalender/week_calendar.rb

@@ -0,0 +1,23 @@
+module Micalender
+  class WeekCalendar < Micalender::Calendar
+    def week_number
+      format = (Date.beginning_of_week == :sunday) ? "%U" : "%W"
+      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
+
+    def date_range
+      starting = start_date.beginning_of_week
+      ending = (starting + (number_of_weeks - 1).weeks).end_of_week
+
+      (starting..ending).to_a
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micalender
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mukesh Kumar
@@ -73,10 +73,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/stylesheets/micalender.scss
+- app/views/micalender/_calendar.html.erb
+- app/views/micalender/_month_calendar.html.erb
+- app/views/micalender/_week_calendar.html.erb
+- lib/generators/micalender/views_generator.rb
 - lib/micalender.rb
+- lib/micalender/calendar.rb
+- lib/micalender/month_calendar.rb
 - lib/micalender/railtie.rb
 - lib/micalender/version.rb
 - lib/micalender/view_helpers.rb
+- lib/micalender/week_calendar.rb
 homepage: https://github.com/karanraj9042/holiday_calender
 licenses:
 - MIT