simple_calendar 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498acc5a1c5fac24d47d7cdb9d3da21744bfa262d593dd2c1ea38fd15285d35e
-  data.tar.gz: '0689bdad34c54a9e5aad30c200d22cc3502326431db2a4525eb944e15d6436ba'
+  metadata.gz: 994f74fe8cc221e2a6b74c3f57d24391d9214e9ad511ca03ba24a986ff0082c1
+  data.tar.gz: 4473aab5073e486696990218578198c35627d5fd8429bff8fb8e02a845f14b4c
 SHA512:
-  metadata.gz: 65ad74303562bb5f3126732963dd8776871463234ef3ae3c53a309e0462d24d393e5cc40ad9ec2eee57996d7456f2c9440237753e4fad13c5b98d49da4799539
-  data.tar.gz: a46c0c61bacb99afd4e3265a0eaf165c408fda9b005954221732408e7250124d60e9dd04649a3705893df89cbe5aee1077f58324c02f742c242c36fd1d20447a
+  metadata.gz: 91bcb6559bafdbe99cc18e0b6f1f6a373b5485908e0ad2622a8e2a2d5e8481e3d3bc884161a9164bd6859d2e2fc6729c715827bc7e1af5a1b91f2de5879e09d2
+  data.tar.gz: 7b2c6dfafab0edfecb1444fb14b6709ae89a9f324b6d64086bf4541df8001b9ee81c58f4229e96e10cdb73ba284a59d0e3abadfbe188e7cd15f546abef7be6b7

data/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [excid3] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+### 2.4.0
+
+* [BREAKING] Fixes Rails 4.2 by changing `block` to `passed_block`. A
+  security fix in Rails makes `block` a reserved local name that we can
+  no longer use.
+
+  **Upgrading**: If you've customized the simple_calendar views, rename
+  `block` to `passed_block`. Without this, calendar dates will be empty.

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

@@ -19,10 +19,10 @@
         <%= 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) %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(passed_block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &passed_block) %>
               <% else %>
-                <% block.call day, sorted_events.fetch(day, []) %>
+                <% passed_block.call day, sorted_events.fetch(day, []) %>
               <% end %>
             <% end %>
           <% end %>

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

@@ -19,10 +19,10 @@
         <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) %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(passed_block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &passed_block) %>
               <% else %>
-                <% block.call day, sorted_events.fetch(day, []) %>
+                <% passed_block.call day, sorted_events.fetch(day, []) %>
               <% end %>
             <% end %>
           <% end %>

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

@@ -23,10 +23,10 @@
         <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) %>
+              <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(passed_block) %>
+                <% capture_haml(day, sorted_events.fetch(day, []), &passed_block) %>
               <% else %>
-                <% block.call day, sorted_events.fetch(day, []) %>
+                <% passed_block.call day, sorted_events.fetch(day, []) %>
               <% end %>
             <% end %>
           <% end %>

data/lib/simple_calendar/calendar.rb

@@ -15,7 +15,7 @@ module SimpleCalendar
       @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
+      # Add in any additional params the user passed in
       @params.merge!(@options.fetch(:params, {}))
     end
 
@@ -23,7 +23,7 @@ module SimpleCalendar
       view_context.render(
         partial: partial_name,
         locals: {
-          block: block,
+          passed_block: block,
           calendar: self,
           date_range: date_range,
           start_date: start_date,

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/lib/simple_calendar/week_calendar.rb

@@ -1,7 +1,7 @@
 module SimpleCalendar
   class WeekCalendar < SimpleCalendar::Calendar
     def week_number
-      format = (Date.beginning_of_week == :sunday) ? "%U" : "%W"
+      format = (Date.beginning_of_week == :sunday) ? "%U" : "%V"
       start_date.beginning_of_week.strftime(format).to_i
     end
 

data/spec/calendars/month_calendar_spec.rb

@@ -10,8 +10,8 @@ describe SimpleCalendar::MonthCalendar do
       today = Date.today
       calendar = SimpleCalendar::MonthCalendar.new(ViewContext.new, start_date: Date.today)
 
-      expect(calendar.date_range.min).to be < today.beginning_of_month
-      expect(calendar.date_range.max).to be > today.end_of_month
+      expect(calendar.date_range.min).to be <= today.beginning_of_month
+      expect(calendar.date_range.max).to be >= today.end_of_month
     end
 
     it 'render the days of next and previous months on the edges of the calendar' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,9 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: simple_calendar
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple Rails calendar