brick_layer 0.10.1 → 0.10.2
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/brick_layer/base_controller.rb +8 -0
- data/app/controllers/brick_layer/sessions_controller.rb +5 -4
- data/app/helpers/brick_layer/data_set_helper.rb +3 -3
- data/app/views/brick_layer/administrators/index.html.haml +1 -1
- data/app/views/brick_layer/data_sets/new.html.haml +1 -1
- data/lib/version.rb +1 -1
- metadata +45 -45
@@ -1,11 +1,19 @@
|
|
1
1
|
class BrickLayer::BaseController < ApplicationController
|
2
2
|
layout 'brick_layer/layouts/brick_layer_layout'
|
3
|
+
protect_from_forgery
|
4
|
+
|
5
|
+
helper_method :current_administrator
|
6
|
+
|
3
7
|
before_filter :authenticate
|
4
8
|
|
5
9
|
def authenticate
|
6
10
|
request.format.html? ? authenticate_with_session : filter_public_responses
|
7
11
|
end
|
8
12
|
|
13
|
+
def current_administrator
|
14
|
+
@current_administrator ||= BrickLayer::Administrator.find(session[:administrator_id]) if session[:administrator_id]
|
15
|
+
end
|
16
|
+
|
9
17
|
private
|
10
18
|
|
11
19
|
def authenticate_with_session
|
@@ -1,15 +1,16 @@
|
|
1
|
-
class BrickLayer::SessionsController <
|
1
|
+
class BrickLayer::SessionsController < BrickLayer::BaseController
|
2
2
|
layout 'brick_layer/layouts/session_layout'
|
3
|
+
skip_before_filter :verify_authenticity_token
|
4
|
+
skip_before_filter :authenticate
|
3
5
|
|
4
6
|
def new
|
5
7
|
end
|
6
8
|
|
7
9
|
def create
|
8
10
|
admin = BrickLayer::Administrator.authenticate(params[:username], params[:password])
|
9
|
-
|
10
11
|
if admin
|
11
|
-
session[:administrator_id] = admin.id
|
12
|
-
redirect_to root_url, :notice => "Logged in!"
|
12
|
+
session[:administrator_id] = admin.id.to_s
|
13
|
+
redirect_to root_url, :notice => "Logged in!"
|
13
14
|
else
|
14
15
|
flash.now.alert = "Invalid username or password"
|
15
16
|
render "new"
|
@@ -80,9 +80,9 @@ module BrickLayer::DataSetHelper
|
|
80
80
|
|
81
81
|
data_type = :file if data_type == :image
|
82
82
|
type = data_type || :string
|
83
|
-
|
83
|
+
|
84
84
|
options = klass.custom_field_options[attribute.to_sym]
|
85
|
-
|
85
|
+
|
86
86
|
if options && !options.keys.blank?
|
87
87
|
return form.input(attribute.to_sym, options.merge(:as => type))
|
88
88
|
else
|
@@ -90,7 +90,7 @@ module BrickLayer::DataSetHelper
|
|
90
90
|
end
|
91
91
|
|
92
92
|
rescue NameError
|
93
|
-
|
93
|
+
form.input(attribute.to_sym, :as => type)
|
94
94
|
end
|
95
95
|
|
96
96
|
# This is used to format a field with a relationship
|
@@ -1,4 +1,4 @@
|
|
1
|
-
%h1== New #{@model_constant.to_s.titlecase}
|
1
|
+
%h1== New #{@model_constant.to_s.titlecase}
|
2
2
|
|
3
3
|
= simple_form_for @model_constant.new, :as => :data_set, :url => data_sets_path(:model => params[:model]), :multipart => true do |f|
|
4
4
|
= render :partial => "form", :locals => { :f => f }
|
data/lib/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: brick_layer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-04-27 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bson_ext
|
16
|
-
requirement: &
|
16
|
+
requirement: &70175158000000 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 1.3.1
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70175158000000
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: mongoid
|
27
|
-
requirement: &
|
27
|
+
requirement: &70175157999520 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 2.1.2
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70175157999520
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: haml
|
38
|
-
requirement: &
|
38
|
+
requirement: &70175157999020 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - =
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 3.1.2
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70175157999020
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: kaminari
|
49
|
-
requirement: &
|
49
|
+
requirement: &70175157998520 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - =
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 0.12.4
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70175157998520
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: mongoid_nested_set
|
60
|
-
requirement: &
|
60
|
+
requirement: &70175157998020 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: 0.1.2
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70175157998020
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: mongoid-ancestry
|
71
|
-
requirement: &
|
71
|
+
requirement: &70175157997480 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: 0.2.2
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70175157997480
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: mongoid_fulltext
|
82
|
-
requirement: &
|
82
|
+
requirement: &70175157996980 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: 0.3.6
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70175157996980
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: simple_form
|
93
|
-
requirement: &
|
93
|
+
requirement: &70175157996440 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - =
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 1.4.2
|
99
99
|
type: :runtime
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *70175157996440
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: rack-cache
|
104
|
-
requirement: &
|
104
|
+
requirement: &70175157995920 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: 1.0.3
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *70175157995920
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: dragonfly
|
115
|
-
requirement: &
|
115
|
+
requirement: &70175157995420 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - =
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: 0.9.5
|
121
121
|
type: :runtime
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *70175157995420
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: carrierwave
|
126
|
-
requirement: &
|
126
|
+
requirement: &70175157994920 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - =
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: 0.5.4
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *70175157994920
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: bcrypt-ruby
|
137
|
-
requirement: &
|
137
|
+
requirement: &70175157994440 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: 3.0.1
|
143
143
|
type: :runtime
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *70175157994440
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: turn
|
148
|
-
requirement: &
|
148
|
+
requirement: &70175157994040 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ! '>='
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: '0'
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *70175157994040
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: ruby-debug19
|
159
|
-
requirement: &
|
159
|
+
requirement: &70175157993580 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ! '>='
|
@@ -164,10 +164,10 @@ dependencies:
|
|
164
164
|
version: '0'
|
165
165
|
type: :development
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *70175157993580
|
168
168
|
- !ruby/object:Gem::Dependency
|
169
169
|
name: rspec-rails
|
170
|
-
requirement: &
|
170
|
+
requirement: &70175157993040 !ruby/object:Gem::Requirement
|
171
171
|
none: false
|
172
172
|
requirements:
|
173
173
|
- - ~>
|
@@ -175,10 +175,10 @@ dependencies:
|
|
175
175
|
version: '2.4'
|
176
176
|
type: :development
|
177
177
|
prerelease: false
|
178
|
-
version_requirements: *
|
178
|
+
version_requirements: *70175157993040
|
179
179
|
- !ruby/object:Gem::Dependency
|
180
180
|
name: autotest
|
181
|
-
requirement: &
|
181
|
+
requirement: &70175157992600 !ruby/object:Gem::Requirement
|
182
182
|
none: false
|
183
183
|
requirements:
|
184
184
|
- - ! '>='
|
@@ -186,10 +186,10 @@ dependencies:
|
|
186
186
|
version: '0'
|
187
187
|
type: :development
|
188
188
|
prerelease: false
|
189
|
-
version_requirements: *
|
189
|
+
version_requirements: *70175157992600
|
190
190
|
- !ruby/object:Gem::Dependency
|
191
191
|
name: webrat
|
192
|
-
requirement: &
|
192
|
+
requirement: &70175157992120 !ruby/object:Gem::Requirement
|
193
193
|
none: false
|
194
194
|
requirements:
|
195
195
|
- - ! '>='
|
@@ -197,10 +197,10 @@ dependencies:
|
|
197
197
|
version: '0'
|
198
198
|
type: :development
|
199
199
|
prerelease: false
|
200
|
-
version_requirements: *
|
200
|
+
version_requirements: *70175157992120
|
201
201
|
- !ruby/object:Gem::Dependency
|
202
202
|
name: capybara
|
203
|
-
requirement: &
|
203
|
+
requirement: &70175157991700 !ruby/object:Gem::Requirement
|
204
204
|
none: false
|
205
205
|
requirements:
|
206
206
|
- - ! '>='
|
@@ -208,10 +208,10 @@ dependencies:
|
|
208
208
|
version: '0'
|
209
209
|
type: :development
|
210
210
|
prerelease: false
|
211
|
-
version_requirements: *
|
211
|
+
version_requirements: *70175157991700
|
212
212
|
- !ruby/object:Gem::Dependency
|
213
213
|
name: shoulda
|
214
|
-
requirement: &
|
214
|
+
requirement: &70175157991280 !ruby/object:Gem::Requirement
|
215
215
|
none: false
|
216
216
|
requirements:
|
217
217
|
- - ! '>='
|
@@ -219,10 +219,10 @@ dependencies:
|
|
219
219
|
version: '0'
|
220
220
|
type: :development
|
221
221
|
prerelease: false
|
222
|
-
version_requirements: *
|
222
|
+
version_requirements: *70175157991280
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: hirb
|
225
|
-
requirement: &
|
225
|
+
requirement: &70175157990840 !ruby/object:Gem::Requirement
|
226
226
|
none: false
|
227
227
|
requirements:
|
228
228
|
- - ! '>='
|
@@ -230,10 +230,10 @@ dependencies:
|
|
230
230
|
version: '0'
|
231
231
|
type: :development
|
232
232
|
prerelease: false
|
233
|
-
version_requirements: *
|
233
|
+
version_requirements: *70175157990840
|
234
234
|
- !ruby/object:Gem::Dependency
|
235
235
|
name: wirble
|
236
|
-
requirement: &
|
236
|
+
requirement: &70175157990400 !ruby/object:Gem::Requirement
|
237
237
|
none: false
|
238
238
|
requirements:
|
239
239
|
- - ! '>='
|
@@ -241,10 +241,10 @@ dependencies:
|
|
241
241
|
version: '0'
|
242
242
|
type: :development
|
243
243
|
prerelease: false
|
244
|
-
version_requirements: *
|
244
|
+
version_requirements: *70175157990400
|
245
245
|
- !ruby/object:Gem::Dependency
|
246
246
|
name: looksee
|
247
|
-
requirement: &
|
247
|
+
requirement: &70175157989600 !ruby/object:Gem::Requirement
|
248
248
|
none: false
|
249
249
|
requirements:
|
250
250
|
- - ! '>='
|
@@ -252,7 +252,7 @@ dependencies:
|
|
252
252
|
version: '0'
|
253
253
|
type: :development
|
254
254
|
prerelease: false
|
255
|
-
version_requirements: *
|
255
|
+
version_requirements: *70175157989600
|
256
256
|
description: Content Management and Endpoint Rails Service Engine
|
257
257
|
email:
|
258
258
|
executables: []
|