phcpresspro 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa51c93d01be3180790ea6cfb685b2709cc676e
-  data.tar.gz: b7ab6aee232a30ae4c480774dfaa92a2610cb7fc
+  metadata.gz: 488c89fe003157d94a73a119d0dfaa57eb4eccab
+  data.tar.gz: 27b6370190cad73882237f89da6b6a0ca053158c
 SHA512:
-  metadata.gz: 03d069b8d6a399367c601d05c50b8a89cf4912c87ea3e94b55851e36ab85215315585f75c1309850c195023279b480771729196349dac6ca35c064c9a501b9e9
-  data.tar.gz: e17e27029bb12bdab4d395c4ce9830d580de86173744c7c8edb215cbb251cc9b31547dbc6cc8cb791c9f865bbda6187508ccd88c4cbfa3bf72d338a80664f31f
+  metadata.gz: 247671fda1268e2bc946c976b838e93a53a0a5460673039c7b825179cdcae3d7435963007d62d563b86e3392fee8eadda6a626f1d025712d86858dd1f7893a8d
+  data.tar.gz: 317bd1e9dfc1128e464d34327cc257da791f5a3866bee78afc11bd14379e193f988d128fdc63d5df1c5002ad80e2d731fdc68b2be2e8b703929eca6c779de785

data/app/controllers/phcpresspro/application_controller.rb

@@ -3,14 +3,28 @@ module Phcpresspro
 
 		# Prevent CSRF attacks by raising an exception.
 		# For APIs, you may want to use :null_session instead.
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		before_filter :require_user
 		protect_from_forgery with: :exception
 		
-		# Make Current User Sitewide
+		
+
+		def require_user
+			unless current_user
+				session[:last_url] = request.get? ? url_for(params) : url_for
+				redirect_to new_login_url
+			end
+		end
+
 		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+		helper_method :current_user
+
+		def new_login_url
+			ENV['AUTHROCKET_LOGIN_URL']
+			# $ar_login_url
 		end
+		helper_method :new_login_url
 
 		# Load Helpers
 		helper Phctitleseo::Engine.helpers

data/app/controllers/phcpresspro/blog/posts_controller.rb

@@ -7,7 +7,7 @@ module Phcpresspro
 
 		# Filters & Security
 		layout 'layouts/phcpresspro/blogpost/blog_layout'
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :require_user
 		before_action :set_blog_post, only: [:edit, :update, :destroy]
 
 		# Blog Post Index (/blog/posts)
@@ -65,12 +65,6 @@ module Phcpresspro
 		def blog_post_params
 			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :user_id)
 		end
-	
-		# Current User
-		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
-		end
 
 	end
 end

data/app/controllers/phcpresspro/categories_controller.rb

@@ -4,7 +4,7 @@ module Phcpresspro
 	class CategoriesController < ApplicationController
 
 		# Security and Filters
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :require_user
 		before_action :set_category, only: [:edit, :update, :destroy]
 
 		# Categories Index

data/app/controllers/phcpresspro/news/posts_controller.rb

@@ -5,7 +5,7 @@ module Phcpresspro
 
 		# Filters & Security
 		layout 'layouts/phcpresspro/newspost/news_layout'
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :require_user
 		before_action :set_news_post, only: [:edit, :update, :destroy]
 
 		# News Post Index
@@ -60,11 +60,5 @@ module Phcpresspro
 			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
 		end
 
-		# Current User
-		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
-		end
-
 	end
 end

data/app/models/phcpresspro/blog/post.rb

@@ -4,8 +4,5 @@ module Phcpresspro
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpresspro::PstimageUploader
 
-		# Associate Post Authour to User
-		belongs_to :user, class_name: 'Phcengine::User'
-
 	end
 end

data/app/models/phcpresspro/news/post.rb

@@ -3,9 +3,6 @@ module Phcpresspro
 
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpresspro::PstimageUploader
-		
-		# Associate Post Authour to User
-		belongs_to :user, class_name: 'Phcengine::User'
 
 	end
 end

data/lib/phcpresspro/version.rb

@@ -1,3 +1,3 @@
 module Phcpresspro
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcpresspro
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - BradPotts
@@ -79,25 +79,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.18.4
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: authrocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement