credible 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea406004a9c14011202b1a455928cb1cfc78fb042e7cd04f566b2139db774a15
-  data.tar.gz: a820ef53bdd6459e3bc42f0ed56d60014a2d7d11a7033d74ada97fefcb4a7f2c
+  metadata.gz: 3600f170c11397baf11f7b350fdc1bcfe5fa9eff0c447743e145affdfb33d2d2
+  data.tar.gz: 1ab495351756b77d942082e1c31c4327154041575e9d1ce35ee519943d9edd7c
 SHA512:
-  metadata.gz: 630b938806894826b62ac90eace364299f940c50c117f0921c97ec084774e207dc23f0c87ca1b21942bcafdf1b7a3de19c6eee05b513a4ea7d010e6f633c9b07
-  data.tar.gz: a0d9651b868af6775c299661928c16d648c26f9a61308620fe9575c6bbd159640a619179996d2bbc29bd9f8096e9e986bcde1e41bc47af98144a62ab772fb336
+  metadata.gz: 5ed7e26ed44a7e69d70791aee2c910a9ccc80c340bd26541a6f4679427c76a75b31e1ddd308816f20bb4ee3fcd3031d011679364cafb0c91d8b7256be659ab2c
+  data.tar.gz: bc4bcef987ba1287acc7ead7d6d4c596dd33e6b72f8b5d221352dd81e895be6c0d80f87cd12712f63168b86ab2a3fa916fc8959f15c30c72fe75062b55e6399f

data/app/controllers/credible/sessions_controller.rb

@@ -1,59 +1,3 @@
 class Credible::SessionsController < ApplicationController
-  before_action :set_session, only: [:show, :destroy]
-
-  skip_before_action :authenticate!, only: [:new, :create, :fail]
-
-  # skip_after_action :verify_authorized, only: [:fail]
-  # TODO: Reevaluate authorization without Pundit
-
-  # GET /sessions
-  # GET /sessions.json
-  def index
-  end
-
-  # GET /sessions/1
-  # GET /sessions/1.json
-  def show
-  end
-
-  # GET /sessions/new
-  def new
-    @session = ::Session.new
-  end
-
-  # POST /sessions
-  # POST /sessions.json
-  def create
-    @session = ::Session.authenticate(session_params)
-
-    if @session.save
-      render :show, status: :created, location: @session
-    else
-      render json: @session.errors, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE /sessions/1
-  # DELETE /sessions/1.json
-  # DELETE /sessions/current
-  # DELETE /sessions/current.json
-  def destroy
-    warden.logout
-    @session.destroy
-    head :no_content
-  end
-
-  def fail
-    render json: {}, status: :unauthorized
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_session
-      @session = current_session
-    end
-
-    def session_params
-      params.require(:session).permit(:login, :password)
-    end
+  include Credible::Controllers::SessionsController
 end

data/app/controllers/credible/users_controller.rb

@@ -1,92 +1,3 @@
 class Credible::UsersController < ApplicationController
-  before_action :set_user, only: [:show, :edit, :update, :destroy]
-
-  skip_before_action :authenticate!, only: [:new, :create, :confirm]
-
-  # TODO: Reevaluate authorization without Pundit
-
-  # GET /users/1
-  # GET /users/1.json
-  def show
-  end
-
-  # GET /users/new
-  def new
-    @user = ::User.new
-  end
-
-  # POST /users
-  # POST /users.json
-  def create
-    @user = ::User.new(user_params)
-
-    if @user.save
-      Credible::ConfirmationMailer.with(user: @user).confirmation_email.deliver_later
-      @session = ::Session.create(user: @user)
-      render :show, status: :created, location: @user
-    else
-      render json: @user.errors, status: :unprocessable_entity
-    end
-  end
-
-  # GET /users/confirm/:confirmation_token
-  # GET /users/confirm/:confirmation_token.json
-  def confirm
-    @user = ::User.find_by(email: params[:email])
-
-    @user.confirm(params[:confirmation_token])
-
-    if @user.save
-      @session = current_user ? current_session : ::Session.create(user: @user)
-      render :show, status: :created, location: @user
-    else
-      render json: @user.errors, status: :unprocessable_entity
-    end
-  end
-
-  # POST /users/reset_password
-  # POST /users/reset_password.json
-  def reset_password
-    @user = ::User.find_by(email: user_params[:email])
-
-    @user.reset_password
-
-    if @user.save
-      Credible::ResetPasswordMailer.with(user: @user).reset_password_email.deliver_later
-      render :show, status: :ok, location: @user
-    else
-      render json: @user.errors, status: :unprocessable_entity
-    end
-  end
-
-  # GET /users/1/edit
-  def edit
-  end
-
-  # PATCH/PUT /users/1
-  # PATCH/PUT /users/1.json
-  def update
-    if @user.update(user_params)
-      render :show, status: :ok, location: @user
-    else
-      render json: @user.errors, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE /users/1
-  # DELETE /users/1.json
-  def destroy
-    @user.destroy
-    head :no_content
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_user
-      @user = current_user
-    end
-
-    def user_params
-      params.require(:user).permit(:email, :password)
-    end
+  include Credible::Controllers::UsersController
 end

data/lib/credible.rb

@@ -4,6 +4,9 @@ require "credible/engine"
 
 require "credible/controller_concern"
 
+require "credible/controllers/sessions_controller"
+require "credible/controllers/users_controller"
+
 require "credible/user"
 require "credible/session"
 

data/lib/credible/controllers/sessions_controller.rb

@@ -0,0 +1,65 @@
+module Credible
+  module Controllers
+    module SessionsController
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_session, only: [:show, :destroy]
+        skip_before_action :authenticate!, only: [:new, :create, :fail]
+        # skip_after_action :verify_authorized, only: [:fail]
+        # TODO: Reevaluate authorization without Pundit
+      end
+
+      # GET /sessions
+      # GET /sessions.json
+      def index
+      end
+
+      # GET /sessions/1
+      # GET /sessions/1.json
+      def show
+      end
+
+      # GET /sessions/new
+      def new
+        @session = ::Session.new
+      end
+
+      # POST /sessions
+      # POST /sessions.json
+      def create
+        @session = ::Session.authenticate(session_params)
+
+        if @session.save
+          render :show, status: :created, location: @session
+        else
+          render json: @session.errors, status: :unprocessable_entity
+        end
+      end
+
+      # DELETE /sessions/1
+      # DELETE /sessions/1.json
+      # DELETE /sessions/current
+      # DELETE /sessions/current.json
+      def destroy
+        warden.logout
+        @session.destroy
+        head :no_content
+      end
+
+      def fail
+        render json: {}, status: :unauthorized
+      end
+
+      private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_session
+        @session = current_session
+      end
+
+      def session_params
+        params.require(:session).permit(:login, :password)
+      end
+    end
+  end
+end

data/lib/credible/controllers/users_controller.rb

@@ -0,0 +1,98 @@
+module Credible
+  module Controllers
+    module UsersController
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_user, only: [:show, :edit, :update, :destroy]
+        skip_before_action :authenticate!, only: [:new, :create, :confirm]
+        # TODO: Reevaluate authorization without Pundit
+      end
+
+      # GET /users/1
+      # GET /users/1.json
+      def show
+      end
+
+      # GET /users/new
+      def new
+        @user = ::User.new
+      end
+
+      # POST /users
+      # POST /users.json
+      def create
+        @user = ::User.new(user_params)
+
+        if @user.save
+          Credible::ConfirmationMailer.with(user: @user).confirmation_email.deliver_later
+          @session = ::Session.create(user: @user)
+          render :show, status: :created, location: @user
+        else
+          render json: @user.errors, status: :unprocessable_entity
+        end
+      end
+
+      # GET /users/confirm/:confirmation_token
+      # GET /users/confirm/:confirmation_token.json
+      def confirm
+        @user = ::User.find_by(email: params[:email])
+
+        @user.confirm(params[:confirmation_token])
+
+        if @user.save
+          @session = current_user ? current_session : ::Session.create(user: @user)
+          render :show, status: :created, location: @user
+        else
+          render json: @user.errors, status: :unprocessable_entity
+        end
+      end
+
+      # POST /users/reset_password
+      # POST /users/reset_password.json
+      def reset_password
+        @user = ::User.find_by(email: user_params[:email])
+
+        @user.reset_password
+
+        if @user.save
+          Credible::ResetPasswordMailer.with(user: @user).reset_password_email.deliver_later
+          render :show, status: :ok, location: @user
+        else
+          render json: @user.errors, status: :unprocessable_entity
+        end
+      end
+
+      # GET /users/1/edit
+      def edit
+      end
+
+      # PATCH/PUT /users/1
+      # PATCH/PUT /users/1.json
+      def update
+        if @user.update(user_params)
+          render :show, status: :ok, location: @user
+        else
+          render json: @user.errors, status: :unprocessable_entity
+        end
+      end
+
+      # DELETE /users/1
+      # DELETE /users/1.json
+      def destroy
+        @user.destroy
+        head :no_content
+      end
+
+      private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_user
+        @user = current_user
+      end
+
+      def user_params
+        params.require(:user).permit(:email, :password)
+      end
+    end
+  end
+end

data/lib/credible/version.rb

@@ -1,3 +1,3 @@
 module Credible
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credible
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Thom Bruce
@@ -123,7 +123,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/controllers/credible/authentication_controller.rb
 - app/controllers/credible/sessions_controller.rb
 - app/controllers/credible/users_controller.rb
 - app/helpers/credible/application_helper.rb
@@ -147,6 +146,8 @@ files:
 - config/routes.rb
 - lib/credible.rb
 - lib/credible/controller_concern.rb
+- lib/credible/controllers/sessions_controller.rb
+- lib/credible/controllers/users_controller.rb
 - lib/credible/engine.rb
 - lib/credible/session.rb
 - lib/credible/user.rb

data/app/controllers/credible/authentication_controller.rb

@@ -1,4 +0,0 @@
-class Credible::AuthenticationController < ApplicationController
-  # TODO: Authentication module is now redundant inside Credible Engine.
-  #       Migrate out of namespace.
-end