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 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__) 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|