genkan 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b707a06612a4153b202cfd115524188a225616
-  data.tar.gz: bfcb96dfe377a7ec1a94624e783c9e24240e15ac
+  metadata.gz: c307f7abb2b38ee3287f779669caea8f91e82c4b
+  data.tar.gz: b9a3e6ecff992de2c1f0ab7ddcaf587dbe7bc669
 SHA512:
-  metadata.gz: 4bbb1c7e0f5ce0e1f061a6843f4b5097d7600e066d59ca1fbbbdc59aaee7df14f9d21ae5962d00978b0e0dbe8a84cc94beee7b11e2aad8bae8dbb378f31fdf2c
-  data.tar.gz: '058b9000035366576de9b62c3acc433a23d6bae160e762c2366e72859696748f1b633ddccd00e9c72dc58b58fe9f16b1f968c65d1bff4405bfa0d4952f0d058c'
+  metadata.gz: d61ee0cf2c60f858cf557bd6fba6a4f9a3f6fd45fc76e6f5fe7b88f2b7f5a2e80c0afbeac925ee9925ddff0cb7a324ed99583c75bd38cd7bef0dd82473b85c90
+  data.tar.gz: 7d9a8b435dd182b2b56508433f55f13a921f12ef005162d7e9ae7e0511e50e5ecb48a6c6b02d4e8cb8dbb62a44c894cf8725227b65b9b9445174ef8a7af94c93

data/README.md

@@ -56,9 +56,10 @@ Some setup you must do manually if you haven't yet:
         ENV['GOOGLE_OAUTH_CLIENT_ID'],
         ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
         {
-          name:  'google',
-          scope: 'email',
-          hd:    'host-domain.com'
+          name:       'google',
+          scope:      'email',
+          hd:         'host-domain.com',
+          verify_iss: false,
         }
       )
     end

data/Rakefile

@@ -1,25 +1,25 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Genkan'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "Genkan"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 

data/app/controllers/concerns/genkan/authenticatable.rb

@@ -1,5 +1,5 @@
 module Genkan
-   module Authenticatable
+  module Authenticatable
     include Genkan::Helper
     extend ActiveSupport::Concern
 
@@ -10,24 +10,24 @@ module Genkan
 
     private
 
-    def authenticate
-      unless logged_in?
-        store_location
-        redirect_to genkan.login_path, notice: t('genkan.sessions.required')
+      def authenticate
+        unless logged_in?
+          store_location
+          redirect_to genkan.login_path, notice: t("genkan.sessions.required")
+        end
       end
-    end
 
-    define_method(current_user_method_name) do
-      instance_variable_get(:"@#{current_user_method_name}") || \
-        instance_variable_set(:"@#{current_user_method_name}", user_class.active.find_by(remember_token: session[:remember_token]))
-    end
+      define_method(current_user_method_name) do
+        instance_variable_get(:"@#{current_user_method_name}") || \
+          instance_variable_set(:"@#{current_user_method_name}", user_class.active.find_by(remember_token: session[:remember_token]))
+      end
 
-    def logged_in?
-      send(current_user_method_name).present?
-    end
+      def logged_in?
+        send(current_user_method_name).present?
+      end
 
-    def store_location
-      session[:referer] = request.fullpath
-    end
+      def store_location
+        session[:referer] = request.fullpath
+      end
   end
 end

data/app/controllers/concerns/genkan/helper.rb

@@ -4,7 +4,8 @@ module Genkan
 
     included do
       private
-      delegate :user_class, :current_user_method_name, to: :class
+
+        delegate :user_class, :current_user_method_name, to: :class
     end
 
     class_methods do

data/app/controllers/genkan/sessions_controller.rb

@@ -6,53 +6,54 @@ module Genkan
       redirect_to genkan.login_path, alert: user.errors.full_messages.to_sentence
     end
 
-    skip_before_action :authenticate, only: %i(new create failure)
+    skip_before_action :authenticate, only: %i[new create failure]
 
-    def new; end
+    def new
+    end
 
     def create
       user.login!
       create_session
       create_encrypted_cookie
-      redirect_to referer_or_root_path, notice: t('genkan.sessions.logged_in')
+      redirect_to referer_or_root_path, notice: t("genkan.sessions.logged_in")
     end
 
     def failure
-      redirect_to genkan.login_path, alert: t('genkan.sessions.failure')
+      redirect_to genkan.login_path, alert: t("genkan.sessions.failure")
     end
 
     def destroy
       destroy_session
-      redirect_to genkan.login_path, notice: t('genkan.sessions.logged_out')
+      redirect_to genkan.login_path, notice: t("genkan.sessions.logged_out")
     end
 
     private
 
-    def user
-      @user ||= user_class.find_or_create_by(email: auth.dig(:info, :email))
-    end
+      def user
+        @user ||= user_class.find_or_create_by(email: auth.dig(:info, :email))
+      end
 
-    def auth
-      request.env['omniauth.auth']
-    end
+      def auth
+        request.env["omniauth.auth"]
+      end
 
-    def create_session
-      session[:remember_token] = user.remember_token
-    end
+      def create_session
+        session[:remember_token] = user.remember_token
+      end
 
-    def create_encrypted_cookie
-      cookies.encrypted[:remember_token] = {
-        value:   user.remember_token,
-        expires: Time.current.since(Genkan.config.cookie_expiration),
-      }
-    end
+      def create_encrypted_cookie
+        cookies.encrypted[:remember_token] = {
+          value:   user.remember_token,
+          expires: Time.current.since(Genkan.config.cookie_expiration),
+        }
+      end
 
-    def destroy_session
-      session[:remember_token] = nil
-    end
+      def destroy_session
+        session[:remember_token] = nil
+      end
 
-    def referer_or_root_path
-      session.delete(:referer) || main_app.root_path
-    end
+      def referer_or_root_path
+        session.delete(:referer) || main_app.root_path
+      end
   end
 end

data/app/models/concerns/genkan/auth.rb

@@ -58,21 +58,21 @@ module Genkan
 
     private
 
-    def store_last_logged_in_at
-      self.last_logged_in_at = Time.current
-    end
+      def store_last_logged_in_at
+        self.last_logged_in_at = Time.current
+      end
 
-    def increment_logged_in_count
-      self.logged_in_count ||= 0
-      self.logged_in_count += 1
-    end
+      def increment_logged_in_count
+        self.logged_in_count ||= 0
+        self.logged_in_count += 1
+      end
 
-    def ensure_record_has_accepted
-      errors.add(:base, :not_accepted) unless accepted?
-    end
+      def ensure_record_has_accepted
+        errors.add(:base, :not_accepted) unless accepted?
+      end
 
-    def ensure_record_has_not_banned
-      errors.add(:base, :banned) if banned?
-    end
+      def ensure_record_has_not_banned
+        errors.add(:base, :banned) if banned?
+      end
   end
 end

data/lib/generators/genkan/helper.rb

@@ -5,57 +5,57 @@ module Genkan
 
       private
 
-      def model_class_name
-        options.key?(:model) ? options[:model].classify : "User"
-      end
-
-      def model_file_path
-        model_name.underscore
-      end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{model_file_path}.rb")
-      end
-
-      def namespace
-        Rails::Generators.namespace if Rails::Generators.respond_to?(:namespace)
-      end
-
-      def namespaced?
-        !!namespace
-      end
-
-      def table_name_prefix
-        model_class_name.to_s.split("::")[0..-2].join("_").underscore.presence
-      end
-
-      def model_name
-        if namespaced?
-          [namespace.to_s] + [model_class_name]
-        else
-          [model_class_name]
-        end.join("::")
-      end
-
-      def migration_class_name
-        if Rails::VERSION::MAJOR >= 5
-          "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        else
-          "ActiveRecord::Migration"
-        end
-      end
-
-      class_methods do
-        # Define the next_migration_number method (necessary for the migration_template method to work)
-        def next_migration_number(dirname)
-          if ActiveRecord::Base.timestamped_migrations
-            sleep 1 # make sure each time we get a different timestamp
-            Time.new.utc.strftime("%Y%m%d%H%M%S")
+        def model_class_name
+          options.has_key?(:model) ? options[:model].classify : "User"
+        end
+
+        def model_file_path
+          model_name.underscore
+        end
+
+        def model_path
+          @model_path ||= File.join("app", "models", "#{model_file_path}.rb")
+        end
+
+        def namespace
+          Rails::Generators.namespace if Rails::Generators.respond_to?(:namespace)
+        end
+
+        def namespaced?
+          !!namespace
+        end
+
+        def table_name_prefix
+          model_class_name.to_s.split("::")[0..-2].join("_").underscore.presence
+        end
+
+        def model_name
+          if namespaced?
+            [namespace.to_s] + [model_class_name]
           else
-            format("%.3d", (current_migration_number(dirname) + 1))
+            [model_class_name]
+          end.join("::")
+        end
+
+        def migration_class_name
+          if Rails::VERSION::MAJOR >= 5
+            "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+          else
+            "ActiveRecord::Migration"
+          end
+        end
+
+        class_methods do
+          # Define the next_migration_number method (necessary for the migration_template method to work)
+          def next_migration_number(dirname)
+            if ActiveRecord::Base.timestamped_migrations
+              sleep 1 # make sure each time we get a different timestamp
+              Time.new.utc.strftime("%Y%m%d%H%M%S")
+            else
+              "%.3d" % (current_migration_number(dirname) + 1)
+            end
           end
         end
-      end
     end
   end
 end

data/lib/generators/genkan/templates/initializer.erb

@@ -13,9 +13,10 @@ Genkan::Engine.configure do |config|
   #     ENV['GOOGLE_OAUTH_CLIENT_ID'],
   #     ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
   #     {
-  #       name:  'google',
-  #       scope: 'email',
-  #       hd:    'host-domain.com'
+  #       name:       'google',
+  #       scope:      'email',
+  #       hd:         'host-domain.com',
+  #       verify_iss: false
   #     }
   #   )
   # end

data/lib/genkan/config.rb

@@ -13,7 +13,7 @@ module Genkan
     end
 
     def current_user_method_name
-      @current_user_method_name ||= "current_#{user_class_name.underscore.tr('/', '_')}".freeze
+      @current_user_method_name ||= "current_#{user_class_name.underscore.tr("/", "_")}".freeze
     end
 
     def auto_acceptance?

data/lib/genkan/engine.rb

@@ -7,7 +7,7 @@ module Genkan
       g.javascripts false
       g.helper false
       g.test_framework :rspec, fixture: true
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_girl, dir: "spec/factories"
     end
   end
 end

data/lib/genkan/version.rb

@@ -1,3 +1,3 @@
 module Genkan
-  VERSION = '0.2.1'.freeze
+  VERSION = "0.2.2".freeze
 end

data/spec/controllers/genkan/sessions_controller_spec.rb

@@ -1,49 +1,49 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe Genkan::SessionsController do
   routes { Genkan::Engine.routes }
 
   before do
     stub_omniauth
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google]
+    request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:google]
   end
 
-  describe 'GET #new' do
+  describe "GET #new" do
     before { get :new }
     it { expect(response).to have_http_status(200) }
   end
 
-  describe 'POST #create' do
+  describe "POST #create" do
     subject(:execution) { post :create, params: { provider: :google } }
 
-    context 'when auto_acceptance is true' do
+    context "when auto_acceptance is true" do
       before { allow_any_instance_of(Genkan::Config).to receive(:auto_acceptance).and_return(true) }
 
-      it 'creates a user' do
+      it "creates a user" do
         expect { execution }.to change { User.count }.by(1)
       end
 
-      it 'creates a session' do
+      it "creates a session" do
         expect(session[:remember_token]).to be_nil
         execution
         expect(session[:remember_token]).to be_present
       end
 
-      it 'redirects root_path' do
+      it "redirects root_path" do
         execution
         expect(response).to have_http_status(302)
         expect(response).to redirect_to(Dummy::Application.routes.url_helpers.root_path)
       end
     end
 
-    context 'when auto_acceptance is false' do
+    context "when auto_acceptance is false" do
       before { allow_any_instance_of(Genkan::Config).to receive(:auto_acceptance).and_return(false) }
 
-      it 'creates a user' do
+      it "creates a user" do
         expect { execution }.to change { User.count }.by(1)
       end
 
-      it 'redirects login_path' do
+      it "redirects login_path" do
         execution
         expect(response).to have_http_status(302)
         expect(response).to redirect_to(login_path)
@@ -51,7 +51,7 @@ RSpec.describe Genkan::SessionsController do
     end
   end
 
-  describe 'GET #destroy' do
+  describe "GET #destroy" do
     before do
       allow_any_instance_of(Genkan::Config).to receive(:auto_acceptance).and_return(true)
       post :create, params: { provider: :google }
@@ -59,13 +59,13 @@ RSpec.describe Genkan::SessionsController do
 
     subject(:execution) { get :destroy }
 
-    it 'destroys a session' do
+    it "destroys a session" do
       expect(session[:remember_token]).to be_present
       execution
       expect(session[:remember_token]).to be_nil
     end
 
-    it 'redirects login_path' do
+    it "redirects login_path" do
       execution
       expect(response).to have_http_status(302)
       expect(response).to redirect_to(login_path)