spud_core 0.8.10 → 0.8.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/app/controllers/spud/admin/application_controller.rb +2 -1
  2. data/app/controllers/spud/application_controller.rb +12 -10
  3. data/app/controllers/spud/setup_controller.rb +7 -3
  4. data/app/controllers/spud/user_sessions_controller.rb +2 -1
  5. data/lib/spud_core/version.rb +1 -1
  6. metadata +28 -28
data/app/controllers/spud/admin/application_controller.rb CHANGED
@@ -8,8 +8,9 @@ class Spud::Admin::ApplicationController < Spud::ApplicationController
8
8
 
9
9
  private
10
10
  def require_admin_user
11
+ puts "Checking for Admin"
11
12
  return false if !require_user
12
-
13
+ puts "user found, verifying permissions"
13
14
  if !@current_user.super_admin && current_user_permissions.count == 0
14
15
  flash[:error] = "User must be an administrator to view this area."
15
16
  redirect_to root_url() and return false
data/app/controllers/spud/application_controller.rb CHANGED
@@ -55,17 +55,19 @@ class Spud::ApplicationController < ActionController::Base
55
55
  end
56
56
 
57
57
  def multisite_caching
58
- yield and return if !Spud::Core.multisite_mode_enabled
59
- old_cache_directory = Rails.application.config.action_controller.page_cache_directory
60
- if(old_cache_directory.blank?)
61
- old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
62
- end
63
- site_config = Spud::Core.site_config_for_host request.host_with_port
64
- if !site_config.blank?
65
- Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,site_config[:short_name].to_s)
66
- else
67
- Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,"main")
58
+ if Spud::Core.multisite_mode_enabled
59
+ old_cache_directory = Rails.application.config.action_controller.page_cache_directory
60
+ if(old_cache_directory.blank?)
61
+ old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
62
+ end
63
+ site_config = Spud::Core.site_config_for_host request.host_with_port
64
+ if !site_config.blank?
65
+ Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,site_config[:short_name].to_s)
66
+ else
67
+ Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,"main")
68
+ end
68
69
  end
70
+
69
71
  yield
70
72
 
71
73
  ensure
data/app/controllers/spud/setup_controller.rb CHANGED
@@ -1,22 +1,26 @@
1
1
  class Spud::SetupController < Spud::ApplicationController
2
2
  layout 'spud/setup'
3
3
  def index
4
+ logger.debug("---Spud setup form running!")
4
5
  @page_thumbnail = "spud/admin/users_thumb.png"
5
6
  @page_name = "First Time Setup"
6
7
  if SpudUser.all.count != 0
7
8
  flash[:error] = "Access Denied! This wizard may only be executed when the database is empty."
8
- redirect_to spud_admin_root_url() and return
9
+ logger.debug "We have a user count: " + SpudUser.all.count.to_s
10
+
11
+ redirect_to new_spud_user_session_url and return
9
12
  end
10
13
 
11
14
  if request.post?
12
15
  @user = SpudUser.new(:login => params[:login],:email => params[:email],:password => params[:password],:password_confirmation => params[:password_confirmation])
13
16
  @user.super_admin = true
14
17
  if @user.save
15
- redirect_to spud_admin_root_url() and return
18
+ logger.debug "REDIRECTING!"
19
+ session[:return_to] = spud_admin_root_url
20
+ redirect_to new_spud_user_session_url and return
16
21
  end
17
22
 
18
23
  flash[:error] = "Error creating administrative account!"
19
- else
20
24
  end
21
25
  end
22
26
  end
data/app/controllers/spud/user_sessions_controller.rb CHANGED
@@ -3,7 +3,8 @@ class Spud::UserSessionsController < Spud::ApplicationController
3
3
  before_filter :require_user, :only => :destroy
4
4
  layout 'spud/login/application'
5
5
  def new
6
- if SpudUser.count == 0
6
+ if SpudUser.all.count == 0
7
+ logger.debug "NO USERS!"
7
8
  redirect_to spud_setup_url() and return
8
9
  end
9
10
 
data/lib/spud_core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Core
3
- VERSION = "0.8.10"
3
+ VERSION = "0.8.11"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.10
4
+ version: 0.8.11
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-03 00:00:00.000000000 Z
12
+ date: 2012-05-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70282790934200 !ruby/object:Gem::Requirement
16
+ requirement: &70163484364780 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70282790934200
24
+ version_requirements: *70163484364780
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: authlogic
27
- requirement: &70282791120700 !ruby/object:Gem::Requirement
27
+ requirement: &70163484363840 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70282791120700
35
+ version_requirements: *70163484363840
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jquery-rails
38
- requirement: &70282791118760 !ruby/object:Gem::Requirement
38
+ requirement: &70163484362620 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70282791118760
46
+ version_requirements: *70163484362620
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: breadcrumbs_on_rails
49
- requirement: &70282791116560 !ruby/object:Gem::Requirement
49
+ requirement: &70163484361600 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70282791116560
57
+ version_requirements: *70163484361600
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: will_paginate
60
- requirement: &70282791391060 !ruby/object:Gem::Requirement
60
+ requirement: &70163484360240 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70282791391060
68
+ version_requirements: *70163484360240
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bootstrap-will_paginate
71
- requirement: &70282791384100 !ruby/object:Gem::Requirement
71
+ requirement: &70163484717900 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70282791384100
79
+ version_requirements: *70163484717900
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mysql2
82
- requirement: &70282791383080 !ruby/object:Gem::Requirement
82
+ requirement: &70163484717040 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70282791383080
90
+ version_requirements: *70163484717040
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec
93
- requirement: &70282791429340 !ruby/object:Gem::Requirement
93
+ requirement: &70163484716460 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70282791429340
101
+ version_requirements: *70163484716460
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec-rails
104
- requirement: &70282791426220 !ruby/object:Gem::Requirement
104
+ requirement: &70163484715120 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70282791426220
112
+ version_requirements: *70163484715120
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: factory_girl
115
- requirement: &70282791425080 !ruby/object:Gem::Requirement
115
+ requirement: &70163484711160 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - =
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 2.5.0
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70282791425080
123
+ version_requirements: *70163484711160
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: mocha
126
- requirement: &70282791424440 !ruby/object:Gem::Requirement
126
+ requirement: &70163484676880 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - =
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.10.3
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70282791424440
134
+ version_requirements: *70163484676880
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: database_cleaner
137
- requirement: &70282791423320 !ruby/object:Gem::Requirement
137
+ requirement: &70163484675700 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - =
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: 0.7.1
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70282791423320
145
+ version_requirements: *70163484675700
146
146
  description: Spud Core Engine
147
147
  email:
148
148
  - destes@redwindsw.com
@@ -552,7 +552,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
552
552
  version: '0'
553
553
  segments:
554
554
  - 0
555
- hash: -2198880786034500037
555
+ hash: 4009425873014631937
556
556
  required_rubygems_version: !ruby/object:Gem::Requirement
557
557
  none: false
558
558
  requirements:
@@ -561,7 +561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
561
561
  version: '0'
562
562
  segments:
563
563
  - 0
564
- hash: -2198880786034500037
564
+ hash: 4009425873014631937
565
565
  requirements: []
566
566
  rubyforge_project:
567
567
  rubygems_version: 1.8.15