simple_calendar 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e11781a625cdf2a8812e5b7972feecb016b82abe0c1ad57b6687e90851f04f86
-  data.tar.gz: 19f2e34143a16827b1b2a6255988ef53004477f91077e4e69bcfef31837aec31
+  metadata.gz: 37a9649373c34dabc95e3549b89903edea28a8b86e3c5e84defd640354390961
+  data.tar.gz: 561d150c797c2c350fa00501f8936556412efe0158449aa909fd22b824fbf5e0
 SHA512:
-  metadata.gz: 140c319c81da2305230604b0101f6302e14d9952c2895ffab35a7d3c43cf7d4ab5eb4ad2111f0d2bb7246488446d9f09de71bb9b6e0bfe6ddeea11efba8b7bd0
-  data.tar.gz: 8c2f960eaea8445f1a4f45b62d7ba5fd7864010a91c6ee37f4299443aa95bc4df70c760cea79bdaff35a166d65a0cbaa2b0b0caf1be289668705b337a1dd8c30
+  metadata.gz: 22c618117445c21407bfabd37889f83c5676143704a388670bf3f8b00ddd66d4d41fd2ccc5c4bdf9ecd2cde4b5b232407cac2d4265f2228640b51b4a65503e37
+  data.tar.gz: c284fe582e697f44e001c22dd0380a74c7ef60827a835f7768c058c56585534c339c4b11541ca938ad44da5a6aedad5ccd60fd5fe3e795a0dc921534dbebf105

data/.gitignore

@@ -5,6 +5,6 @@ pkg/*
 .ruby-version
 .ruby-gemset
 test/dummy/db/test.sqlite3
-test/dummy/log/test.log
-test/dummy/log/development.log
 test/dummy/db/development.sqlite3
+test/dummy/log
+test/dummy/tmp

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.0.1
+
+* Refactor to use block from `render_in` call to better support custom calendars
+
 ### 3.0.0
 
 * Drop support for Rails 6.0 and earlier

data/Gemfile

@@ -7,3 +7,5 @@ gem "standard"
 
 gem "puma"
 gem "sqlite3"
+
+gem "web-console", "~> 4.2", group: :development

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    simple_calendar (3.0.0)
+    simple_calendar (3.0.1)
       rails (>= 6.1)
 
 GEM
@@ -82,6 +82,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
+    bindex (0.8.1)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
@@ -197,6 +198,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -213,6 +219,7 @@ DEPENDENCIES
   simple_calendar!
   sqlite3
   standard
+  web-console (~> 4.2)
 
 BUNDLED WITH
    2.4.16

data/README.md

@@ -394,7 +394,7 @@ end
 To render this in the view, you can do:
 
 ```erb
-<%= SimpleCalendar::BusinessWeekCalendar.new(self, {}).render do |date| %>
+<%= render SimpleCalendar::BusinessWeekCalendar.new(self, events: meetings) do |date| %>
   <%= date %>
 <% end %>
 ```

data/{lib/simple_calendar/view_helpers.rb → app/helpers/simple_calendar/calendar_helper.rb}

@@ -1,18 +1,18 @@
 module SimpleCalendar
-  module ViewHelpers
+  module CalendarHelper
     def calendar(options = {}, &block)
       raise "calendar requires a block" unless block
-      render SimpleCalendar::Calendar.new(self, options, &block)
+      render SimpleCalendar::Calendar.new(self, options), &block
     end
 
     def month_calendar(options = {}, &block)
       raise "month_calendar requires a block" unless block
-      render SimpleCalendar::MonthCalendar.new(self, options, &block)
+      render SimpleCalendar::MonthCalendar.new(self, options), &block
     end
 
     def week_calendar(options = {}, &block)
       raise "week_calendar requires a block" unless block
-      render SimpleCalendar::WeekCalendar.new(self, options, &block)
+      render SimpleCalendar::WeekCalendar.new(self, options), &block
     end
   end
 end

data/gemfiles/rails_6_1.gemfile

@@ -6,6 +6,7 @@ gem "appraisal", github: "thoughtbot/appraisal"
 gem "standard"
 gem "puma"
 gem "sqlite3"
+gem "web-console", "~> 4.2", group: :development
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_6_1.gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ..
   specs:
-    simple_calendar (3.0.0)
+    simple_calendar (3.0.1)
       rails (>= 6.1)
 
 GEM
@@ -76,6 +76,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
+    bindex (0.8.1)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
@@ -204,6 +205,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -221,6 +227,7 @@ DEPENDENCIES
   simple_calendar!
   sqlite3
   standard
+  web-console (~> 4.2)
 
 BUNDLED WITH
    2.4.16

data/gemfiles/rails_7_0.gemfile

@@ -6,6 +6,7 @@ gem "appraisal", github: "thoughtbot/appraisal"
 gem "standard"
 gem "puma"
 gem "sqlite3"
+gem "web-console", "~> 4.2", group: :development
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_7_0.gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ..
   specs:
-    simple_calendar (3.0.0)
+    simple_calendar (3.0.1)
       rails (>= 6.1)
 
 GEM
@@ -82,6 +82,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
+    bindex (0.8.1)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
@@ -200,6 +201,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -217,6 +223,7 @@ DEPENDENCIES
   simple_calendar!
   sqlite3
   standard
+  web-console (~> 4.2)
 
 BUNDLED WITH
    2.4.16

data/gemfiles/rails_main.gemfile

@@ -6,6 +6,7 @@ gem "appraisal", github: "thoughtbot/appraisal"
 gem "standard"
 gem "puma"
 gem "sqlite3"
+gem "web-console", "~> 4.2", group: :development
 gem "rails", github: "rails/rails"
 
 gemspec path: "../"

data/gemfiles/rails_main.gemfile.lock

@@ -106,13 +106,14 @@ GIT
 PATH
   remote: ..
   specs:
-    simple_calendar (3.0.0)
+    simple_calendar (3.0.1)
       rails (>= 6.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ast (2.4.2)
+    bindex (0.8.1)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
@@ -223,6 +224,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
     webrick (1.8.1)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -241,6 +247,7 @@ DEPENDENCIES
   simple_calendar!
   sqlite3
   standard
+  web-console (~> 4.2)
 
 BUNDLED WITH
    2.4.16

data/lib/simple_calendar/calendar.rb

@@ -21,7 +21,8 @@ module SimpleCalendar
       @params.merge!(@options.fetch(:params, {}))
     end
 
-    def render_in(view_context)
+    def render_in(view_context, &block)
+      @block = block
       view_context.render(
         partial: partial_name,
         locals: locals

data/lib/simple_calendar/engine.rb

@@ -1,9 +1,4 @@
 module SimpleCalendar
   class Engine < Rails::Engine
-    initializer "simple_calendar.view_helpers" do
-      ActiveSupport.on_load(:action_view) do
-        include ViewHelpers
-      end
-    end
   end
 end

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/simple_calendar.rb

@@ -1,13 +1,7 @@
-require "simple_calendar/engine"
-require "simple_calendar/calendar"
-require "simple_calendar/month_calendar"
-require "simple_calendar/week_calendar"
-require "simple_calendar/version"
-require "simple_calendar/view_helpers"
-
 module SimpleCalendar
-  autoload :Calendar, "simple_calendar/calendar"
-  autoload :MonthCalendar, "simple_calendar/month_calendar"
-  autoload :WeekCalendar, "simple_calendar/week_calendar"
-  autoload :ViewHelpers, "simple_calendar/view_helpers"
+  require_relative "simple_calendar/calendar"
+  require_relative "simple_calendar/engine"
+  require_relative "simple_calendar/month_calendar"
+  require_relative "simple_calendar/version"
+  require_relative "simple_calendar/week_calendar"
 end

data/test/dummy/app/calendars/business_week_calendar.rb

@@ -0,0 +1,9 @@
+class BusinessWeekCalendar < SimpleCalendar::Calendar
+  private
+
+  def date_range
+    beginning = start_date.beginning_of_week + 1.day
+    ending = start_date.end_of_week - 1.day
+    (beginning..ending).to_a
+  end
+end

data/test/dummy/app/controllers/meetings_controller.rb

@@ -6,6 +6,10 @@ class MeetingsController < ApplicationController
     @meetings = Meeting.all
   end
 
+  def business_week
+    @meetings = Meeting.all
+  end
+
   # GET /meetings/1
   def show
   end

data/test/dummy/app/views/meetings/_business_week_calendar.html.erb

@@ -0,0 +1,33 @@
+<div class="simple-calendar">
+  <div class="calendar-heading">
+    <span class="calendar-title"><%= t('date.month_names')[start_date.month] %> <%= start_date.year %></span>
+
+    <nav>
+      <%= link_to t('simple_calendar.previous', default: 'Previous'), calendar.url_for_previous_view %>
+      <%= link_to t('simple_calendar.today', default: 'Today'), calendar.url_for_today_view %>
+      <%= link_to t('simple_calendar.next', default: 'Next'), calendar.url_for_next_view %>
+    </nav>
+  </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 %>
+              <% instance_exec(day, calendar.sorted_events_for(day), &passed_block) %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/test/dummy/app/views/meetings/business_week.html.erb

@@ -0,0 +1,24 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Meetings</h1>
+<%= render BusinessWeekCalendar.new(self, events: @meetings) do |date, meetings| %>
+  <%= date %>
+
+  <% meetings.each do |meeting| %>
+    <div>
+      <%= meeting.name %>
+    </div>
+  <% end %>
+<% end %>
+
+<div id="meetings">
+  <% @meetings.each do |meeting| %>
+    <%= render meeting %>
+    <p>
+      <%= link_to "Show this meeting", meeting %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New meeting", new_meeting_path %>
+<%= Time.current.beginning_of_month %>

data/test/dummy/config/routes.rb

@@ -1,5 +1,9 @@
 Rails.application.routes.draw do
-  resources :meetings
+  resources :meetings do
+    collection do
+      get :business_week
+    end
+  end
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 
   # Defines the root path route ("/")

data/test/dummy/db/schema.rb

@@ -10,11 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_09_30_184313) do
+ActiveRecord::Schema[7.0].define(version: 2022_09_30_184313) do
   create_table "meetings", force: :cascade do |t|
     t.string "name"
-    t.datetime "start_time"
-    t.datetime "end_time"
+    t.datetime "start_time", precision: nil
+    t.datetime "end_time", precision: nil
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

data/test/integrations/custom_calendar_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+
+class CustomCalendarIntegrationTest < ActionDispatch::IntegrationTest
+  test "renders a custom calendar" do
+    get business_week_meetings_path
+    assert_select "div.simple-calendar"
+  end
+
+  test "calendar renders events" do
+    get business_week_meetings_path
+    assert_select "div.simple-calendar" do
+      assert_select "div", text: meetings(:one_day_event).name
+    end
+  end
+
+  test "calendar render two day events" do
+    event = meetings(:two_day_event)
+    get business_week_meetings_path, params: {start_date: event.start_time.to_date}
+    assert_select "div.simple-calendar" do
+      assert_select "div", text: event.name, count: 2
+    end
+  end
+
+  test "calendar render three day events" do
+    event = meetings(:three_day_event)
+    get business_week_meetings_path, params: {start_date: event.start_time.to_date}
+    assert_select "div.simple-calendar" do
+      assert_select "div", text: event.name, count: 3
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/simple_calendar.scss
+- app/helpers/simple_calendar/calendar_helper.rb
 - app/views/simple_calendar/_calendar.html.erb
 - app/views/simple_calendar/_month_calendar.html.erb
 - app/views/simple_calendar/_week_calendar.html.erb
@@ -61,7 +62,6 @@ files:
 - lib/simple_calendar/engine.rb
 - lib/simple_calendar/month_calendar.rb
 - lib/simple_calendar/version.rb
-- lib/simple_calendar/view_helpers.rb
 - lib/simple_calendar/week_calendar.rb
 - simple_calendar.gemspec
 - test/calendars/calendar_test.rb
@@ -70,6 +70,7 @@ files:
 - test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/calendars/business_week_calendar.rb
 - test/dummy/app/channels/application_cable/channel.rb
 - test/dummy/app/channels/application_cable/connection.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -85,8 +86,10 @@ files:
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/layouts/mailer.html.erb
 - test/dummy/app/views/layouts/mailer.text.erb
+- test/dummy/app/views/meetings/_business_week_calendar.html.erb
 - test/dummy/app/views/meetings/_form.html.erb
 - test/dummy/app/views/meetings/_meeting.html.erb
+- test/dummy/app/views/meetings/business_week.html.erb
 - test/dummy/app/views/meetings/edit.html.erb
 - test/dummy/app/views/meetings/index.html.erb
 - test/dummy/app/views/meetings/new.html.erb
@@ -122,13 +125,8 @@ files:
 - test/dummy/public/apple-touch-icon.png
 - test/dummy/public/favicon.ico
 - test/dummy/storage/.keep
-- test/dummy/tmp/.keep
-- test/dummy/tmp/development_secret.txt
-- test/dummy/tmp/pids/.keep
-- test/dummy/tmp/pids/server.pid
-- test/dummy/tmp/restart.txt
-- test/dummy/tmp/storage/.keep
 - test/fixtures/meetings.yml
+- test/integrations/custom_calendar_test.rb
 - test/integrations/month_calendar_test.rb
 - test/simple_calendar_test.rb
 - test/test_helper.rb
@@ -151,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: A simple Rails calendar

data/test/dummy/tmp/development_secret.txt

@@ -1 +0,0 @@
-385417154446f2326be01378c4937623ff31b03c81fa45edeb89225c92e037918243b1ed9d16713314411fb6ed3cf2962bfaafcc1996a54322180368477bca66

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-10208