ecm_calendar_helper 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b2ca56a2f9dd321f2db78da04aa1547c2e6c32
-  data.tar.gz: b972dacdaab4c40d6485982cbebf7a536e7deb64
+  metadata.gz: f3e5f21214725193d52d1c15380ed1c03c04b8e6
+  data.tar.gz: 15278f09109d889796d8c3f91eddf1628230c0b9
 SHA512:
-  metadata.gz: b094c8b15e9894c6a5a7bfa73cd04a05ce118614459a0da91aad936acdc5941e2cb130998d711ae41e54040c2c4f749975914851ac7c00d4d4221fb10eff7d66
-  data.tar.gz: 569aae1a432c72e0a8da7dac2ff51e9e314e72b059c6e2272061894093488c59cfe2d2e67bdf5c0a540405b211ac7ccdb02e1437f9eb702b9abd0634624b8a69
+  metadata.gz: 8a05e3299d4059ab13376b008a7b8f1745cb7406c541ef4ceec4f4012c3eec063a22e90a07f2844ab90d82329bed3e645df8bd239a84346bc9c6a39f0f7fe659
+  data.tar.gz: ac222cd53b256fea99960dc1562aa81e9b1797824dacafdeb7c695474aeae3da6b60e4c4cd0a1bbd5ee7bbcc286ec8dbd38d565d9d3bcffa5630a8f1972fea5e

data/app/helpers/ecm/calendar_helper.rb

@@ -31,29 +31,15 @@ module Ecm
       end
 
       days_by_week = {}
-      days_in_week = {}
-      week = beginning_of_month.cweek
-      (beginning_of_month..end_of_month).each_with_index do |day, index|
-        days_in_week[day] = elements.find_all { |e| e.send(options[:date_method]).to_date == day.to_date } || {}
-        
-        if day.wday == last_day_of_week
-          (7 - days_in_week.size).times do |i|
-            days_in_week[0 - i] = {}
-          end
-          week = (day + 1.day).cweek
-        end
+      first_day = beginning_of_month.beginning_of_week
+      last_day = end_of_month.end_of_week
 
-        if day.wday == last_day_of_week || index == end_of_month.day - 1
-          days_by_week[week] = days_in_week 
-          days_in_week = {}
-        end
-
-        if index == end_of_month.day - 1
-          (7 - days_in_week.size).times do |i|
-            days_in_week[days_in_week.size - i] = {}
-          end
-        end
+      days = (first_day..last_day).each_with_object({}).with_index do |(day, memo), index|
+        memo[day.to_date] = elements.find_all { |e| e.send(options[:date_method]).to_date == day.to_date } || {}
       end
+
+      days_by_week = days.each_with_object({}) { |(k, v), m| (m[k.cweek] ||= {})[k] = v }
+
       render partial: 'ecm/calendar_helper/month_calendar', locals: { localized_day_names: localized_day_names, days_by_week: days_by_week, display_method: display_method, link_elements: link_elements }
     end
     

data/app/views/ecm/calendar_helper/_month_calendar.haml

@@ -3,27 +3,23 @@
     - localized_day_names.each do |day|
       .column.calendar-weekday-name
         %h1= day
+
   - days_by_week.each do |week, days|
-    .flex-row
+    .flex-row{ class: "week-#{week}" }
       - days_count = 0
-      - days.sort.each do |day, elements|
-        - days_count += 1
-        - if day < 1
-          .column
-        - else
-          - td_classes = ['calendar-day']
-          - td_classes << 'active today' if day == Time.zone.now.to_date
-          - td_classes << 'with-elements' if elements.any?
-          .column{ class: td_classes.join(" ") }
-            .calendar-day-container
-              %h1.calendar-day-title= day.day
-              %div.calendar-entries
-              - elements.each do |element|
-                %div.calendar-day-content
-                  %span.calendar-item.calendar-item-default
-                    - if link_elements
-                      = link_to(element.send(display_method), element)
-                    - else
-                      = element.send(display_method)
-      - (7 - days_count).times do
-        .column
+      - days.each do |day, elements|
+        - td_classes = ['calendar-day']
+        - td_classes << 'active today' if day == Time.zone.now.to_date
+        - td_classes << 'with-elements' if elements.any?
+        - td_classes << 'not-actual-month' if day.month != Time.zone.now.month
+        .column{ class: td_classes.join(" ") }
+          .calendar-day-container
+            %h1.calendar-day-title= day.day
+            %div.calendar-entries
+            - elements.each do |element|
+              %div.calendar-day-content
+                %span.calendar-item.calendar-item-default
+                  - if link_elements
+                    = link_to(element.send(display_method), element)
+                  - else
+                    = element.send(display_method)

data/lib/ecm/calendar_helper/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module CalendarHelper
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_calendar_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails calendar helper.