Skip to content

Commit 3f516da

Browse files
neokoenigneokoenig
committed
Upgrade Wheels to 2.1
1 parent eded1d8 commit 3f516da

File tree

125 files changed

+5443
-6040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+5443
-6040
lines changed

‎events/onabort.cfm‎

Whitespace-only changes.

‎wheels/CHANGELOG.md‎

Lines changed: 999 additions & 0 deletions
Large diffs are not rendered by default.

‎wheels/Controller.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ component output="false" displayName="Controller" {
33
include "global/functions.cfm";
44
include "view/functions.cfm";
55
include "plugins/standalone/injection.cfm";
6-
if (StructKeyExists(application, "wheels") && StructKeyExists(application.wheels, "viewPath")) {
6+
if (isDefined("application") && StructKeyExists(application, "wheels") && StructKeyExists(application.wheels, "viewPath")) {
77
include "../#application.wheels.viewPath#/helpers.cfm";
88
}
99
}

‎wheels/LICENSE‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎wheels/Public.cfc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
component output="false" displayName="Internal GUI" {
2+
include "public/initialization.cfm";
3+
include "public/includes.cfm";
4+
}

‎wheels/controller/csrf.cfm‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ public function protectsFromForgery(string with="exception", string only="", str
2121
variables.$class.csrf.except = arguments.except;
2222
}
2323
24+
/**
25+
* Returns the raw CSRF authenticity token
26+
*
27+
* [section: Controller]
28+
* [category: Miscellaneous Functions]
29+
*
30+
*/
31+
public string function authenticityToken() {
32+
return $generateAuthenticityToken();
33+
}
34+
2435
/**
2536
* Internal function.
2637
*/

‎wheels/controller/initialization.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public any function $initControllerClass(string name="") {
3535
variables.$class.verifications = [];
3636
variables.$class.filters = [];
3737
variables.$class.cachableActions = [];
38-
variables.$class.layout = {};
38+
variables.$class.layouts = [];
3939
4040
// Setup format info for providing content.
4141
// Default the controller to only respond to HTML.

‎wheels/controller/layouts.cfm‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,33 @@ public void function usesLayout(
3737
if (StructKeyExists(arguments, "only")) {
3838
arguments.only = $listClean(arguments.only);
3939
}
40-
variables.$class.layout = arguments;
40+
41+
// Check to see if the layout struct is already present in the array
42+
local.layoutInArray = false;
43+
if (arrayLen(variables.$class.layouts)){
44+
for (local.i=1; local.i<=arrayLen(variables.$class.layouts); local.i++){
45+
local.layout = variables.$class.layouts[local.i];
46+
if (structCount(local.layout) eq structCount(arguments)){
47+
local.oneKeyIsDifferent = false;
48+
for (local.key in arguments){
49+
if (local.layout[local.key] neq arguments[key]){
50+
local.oneKeyIsDifferent = true;
51+
}
52+
}
53+
if (!local.oneKeyIsDifferent){
54+
local.layoutInArray = true;
55+
local.layoutPostionInArray = local.i;
56+
}
57+
}
58+
}
59+
}
60+
61+
variables.$class.layouts.append(arguments);
62+
63+
// If this layout was is in the array, we need to delete it to respect the order of declaration
64+
if (local.layoutInArray){
65+
arrayDeleteAt(variables.$class.layouts, local.layoutPostionInArray);
66+
}
4167
}
4268
4369
/**
@@ -46,24 +72,30 @@ public void function usesLayout(
4672
public any function $useLayout(required string $action) {
4773
local.rv = true;
4874
local.layoutType = "template";
49-
if (isAjax() && StructKeyExists(variables.$class.layout, "ajax") && Len(variables.$class.layout.ajax)) {
50-
local.layoutType = "ajax";
51-
}
52-
if (!StructIsEmpty(variables.$class.layout)) {
53-
local.rv = variables.$class.layout.useDefault;
54-
if ((StructKeyExists(this, variables.$class.layout[local.layoutType]) && IsCustomFunction(this[variables.$class.layout[local.layoutType]])) || IsCustomFunction(variables.$class.layout[local.layoutType])) {
55-
local.invokeArgs = {};
56-
local.invokeArgs.action = arguments.$action;
57-
local.result = $invoke(method=variables.$class.layout[local.layoutType], invokeArgs=local.invokeArgs);
75+
76+
for (local.layout in variables.$class.layouts){
77+
78+
local.rv = local.layout.useDefault;
79+
80+
if ((!StructKeyExists(local.layout, "except") || !ListFindNoCase(local.layout.except, arguments.$action)) && (!StructKeyExists(local.layout, "only") || ListFindNoCase(local.layout.only, arguments.$action))) {
5881
59-
// If the developer doesn't return anything from the function or if they return a blank string it should use the default layout still.
60-
if (StructKeyExists(local, "result")) {
61-
local.rv = local.result;
82+
if (isAjax() && StructKeyExists(local.layout, "ajax") && Len(local.layout.ajax)) {
83+
local.layoutType = "ajax";
6284
}
6385
64-
} else if ((!StructKeyExists(variables.$class.layout, "except") || !ListFindNoCase(variables.$class.layout.except, arguments.$action)) && (!StructKeyExists(variables.$class.layout, "only") || ListFindNoCase(variables.$class.layout.only, arguments.$action))) {
65-
local.rv = variables.$class.layout[local.layoutType];
66-
}
86+
if ((StructKeyExists(this, local.layout[local.layoutType]) && IsCustomFunction(this[local.layout[local.layoutType]])) || IsCustomFunction(local.layout[local.layoutType])) {
87+
local.invokeArgs = {};
88+
local.invokeArgs.action = arguments.$action;
89+
local.result = $invoke(method=local.layout[local.layoutType], invokeArgs=local.invokeArgs);
90+
91+
// If the developer doesn't return anything from the function or if they return a blank string it should use the default layout still.
92+
if (StructKeyExists(local, "result")) {
93+
local.rv = local.result;
94+
}
95+
} else
96+
local.rv = local.layout[local.layoutType];
97+
}
98+
6799
}
68100
return local.rv;
69101
}

‎wheels/controller/verifies.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void function $runVerifications(
8282
// Default to the Wheels setting but get it on a per request basis if possible (from Application.cfc).
8383
local.sessionManagement = $get("sessionManagement");
8484
try {
85-
local.sessionManagement = application.getApplicationSettings().sessionManagement;
85+
local.sessionManagement = getApplicationMetaData().sessionManagement;
8686
} catch (any e) {}
8787
if (StructIsEmpty(arguments.sessionScope) && local.sessionManagement) {
8888
arguments.sessionScope = session;

0 commit comments

Comments
 (0)