phcpresspro 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9aa51c93d01be3180790ea6cfb685b2709cc676e
4
- data.tar.gz: b7ab6aee232a30ae4c480774dfaa92a2610cb7fc
3
+ metadata.gz: 488c89fe003157d94a73a119d0dfaa57eb4eccab
4
+ data.tar.gz: 27b6370190cad73882237f89da6b6a0ca053158c
5
5
  SHA512:
6
- metadata.gz: 03d069b8d6a399367c601d05c50b8a89cf4912c87ea3e94b55851e36ab85215315585f75c1309850c195023279b480771729196349dac6ca35c064c9a501b9e9
7
- data.tar.gz: e17e27029bb12bdab4d395c4ce9830d580de86173744c7c8edb215cbb251cc9b31547dbc6cc8cb791c9f865bbda6187508ccd88c4cbfa3bf72d338a80664f31f
6
+ metadata.gz: 247671fda1268e2bc946c976b838e93a53a0a5460673039c7b825179cdcae3d7435963007d62d563b86e3392fee8eadda6a626f1d025712d86858dd1f7893a8d
7
+ data.tar.gz: 317bd1e9dfc1128e464d34327cc257da791f5a3866bee78afc11bd14379e193f988d128fdc63d5df1c5002ad80e2d731fdc68b2be2e8b703929eca6c779de785
@@ -3,14 +3,28 @@ module Phcpresspro
3
3
 
4
4
  # Prevent CSRF attacks by raising an exception.
5
5
  # For APIs, you may want to use :null_session instead.
6
- before_action :authenticate_user!, if: -> { defined?(Devise) }
6
+ before_filter :require_user
7
7
  protect_from_forgery with: :exception
8
8
 
9
- # Make Current User Sitewide
9
+
10
+
11
+ def require_user
12
+ unless current_user
13
+ session[:last_url] = request.get? ? url_for(params) : url_for
14
+ redirect_to new_login_url
15
+ end
16
+ end
17
+
10
18
  def current_user
11
- return unless session[:user_id]
12
- @current_user ||= User.find(session[:user_id])
19
+ @_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
20
+ end
21
+ helper_method :current_user
22
+
23
+ def new_login_url
24
+ ENV['AUTHROCKET_LOGIN_URL']
25
+ # $ar_login_url
13
26
  end
27
+ helper_method :new_login_url
14
28
 
15
29
  # Load Helpers
16
30
  helper Phctitleseo::Engine.helpers
@@ -7,7 +7,7 @@ module Phcpresspro
7
7
 
8
8
  # Filters & Security
9
9
  layout 'layouts/phcpresspro/blogpost/blog_layout'
10
- before_action :authenticate_user!, if: -> { defined?(Devise) }
10
+ before_action :require_user
11
11
  before_action :set_blog_post, only: [:edit, :update, :destroy]
12
12
 
13
13
  # Blog Post Index (/blog/posts)
@@ -65,12 +65,6 @@ module Phcpresspro
65
65
  def blog_post_params
66
66
  params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :user_id)
67
67
  end
68
-
69
- # Current User
70
- def current_user
71
- return unless session[:user_id]
72
- @current_user ||= User.find(session[:user_id])
73
- end
74
68
 
75
69
  end
76
70
  end
@@ -4,7 +4,7 @@ module Phcpresspro
4
4
  class CategoriesController < ApplicationController
5
5
 
6
6
  # Security and Filters
7
- before_action :authenticate_user!, if: -> { defined?(Devise) }
7
+ before_action :require_user
8
8
  before_action :set_category, only: [:edit, :update, :destroy]
9
9
 
10
10
  # Categories Index
@@ -5,7 +5,7 @@ module Phcpresspro
5
5
 
6
6
  # Filters & Security
7
7
  layout 'layouts/phcpresspro/newspost/news_layout'
8
- before_action :authenticate_user!, if: -> { defined?(Devise) }
8
+ before_action :require_user
9
9
  before_action :set_news_post, only: [:edit, :update, :destroy]
10
10
 
11
11
  # News Post Index
@@ -60,11 +60,5 @@ module Phcpresspro
60
60
  params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
61
61
  end
62
62
 
63
- # Current User
64
- def current_user
65
- return unless session[:user_id]
66
- @current_user ||= User.find(session[:user_id])
67
- end
68
-
69
63
  end
70
64
  end
@@ -4,8 +4,5 @@ module Phcpresspro
4
4
  # For Image Uploads
5
5
  mount_uploader :pstimage, Phcpresspro::PstimageUploader
6
6
 
7
- # Associate Post Authour to User
8
- belongs_to :user, class_name: 'Phcengine::User'
9
-
10
7
  end
11
8
  end
@@ -3,9 +3,6 @@ module Phcpresspro
3
3
 
4
4
  # For Image Uploads
5
5
  mount_uploader :pstimage, Phcpresspro::PstimageUploader
6
-
7
- # Associate Post Authour to User
8
- belongs_to :user, class_name: 'Phcengine::User'
9
6
 
10
7
  end
11
8
  end
@@ -1,3 +1,3 @@
1
1
  module Phcpresspro
2
- VERSION = "2.0.0"
2
+ VERSION = "2.0.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcpresspro
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
@@ -79,25 +79,19 @@ dependencies:
79
79
  - !ruby/object:Gem::Version
80
80
  version: 0.18.4
81
81
  - !ruby/object:Gem::Dependency
82
- name: devise
82
+ name: authrocket
83
83
  requirement: !ruby/object:Gem::Requirement
84
84
  requirements:
85
85
  - - "~>"
86
86
  - !ruby/object:Gem::Version
87
- version: '4.1'
88
- - - ">="
89
- - !ruby/object:Gem::Version
90
- version: 4.1.1
87
+ version: '1.5'
91
88
  type: :runtime
92
89
  prerelease: false
93
90
  version_requirements: !ruby/object:Gem::Requirement
94
91
  requirements:
95
92
  - - "~>"
96
93
  - !ruby/object:Gem::Version
97
- version: '4.1'
98
- - - ">="
99
- - !ruby/object:Gem::Version
100
- version: 4.1.1
94
+ version: '1.5'
101
95
  - !ruby/object:Gem::Dependency
102
96
  name: liquid
103
97
  requirement: !ruby/object:Gem::Requirement