koalagator 4.1.0 → 5.0.0

data/lib/generators/calagator/templates/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,48 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name, autofocus: true, autocomplete: "username", oninput: "formatNameField(event)", pattern: "[a-z0-9_\-]+" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autocomplete: "email" %>
+  </div>
+
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
+    <% if @minimum_password_length %>
+      <br />
+      <em><%= @minimum_password_length %> characters minimum</em>
+    <% end %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "current-password" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Update" %>
+  </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<div>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %></div>
+
+<%= link_to "Back", :back %>

data/lib/generators/calagator/templates/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,29 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name, autofocus: true, autocomplete: "username", oninput: "formatNameField(event)", pattern: "[a-z0-9_\-]+" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autocomplete: "email" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %>
+    <% if @minimum_password_length %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Sign up" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/calagator/templates/config/initializers/01_calagator.rb

@@ -2,26 +2,54 @@
 
 Calagator.setup do |config|
   # Site name
-  config.title = "Calagator"
+  config.title = "Koalagator"
 
   # Site tagline
   config.tagline = "A Tech Calendar"
 
   # Site URL with trailing slash
-  config.url = "http://my-calagator.org/"
+  config.url = "http://my-koalagator.org/"
 
   # Email address of administrator that will get exception notifications
   # and requests for assistance from users:
   config.administrator_email = "your@email.addr"
 
+  # Enable devise based authentication
+  # Calagator won't load any devise config unless it's enabled,
+  # allowing you to roll your own authentication instead, if desired.
+  # When enabled, users will need to sign up, and be signed in
+  # to create / modify events.
+  # Also configure 'admin_email', 'admin_username', and 'admin_password' for Calagator
+  # to create the initial admin user.
+  # config.devise_enabled = true
+
+  # If devise is enabled, the following will configure authorization
+  # to CRUD various resources.
+  # Valid resources are: changes, events, venues
+  # NOTE: Venues can still be created by events, so it's probably best to put them in same category as events.
+  #
+  # Resources in this category can only be CRUDed by admin users.
+  config.admin_resources = %i[changes]
+  # Resources in this category can be CRUDed by any authenticated user.
+  config.user_resources = %i[events venues]
+
   # Optional username and password to use when accessing /admin pages
+  # config.admin_email = 'admin@e.com'
   # config.admin_username = 'admin'
-  # config.admin_password = ENV['CALAGATOR_ADMIN_PASSWORD']
+  # config.admin_password = ENV['KOALAGATOR_ADMIN_PASSWORD']
+
+  # Emoji used as administrator icon
+  config.admin_icon = "🐨"
+
+  # Configure open registration, if devise is enabled
+  config.open_registration = true
 
   # Search engine to use for searching events.
-  # Values: :sql, :sunspot.
   config.search_engine = :sql
 
+  # Enable caching of views (not recommended for sites with little activity)
+  config.cache_enabled = true
+
   # Set the iCalendar SEQUENCE, which should be increased each time an event
   # is updated. If an admin needs to forcefully increment the SEQUENCE for all
   # events, they can set this icalendar_sequence_offset value to something
@@ -43,10 +71,10 @@ Calagator.setup do |config|
 
   # The tile provider to use when rendering maps with Leaflet.
   # One of: leaflet, stamen, mapbox, google
-  config.mapping_provider = "stamen"
+  config.mapping_provider = "leaflet"
 
   # The tiles to use for the map, see the docs for individual Leaflet plugins.
-  config.mapping_tiles = "terrain"
+  config.mapping_tiles = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
 
   # Other mapping examples:
   #

data/lib/generators/calagator/templates/config/initializers/04_devise.rb

@@ -0,0 +1,314 @@
+# frozen_string_literal: true
+
+# Assuming you have not yet modified this file, each configuration option below
+# is set to its default value. Note that some are commented out while others
+# are not: uncommented lines are intended to protect your configuration from
+# breaking changes in upgrades (i.e., in the event that future versions of
+# Devise change the default values for those options).
+#
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  break unless Calagator.devise_enabled
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = '29d17e0144bcf24c83819e3ab3694d2bca904d86929e83a3363570b00cb271fb6e88b3d548fd8d6a1c7494b8d3bb49c228229b0c4ef0a164ba3f86fc6b639922'
+
+  # ==> Controller configuration
+  # Configure the parent class to the devise controllers.
+  config.parent_controller = "Calagator::ApplicationController"
+
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require "devise/orm/active_record"
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [:email]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:email]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:email]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication.
+  # For API-only applications to support authentication "out-of-the-box", you will likely want to
+  # enable this with :database unless you are using a custom strategy.
+  # The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 12. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  # The number of stretches used for generating the hashed password are stored
+  # with the hashed password. This allows you to change the stretches without
+  # invalidating existing passwords.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # algorithm), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 12
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = '7c60d51f925510234425ffd3e9a0425cc59da9c16cf12ef282bde4c38c46d6ce8926df2ead4ddbba01efab69199a8848addbe42453ce41c5f645315730f41a8c'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day.
+  # You can also set it to nil, which will allow the user to access the website
+  # without confirming their account.
+  # Default is 0.days, meaning the user cannot access the website without
+  # confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [:email]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 6..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [:email]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [:email]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms from others authentication tools as
+  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+  # for default behavior) and :restful_authentication_sha1 (then you should set
+  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html, :turbo_stream]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  config.router_name = :calagator
+  #
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+  # ==> Hotwire/Turbo configuration
+  # When using Devise with Hotwire/Turbo, the http status for error responses
+  # and some redirects must match the following. The default in Devise for existing
+  # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
+  # these new defaults that match Hotwire/Turbo behavior.
+  # Note: These might become the new default in future versions of Devise.
+  config.responder.error_status = :unprocessable_entity
+  config.responder.redirect_status = :see_other
+
+  # ==> Configuration for :registerable
+
+  # When set to false, does not sign a user in automatically after their password is
+  # changed. Defaults to true, so a user is signed in automatically after changing a password.
+  # config.sign_in_after_change_password = true
+end

data/lib/{calagator.rb → koalagator.rb}

@@ -23,17 +23,22 @@ require "jquery-ui-rails"
 require "font-awesome-rails"
 require "paper_trail_manager"
 require "utf8-cleaner"
-require "sunspot_rails"
 require "lucene_query"
 require "rack/contrib/jsonp"
+require "devise"
 
 module Calagator
   mattr_accessor :title,
     :tagline,
     :url,
     :administrator_email,
+    :admin_email,
     :admin_username,
     :admin_password,
+    :admin_icon,
+    :admin_resources,
+    :open_registration,
+    :user_resources,
     :search_engine,
     :icalendar_sequence_offset,
     :mapping_marker_color,
@@ -41,12 +46,16 @@ module Calagator
     :mapping_provider,
     :mapping_tiles,
     :venues_map_options,
-    :denylist_patterns
+    :denylist_patterns,
+    :devise_enabled,
+    :cache_enabled,
+    :tag_cloud_min
 
-  self.title = "Calagator"
+  self.title = NAME
   self.tagline = "A Tech Calendar"
   self.url = "http://my-calagator.org/"
   self.administrator_email = "your@email.addr"
+  self.open_registration = true
   self.search_engine = :sql
   self.icalendar_sequence_offset = 0
   self.mapping_marker_color = "green"
@@ -57,6 +66,9 @@ module Calagator
     /\b(online|overseas).+(drugstore|pharmacy)\b/,
     /\bcialis\b/
   ]
+  self.devise_enabled = false
+  self.cache_enabled = true
+  self.tag_cloud_min = 10
 
   def self.configure_search_engine
     kind = search_engine.try(:to_sym)

data/lib/paper_trail_manager.rb

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
-require 'rails'
-require 'paper_trail'
+require "rails"
+require "paper_trail"
 
 begin
-  require 'will_paginate'
+  require "will_paginate"
 rescue LoadError
   begin
-    require 'kaminari'
+    require "kaminari"
   rescue LoadError
-    raise LoadError, 'will_paginate or kaminari must be in Gemfile or load_path'
+    raise LoadError, "will_paginate or kaminari must be in Gemfile or load_path"
   end
 end
 
 class PaperTrailManager < Rails::Engine
-  initializer 'paper_trail_manager.pagination' do
+  initializer "paper_trail_manager.pagination" do
     ::ActionView::Base.send(:alias_method, :paginate, :will_paginate) if defined?(WillPaginate)
   end
 
   @@whodunnit_name_method = :name
   cattr_accessor :whodunnit_class, :whodunnit_name_method, :route_helpers,
-                 :layout, :base_controller, :user_path_method, :item_name_method
+    :layout, :base_controller, :user_path_method, :item_name_method
 
-  self.base_controller = 'ApplicationController'
+  self.base_controller = "ApplicationController"
   self.user_path_method = :user_path
 
-  (Pathname(__FILE__).dirname + '..').tap do |base|
-    paths['app/controller'] = base + 'app/controllers'
-    paths['app/view'] = base + 'app/views'
+  (Pathname(__FILE__).dirname + "..").tap do |base|
+    paths["app/controller"] = base + "app/controllers"
+    paths["app/view"] = base + "app/views"
   end
 
   cattr_accessor :allow_index_block, :allow_show_block, :allow_revert_block

data/lib/theme_reader.rb

@@ -9,7 +9,7 @@ class ThemeReader
     rails_root = begin
       Rails.root
     rescue
-      File.dirname(File.dirname(__FILE__))
+      File.dirname(__FILE__, 2)
     end
     theme_txt = "#{rails_root}/config/theme.txt"
     if ENV["THEME"]

data/rails_template.rb

@@ -2,14 +2,14 @@
 
 require "rubygems"
 require "pathname"
-require_relative './lib/calagator/version'
+require_relative "lib/calagator/version"
 
 def assert_minimum_rails_version
   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 #{Calagator::RAILS_VERSION}. You are using #{rails_version}."
+  puts "#{Calagator::NAME} requires Rails #{Calagator::RAILS_VERSION}. You are using #{rails_version}."
   exit 1
 end
 
@@ -26,8 +26,8 @@ if options[:database] == "postgresql" && ARGV.any? { |arg| arg =~ /--postgres-us
 end
 
 # FactoryBot and Faker are required for Calagator's db:seed task
-spec = Gem::Specification.load(File.expand_path("calagator.gemspec", __dir__))
-spec ||= Gem::Specification.find_by_name("calagator")
+spec = Gem::Specification.load(File.expand_path("#{Calagator::GEMSPEC}.gemspec", __dir__))
+spec ||= Gem::Specification.find_by_name(Calagator::GEMSPEC)
 required_dev_gems = %w[factory_bot_rails faker]
 
 gem_group :development, :test do
@@ -41,7 +41,7 @@ gem_group :development, :test do
   end
 end
 
-gem "calagator", Calagator::VERSION, (generating_test_app ? {path: relative_calagator_path.to_s} : {})
+gem Calagator::GEMSPEC, Calagator::VERSION, (generating_test_app ? {path: relative_calagator_path.to_s} : {})
 run "bundle install"
 rails_command "db:create"
 inside("app/assets") do
@@ -52,4 +52,4 @@ inside("app/assets") do
     MANIFEST
   end
 end
-generate "calagator:install", "--test-app #{generating_test_app}"
+generate "calagator:install", "--test-app #{generating_test_app}"