boring_generators 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c4c0c7499756d66e0d992e4ec79ad105f310b40384a49d99b1a3f96ebfaeab
-  data.tar.gz: '074778686e124d14e6010e6a886b209484abf2774e0836e48631c900738f3ae8'
+  metadata.gz: 1c38ce00aea24f2d84874abeaf67e8fc1e917934b8dc24e7a722c695cd55b75f
+  data.tar.gz: 3373b320ace30d8a04e14af9780b65b819f266712cfd37e676f89872ce157cb5
 SHA512:
-  metadata.gz: 44e5a7cfde50201a16ce39cd6c1e28618efe002229e81f15613278bdfdb5f448a4d02532d974b7fe232742cd5d6b5c55ac9aa851b84cad8bc90c1cb7c9efdb77
-  data.tar.gz: 7ec572ba9730632511e08d4aa6a943a8c97db89ae93c0b5d2db4813b9ece7ac53b586b1690d2f636d1bd7fcff6c46572501ec69752af1008b43c949e1789e456
+  metadata.gz: f9e074f948419ff51132578335b1b9003ba99f73779b535b0a306753a3057dd924833d31eeb12091af4ebbb0db59b0ea5faa207da0ae9e413a6c3c7d61f24f32
+  data.tar.gz: 5c06d9e92fa9b7f5599cdf77d5c391c59adffea7ccdad470e723daa1190bc94ded77b57e4417564b5ebcc53507c3b421b1093b827ea81aaa4ea2786813531df6

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+## 0.7.0 (January 30th, 2021)
+* Upgrade the Tailwind CSS generator to support Tailwind V2.0. ([@abhaynikam][])
+* Adds Devise GitHub Omniauth generator. ([@abhaynikam][])
+
 ## 0.6.0 (January 10th, 2021)
 * Updates default ruby version of GitHub Actions install generator. ([@jamesglover][])
 * Simplify generated GitHub Actions install ([@jamesglover][])

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boring_generators (0.5.0)
+    boring_generators (0.7.0)
       railties
 
 GEM

data/README.md

@@ -61,6 +61,7 @@ The boring generator introduces following generators:
 - Install SimpleForm: `rails generate boring:simple_form:install --css_framework=<css_framework>`
 - Install Devise: `rails generate boring:devise:install`
 - Install Devise Facebook Omniauth: `rails generate boring:oauth:facebook:install`
+- Install Devise GitHub Omniauth: `rails generate boring:oauth:github:install`
 
 ## Development
 

data/lib/boring_generators/version.rb

@@ -1,3 +1,3 @@
 module BoringGenerators
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/generators/boring/oauth/base_generator.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'bundler'
+
+module Boring
+  module Oauth
+    module BaseGenerator
+      def add_provider_and_uuid_user_details
+        say "Adding migration to add provider and uuid columns to users", :green
+        Bundler.with_unbundled_env do
+          run "DISABLE_SPRING=1 bundle exec rails generate migration AddOmniauthToUsers provider:string uid:string"
+        end
+      end
+
+      def configure_devise_omniauth
+        say "Adding omniauth devise configuration", :green
+        if File.exist?("config/initializers/devise.rb")
+          insert_into_file "config/initializers/devise.rb", <<~RUBY, after: /Devise.setup do \|config\|/
+            \n
+            \tconfig.omniauth :#{@oauth_name}, "APP_ID", "APP_SECRET"
+          RUBY
+        else
+          raise MissingDeviseConfigurationError, <<~ERROR
+            Looks like the devise installation is incomplete. Could not find devise.rb in config/initializers.
+          ERROR
+        end
+      end
+
+      def add_omniauth_callback_routes
+        devise_route = '# devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }'.dup
+        route devise_route
+      end
+
+      def add_omniauth_callback_controller
+        say "Copying omniauth_callbacks_controller.rb", :green
+        template("omniauth_callbacks_controller.rb", "app/controllers/users/omniauth_callbacks_controller.rb")
+      end
+
+      def configure_and_add_devise_setting_in_user_model
+        say "Configuring #{@oauth_name.to_s} omniauth for user model", :green
+        insert_into_file "app/models/user.rb", <<~RUBY, after: /class User < ApplicationRecord/
+          \n\tdevise :omniauthable, omniauth_providers: %i[#{@oauth_name}]
+
+          \tdef self.from_omniauth(auth)
+            \twhere(provider: auth.provider, uid: auth.uid).first_or_create do |user|
+              \tuser.email = auth.info.email
+              \tuser.password = Devise.friendly_token[0, 20]
+              \tuser.name = auth.info.name   # assuming the user model has a name
+              \t# user.image = auth.info.image # assuming the user model has an image
+              \t# If you are using confirmable and the provider(s) you use validate emails,
+              \t# uncomment the line below to skip the confirmation emails.
+              \t# user.skip_confirmation!
+            \tend
+          \tend
+        RUBY
+      end
+
+      def show_readme
+        readme "README"
+      end
+    end
+  end
+end

data/lib/generators/boring/oauth/facebook/install/install_generator.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'bundler'
+require 'generators/boring/oauth/base_generator'
 
 module Boring
   module Oauth
     module Facebook
       class InstallGenerator < Rails::Generators::Base
+        include Boring::Oauth::BaseGenerator
+
         class MissingDeviseConfigurationError < StandardError; end
 
         desc "Adds facebook OmniAuth to the application"
@@ -24,66 +27,14 @@ module Boring
           end
         end
 
-        def add_provider_and_uuid_user_details
-          say "Adding migration to add provider and uuid columns to users", :green
-          Bundler.with_unbundled_env do
-            run "DISABLE_SPRING=1 bundle exec rails generate migration AddOmniauthToUsers provider:string uid:string"
-          end
-        end
-
-        def configure_devise_omniauth_facebook
-          say "Adding omniauth devise configuration", :green
-          if File.exist?("config/initializers/devise.rb")
-            insert_into_file "config/initializers/devise.rb", <<~RUBY, after: /Devise.setup do \|config\|/
-              \n
-              \tconfig.omniauth :facebook, "APP_ID", "APP_SECRET"
-            RUBY
-          else
-            raise MissingDeviseConfigurationError, <<~ERROR
-              Looks like the devise installation is incomplete. Could not find devise.rb in config/initializers.
-            ERROR
-          end
-        end
-
-        def add_omniauth_callback_routes
-          devise_route = '# devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }'.dup
-          route devise_route
-        end
-
-        def add_omniauth_callback_controller
-          say "Copying omniauth_callbacks_controller.rb", :green
-          template("omniauth_callbacks_controller.rb", "app/controllers/users/omniauth_callbacks_controller.rb")
-        end
-
-        def configure_and_add_devise_setting_in_user_model
-          say "Configuring facebook omniauth for user model", :green
-          insert_into_file "app/models/user.rb", <<~RUBY, after: /class User < ApplicationRecord/
-
-              \tdevise :omniauthable, omniauth_providers: %i[facebook]
-
-              \tdef self.from_omniauth(auth)
-                \twhere(provider: auth.provider, uid: auth.uid).first_or_create do |user|
-                  \tuser.email = auth.info.email
-                  \tuser.password = Devise.friendly_token[0, 20]
-                  \tuser.name = auth.info.name   # assuming the user model has a name
-                  \t# user.image = auth.info.image # assuming the user model has an image
-                  \t# If you are using confirmable and the provider(s) you use validate emails,
-                  \t# uncomment the line below to skip the confirmation emails.
-                  \t# user.skip_confirmation!
-                \tend
-              \tend
-          RUBY
-        end
-
-        def add_the_facebook_devise_omniauth_view
-          insert_into_file "app/views/users/sessions/new.html.erb", <<~RUBY, after: /<%= render "users\/shared\/links" %>/
-
-            <%= link_to "Sign in with Facebook", user_facebook_omniauth_authorize_path %>
-          RUBY
-        end
-
-        def show_readme
-          readme "README"
+        def invoke_common_generator_methods
+          @oauth_name = :facebook
+          add_provider_and_uuid_user_details
+          configure_devise_omniauth
+          add_omniauth_callback_routes
+          add_omniauth_callback_controller
+          configure_and_add_devise_setting_in_user_model
+          show_readme
         end
       end
     end

data/lib/generators/boring/oauth/facebook/install/templates/README

@@ -16,9 +16,5 @@ Some setup you must do manually if you haven't yet:
      For example:
 
      config.omniauth :facebook, "APP_ID", "APP_SECRET"
-  3. Ensure you have added the facebook omniauth route in the devise session view:
-     For example:
-
-     <%= link_to "Sign in with Facebook", user_facebook_omniauth_authorize_path %>
 
 ===============================================================================

data/lib/generators/boring/oauth/github/install/install_generator.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'bundler'
+require 'generators/boring/oauth/base_generator'
+
+module Boring
+  module Oauth
+    module Github
+      class InstallGenerator < Rails::Generators::Base
+        include Boring::Oauth::BaseGenerator
+
+        class MissingDeviseConfigurationError < StandardError; end
+
+        desc "Adds GitHub OmniAuth to the application"
+        source_root File.expand_path("templates", __dir__)
+
+        def add_github_omniauth_gem
+          say "Adding GitHub OmniAuth gem", :green
+          github_omniauth_gem = <<~RUBY
+            \n
+            # for omniauth github
+            gem 'omniauth-github', '~> 1.4.0'
+          RUBY
+          append_to_file "Gemfile", github_omniauth_gem
+          Bundler.with_unbundled_env do
+            run "bundle install"
+          end
+        end
+
+        def invoke_common_generator_methods
+          @oauth_name = :github
+          add_provider_and_uuid_user_details
+          configure_devise_omniauth
+          add_omniauth_callback_routes
+          add_omniauth_callback_controller
+          configure_and_add_devise_setting_in_user_model
+          show_readme
+        end
+      end
+    end
+  end
+end

data/lib/generators/boring/oauth/github/install/templates/README

@@ -0,0 +1,20 @@
+===============================================================================
+
+Some setup you must do manually if you haven't yet:
+
+  1. Ensure you have overridden or uncommented the routes for generated omniauth callback controllers in your routes.rb.
+     For example:
+
+     Rails.application.routes.draw do
+       devise_for :users, controllers: {
+         omniauth_callbacks: "users/omniauth_callbacks"
+       }
+     end
+
+  2. Update the devise github omniauth APP_ID and APP_SECRET in "config/initializers/devise.rb"
+     after registering the Rails application on: https://github.com/settings/applications/new
+     For example:
+
+     config.omniauth :github, "APP_ID", "APP_SECRET"
+
+===============================================================================

data/lib/generators/boring/oauth/github/install/templates/omniauth_callbacks_controller.rb

@@ -0,0 +1,21 @@
+class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  # See https://github.com/omniauth/omniauth/wiki/FAQ#rails-session-is-clobbered-after-callback-on-developer-strategy
+  skip_before_action :verify_authenticity_token, only: :github
+
+  def github
+    # You need to implement the method below in your model (e.g. app/models/user.rb)
+    @user = User.from_omniauth(request.env["omniauth.auth"])
+
+    if @user.persisted?
+      sign_in_and_redirect @user, event: :authentication #this will throw if @user is not activated
+      set_flash_message(:notice, :success, kind: "GitHub") if is_navigational_format?
+    else
+      session["devise.github_data"] = request.env["omniauth.auth"].except(:extra) # Removing extra as it can overflow some session stores
+      redirect_to new_user_registration_url
+    end
+  end
+
+  def failure
+    redirect_to root_path
+  end
+end

data/lib/generators/boring/tailwind/install/install_generator.rb

@@ -6,18 +6,12 @@ module Boring
       desc "Adds Tailwind CSS to the application"
       source_root File.expand_path("templates", __dir__)
 
-      class_option :skip_tailwind_css_ui,    type: :boolean, aliases: "-sui",
-                                             desc: "Skip adding @tailwindcss/ui package"
       class_option :skip_tailwind_init_full, type: :boolean, aliases: "-sif",
                                              desc: "Skip running tailwindcss init with --full option"
 
       def add_tailwind_package
         say "Adding tailwind package", :green
-        if options[:skip_tailwind_css_ui]
-          run "yarn add tailwindcss"
-        else
-          run "yarn add tailwindcss @tailwindcss/ui"
-        end
+        run "yarn add tailwindcss@latest postcss@latest autoprefixer@latest"
       end
 
       def create_tailwind_config
@@ -54,9 +48,12 @@ module Boring
 
       def insert_stylesheet_in_the_application
         if File.exist?("app/javascript/packs/application.js")
-          append_to_file "app/javascript/packs/application.js" do
-            'import "stylesheets/application"'
-          end
+          stylesheet_tailwind_imports = <<~RUBY
+            \n
+            import "stylesheets/application"
+          RUBY
+
+          append_to_file "app/javascript/packs/application.js", stylesheet_tailwind_imports
         else
           say <<~WARNING, :red
             ERROR: Looks like the webpacker installation is incomplete. Could not find application.js in app/javascript/packs.
@@ -69,6 +66,10 @@ module Boring
           \t\t<%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
         RUBY
       end
+
+      def show_readme
+        readme "README"
+      end
     end
   end
 end

data/lib/generators/boring/tailwind/install/templates/README

@@ -0,0 +1,13 @@
+===============================================================================
+
+Some setup you must do manually if you haven't yet:
+
+  Current webpacker version relies on the older version of PostCSS.
+  Tailwind 2.0 doesn't support the older version of PostCSS. Please
+  update package.json to update webpacker version.
+
+    ```
+      "@rails/webpacker": "rails/webpacker#b6c2180",
+    ```
+
+===============================================================================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boring_generators
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Abhay Nikam
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -79,10 +79,14 @@ files:
 - lib/generators/boring/graphql/install/templates/base_resolver.rb
 - lib/generators/boring/graphql/install/templates/hello_world_resolver.rb
 - lib/generators/boring/jquery/install/install_generator.rb
+- lib/generators/boring/oauth/base_generator.rb
 - lib/generators/boring/oauth/facebook/install/install_generator.rb
 - lib/generators/boring/oauth/facebook/install/templates/README
 - lib/generators/boring/oauth/facebook/install/templates/omniauth.rb
 - lib/generators/boring/oauth/facebook/install/templates/omniauth_callbacks_controller.rb
+- lib/generators/boring/oauth/github/install/install_generator.rb
+- lib/generators/boring/oauth/github/install/templates/README
+- lib/generators/boring/oauth/github/install/templates/omniauth_callbacks_controller.rb
 - lib/generators/boring/pry/install/install_generator.rb
 - lib/generators/boring/pry/install/templates/pryrc
 - lib/generators/boring/pundit/install/install_generator.rb
@@ -90,6 +94,7 @@ files:
 - lib/generators/boring/rubocop/install/templates/.rubocop.yml.tt
 - lib/generators/boring/simple_form/install/install_generator.rb
 - lib/generators/boring/tailwind/install/install_generator.rb
+- lib/generators/boring/tailwind/install/templates/README
 - lib/generators/boring/tailwind/install/templates/application.scss
 - tmp/templates/app_template/.ruby-version
 - tmp/templates/app_template/Gemfile