From 895bc66ceb9e89a386be2cdaa3062b04c80474ce Mon Sep 17 00:00:00 2001 From: Mina Mikhail Date: Sat, 27 May 2017 11:23:17 -0400 Subject: [PATCH 1/3] Need to require rails/generators explicitly for custom generators --- lib/generators/knock/install_generator.rb | 2 ++ lib/generators/knock/token_controller_generator.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/generators/knock/install_generator.rb b/lib/generators/knock/install_generator.rb index cb68723..91e3cde 100644 --- a/lib/generators/knock/install_generator.rb +++ b/lib/generators/knock/install_generator.rb @@ -1,3 +1,5 @@ +require 'rails/generators' + module Knock class InstallGenerator < Rails::Generators::Base source_root File.expand_path("../../templates", __FILE__) diff --git a/lib/generators/knock/token_controller_generator.rb b/lib/generators/knock/token_controller_generator.rb index 4feab90..369dad6 100644 --- a/lib/generators/knock/token_controller_generator.rb +++ b/lib/generators/knock/token_controller_generator.rb @@ -1,3 +1,5 @@ +require 'rails/generators' + module Knock class TokenControllerGenerator < Rails::Generators::Base source_root File.expand_path("../../templates", __FILE__) From 407119820d0357e292420a4c29447255d4de1ba5 Mon Sep 17 00:00:00 2001 From: Mina Mikhail Date: Sat, 27 May 2017 11:27:05 -0400 Subject: [PATCH 2/3] Update CHANGELOG to reflect fix --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3061749..540ed45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Fixed +- Require `rails/generators` in custom generators to fix `uninitialized constant Generators::Base` + ## [2.1.1] - 2017-02-11 ### Fixed - Stop trying to retrieve user from empty payload when no token is given From bf8b2d6c33761f5ba0768a705756bdeb527e439e Mon Sep 17 00:00:00 2001 From: Mina Mikhail Date: Tue, 30 May 2017 15:30:33 -0400 Subject: [PATCH 3/3] Set ActiveRecord::Migration version to 4.2 on test/dummy migrations --- test/dummy/db/migrate/20150713101607_create_users.rb | 2 +- test/dummy/db/migrate/20160519075733_create_admins.rb | 2 +- test/dummy/db/migrate/20160522051816_create_vendors.rb | 2 +- .../db/migrate/20160522181712_create_composite_name_entities.rb | 2 +- test/dummy/db/migrate/20161127203222_create_v1_users.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/dummy/db/migrate/20150713101607_create_users.rb b/test/dummy/db/migrate/20150713101607_create_users.rb index e2fdb6f..7c99889 100644 --- a/test/dummy/db/migrate/20150713101607_create_users.rb +++ b/test/dummy/db/migrate/20150713101607_create_users.rb @@ -1,4 +1,4 @@ -class CreateUsers < ActiveRecord::Migration +class CreateUsers < ActiveRecord::Migration[4.2] def change create_table :users do |t| t.string :email, unique: true, null: false diff --git a/test/dummy/db/migrate/20160519075733_create_admins.rb b/test/dummy/db/migrate/20160519075733_create_admins.rb index 31bfd1a..9d72a80 100644 --- a/test/dummy/db/migrate/20160519075733_create_admins.rb +++ b/test/dummy/db/migrate/20160519075733_create_admins.rb @@ -1,4 +1,4 @@ -class CreateAdmins < ActiveRecord::Migration +class CreateAdmins < ActiveRecord::Migration[4.2] def change create_table :admins do |t| t.string :email diff --git a/test/dummy/db/migrate/20160522051816_create_vendors.rb b/test/dummy/db/migrate/20160522051816_create_vendors.rb index f020eb3..317114a 100644 --- a/test/dummy/db/migrate/20160522051816_create_vendors.rb +++ b/test/dummy/db/migrate/20160522051816_create_vendors.rb @@ -1,4 +1,4 @@ -class CreateVendors < ActiveRecord::Migration +class CreateVendors < ActiveRecord::Migration[4.2] def change create_table :vendors do |t| t.string :email diff --git a/test/dummy/db/migrate/20160522181712_create_composite_name_entities.rb b/test/dummy/db/migrate/20160522181712_create_composite_name_entities.rb index 23a843a..002acfb 100644 --- a/test/dummy/db/migrate/20160522181712_create_composite_name_entities.rb +++ b/test/dummy/db/migrate/20160522181712_create_composite_name_entities.rb @@ -1,4 +1,4 @@ -class CreateCompositeNameEntities < ActiveRecord::Migration +class CreateCompositeNameEntities < ActiveRecord::Migration[4.2] def change create_table :composite_name_entities do |t| t.string :email diff --git a/test/dummy/db/migrate/20161127203222_create_v1_users.rb b/test/dummy/db/migrate/20161127203222_create_v1_users.rb index 8e7dd58..7fc13d3 100644 --- a/test/dummy/db/migrate/20161127203222_create_v1_users.rb +++ b/test/dummy/db/migrate/20161127203222_create_v1_users.rb @@ -1,4 +1,4 @@ -class CreateV1Users < ActiveRecord::Migration +class CreateV1Users < ActiveRecord::Migration[4.2] def change create_table :v1_users do |t|