koalagator 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f8712a5ef672d537bed87b595cb922df6e99b950337ce5334c684f60a91bf7
-  data.tar.gz: 75a69edda40e9d88de1e63f7f367e134f0fc4a45577a17b7d9e4043c9c127708
+  metadata.gz: 9b3dd285966341d3681b39cad40f0ab07fe762be10479b1b0153f53fcda8a51b
+  data.tar.gz: 067ea9c4a92d31fe94428b93ac485122846df8af9928f84c7c34fece425bec61
 SHA512:
-  metadata.gz: 45aea74561e345bede5e08ec98f188e5fc82eeeabc22e4048d6facf5cbe33ad006fbf36b1ff3ab4fe29039836a23c67730c3fcb26a1bff8e6ec1fb49c083a0fd
-  data.tar.gz: fe9df256d44b947aa56ad5fd36f22dfaa249682d3cd6de6e46b14419a123f2d326b13a5dd6e8d2c60c8f7200f00d40988de25c7042dfb572e842f3788765b965
+  metadata.gz: f32f5b06541e8f945aaf9fb952fe93b71de08aef0ba685d198e397f44050e7fabb52e73c89de56a40a47325f42ddf8be3563270f1656773a79587b86985e7f41
+  data.tar.gz: 14e515d7af748832c2309f4f4b6dac10937e07829942afd05a8ab7d88ac40ed63228ababbb27d0233c74fa4785bfc7e707b6f8c654bafc5a178f42605cd22930

data/app/controllers/calagator/application_controller.rb

@@ -34,7 +34,7 @@ module Calagator
 
     def self.require_admin(options = {})
       http_basic_authenticate_with(
-        options.reverse_merge(
+        **options.reverse_merge(
           name: Calagator.admin_username,
           password: Calagator.admin_password,
           if: proc { Calagator.admin_username && Calagator.admin_password }

data/app/models/calagator/event/ical_renderer.rb

@@ -24,7 +24,7 @@ module Calagator
       end
 
       def self.render_icalendar(events, opts)
-        RiCal.Calendar do |calendar|
+        cal = RiCal.Calendar do |calendar|
           calendar.prodid = "-//Calagator//EN"
 
           Array(events).each do |event|
@@ -32,7 +32,8 @@ module Calagator
               new(event, opts).add_event_to(entry)
             end
           end
-        end.export
+        end
+        cal.export
       end
 
       def self.add_name(output)

data/app/models/calagator/event.rb

@@ -49,8 +49,8 @@ module Calagator
     include ActiveModel::Serializers::Xml
 
     # Associations
-    belongs_to :venue, counter_cache: true
-    belongs_to :source
+    belongs_to :venue, counter_cache: true, optional: true
+    belongs_to :source, optional: true
 
     # Validations
     validates :title, :description, :url, denylist: true

data/app/models/calagator/venue.rb

@@ -51,7 +51,7 @@ module Calagator
 
     # Associations
     has_many :events, -> { non_duplicates }, dependent: :nullify
-    belongs_to :source
+    belongs_to :source, optional: true
 
     # Triggers
     strip_whitespace! :title, :description, :address, :url, :street_address, :locality, :region, :postal_code, :country, :email, :telephone

data/bin/calagator

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require_relative '../lib/calagator/version'
+
 USAGE = <<~END
+  Calagator: v#{Calagator::VERSION}
   calagator: setup Calagator in a new or existing Rails application
 
   Usage:
@@ -17,10 +20,6 @@ USAGE = <<~END
       In the case of `calagator new`, all other options will be passed along
       to `rails new`; see `rails new --help` for supported options.
 
-      To generate an app using a specific Rails version, e.g. for 4.2.1:
-
-        calagator _4.2.1_ new my_great_calendar
-
   calagator install: install Calagator into an existing Rails application
 
       Options:
@@ -33,7 +32,7 @@ command = ARGV.shift
 
 case command
 when /_\d+\.\d+\.\d+_/, 'new'
-  system "rails #{command} #{ARGV.join(' ')} -m #{TEMPLATE_PATH} --skip-bundle"
+  system "rails #{command} #{ARGV.join(' ')} -m #{TEMPLATE_PATH} --skip-bundle --skip-javascript" # Skip Webpack on Rails 6 as we're on our way to Rails 7.
 when 'install'
   system "bundle exec rake rails:template LOCATION=#{TEMPLATE_PATH}"
 else

data/lib/calagator/duplicate_checking.rb

@@ -92,7 +92,7 @@ module Calagator
           cattr_accessor(:_duplicate_finding_scope) { -> { all } }
           cattr_accessor(:_after_squashing_duplicates) { ->(primary) {} }
 
-          belongs_to :duplicate_of, class_name: name, foreign_key: DUPLICATE_MARK_COLUMN
+          belongs_to :duplicate_of, class_name: name, foreign_key: DUPLICATE_MARK_COLUMN, optional: true
           has_many :duplicates, class_name: name, foreign_key: DUPLICATE_MARK_COLUMN
 
           scope :marked_duplicates, -> { where("#{table_name}.#{DUPLICATE_MARK_COLUMN} IS NOT NULL") }

data/lib/calagator/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Calagator
-  VERSION = "2.1.1"
+  VERSION = "3.0.0"
+  RAILS_VERSION = "~> 6.1"
 end

data/lib/generators/calagator/install_generator.rb

@@ -15,9 +15,9 @@ module Calagator
       add_seeds
       run "rm -f public/index.html"
       unless options[:test_app]
-        rake "calagator:install:migrations"
-        rake "db:migrate"
-        rake "db:test:prepare"
+        rails_command "calagator:install:migrations"
+        rails_command "db:migrate"
+        rails_command "db:test:prepare"
       end
     end
 
@@ -34,11 +34,16 @@ module Calagator
     end
 
     def add_javascripts
-      append_file "app/assets/javascripts/application.js", "//= require calagator"
+      create_file "app/assets/javascripts/application.js", "//= require calagator"
     end
 
     def add_stylesheets
-      append_file "app/assets/stylesheets/application.css", "//= require calagator"
+      insert_into_file "app/assets/stylesheets/application.css", before: "*/" do
+        <<-STR.strip_heredoc
+
+          //= require calagator
+        STR
+      end
     end
 
     def add_assets

data/rails_template.rb

@@ -2,15 +2,14 @@
 
 require "rubygems"
 require "pathname"
-
-RAILS_REQUIREMENT = "~> 5.2"
+require_relative './lib/calagator/version'
 
 def assert_minimum_rails_version
-  requirement = Gem::Requirement.new(RAILS_REQUIREMENT)
+  requirement = Gem::Requirement.new(Calagator::RAILS_VERSION)
   rails_version = Gem::Version.new(Rails::VERSION::STRING)
   return if requirement.satisfied_by?(rails_version)
 
-  puts "Calagator requires Rails #{RAILS_REQUIREMENT}. You are using #{rails_version}."
+  puts "Calagator requires Rails #{Calagator::RAILS_VERSION}. You are using #{rails_version}."
   exit 1
 end
 
@@ -42,17 +41,15 @@ gem_group :development, :test do
   end
 end
 
-gem "calagator", (generating_test_app && {path: relative_calagator_path.to_s})
+gem "calagator", Calagator::VERSION, (generating_test_app ? {path: relative_calagator_path.to_s} : {})
 run "bundle install"
-rake "db:create"
+rails_command "db:create"
 inside("app/assets") do
-  create_file("config/manifest.js") do
+  append_to_file("config/manifest.js") do
     <<-MANIFEST.strip_heredoc
       //= link application.js
       //= link application.css
-      //= link calagator/manifest.js
     MANIFEST
   end
 end
-generate "calagator:install", (generating_test_app && "--test_app")
-generate "sunspot_rails:install"
+generate "calagator:install", "--test-app #{generating_test_app}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koalagator
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Koalagator team
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
   requirement: !ruby/object:Gem::Requirement
@@ -284,28 +284,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.1
+        version: '11.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.1
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: paper_trail_manager_rails_5
+  name: demingfactor-paper_trail_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -382,14 +382,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -486,14 +486,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -508,20 +508,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.4
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -570,14 +556,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -1056,7 +1042,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A calendar for communities