Skip to content

Commit

Permalink
Clean inconsistent whitespaces while respecting .editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
drobakowski committed Nov 10, 2015
1 parent d30d802 commit f92d5e7
Show file tree
Hide file tree
Showing 119 changed files with 861 additions and 861 deletions.
4 changes: 2 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ For full list of contributors and their contributions to the code please visit
https://github.com/ChicagoBoss/ChicagoBoss/graphs/contributors

In addition to code contributors, a lot of people have sent us
bug reports that have also improved the quality of ChicagoBoss.
Great respect and big thanks going for you too.
bug reports that have also improved the quality of ChicagoBoss.
Great respect and big thanks going for you too.
8 changes: 4 additions & 4 deletions bin/boss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# @author: Pius Uzamere <[email protected]>
#
# Allows the user to easily create a new Chicago Boss application from anywhere,
# Allows the user to easily create a new Chicago Boss application from anywhere,
# as long as the Chicago Boss directory is in the user's path.
#
# Useful when installing Chicago Boss via Homebrew or similar methods.
Expand Down Expand Up @@ -35,7 +35,7 @@ case "${1:-''}" in
else
echo Please specify an app name to create a new Chicago Boss application.
echo "Usage: boss new APP_NAME or boss start|start-dev|stop|reload|restart|attach"
fi
fi
;;

'start'|'start-dev'|'stop'|'reload'|'restart'|'attach')
Expand All @@ -44,12 +44,12 @@ case "${1:-''}" in
sh $init_script $1
else
echo Sorry, \"boss $1\" may only be run from the root directory of a Chicago Boss application.
fi
fi
;;

*)
echo "Chicago Boss."
echo "Usage: boss new APP_NAME or boss start|start-dev|stop|reload|restart|attach"
exit 1
;;
esac
esac
6 changes: 3 additions & 3 deletions ct/boss_mq_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ end_per_testcase(_TestCase, _Config) ->
groups() ->
[].

all() ->
all() ->

[test_poll].


my_test_case() ->
my_test_case() ->
[].


my_test_case(_Config) ->
my_test_case(_Config) ->
ok.
test_poll() ->
[].
Expand Down
20 changes: 10 additions & 10 deletions doc-src/api-controller.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{% extends "api.html" %}
{% block api_content %}
<p style="font-size: 14px;"><em>Jump to:</em>
&nbsp; <a href="#routes">Routes</a>
&nbsp; <a href="#auth">Authorization</a>
&nbsp; <a href="#return_values">Return values</a>
&nbsp; <a href="#cache">Caching</a>
&nbsp; <a href="#lang">Content-Language</a>
&nbsp; <a href="#filter">Post-processing</a>
<p style="font-size: 14px;"><em>Jump to:</em>
&nbsp; <a href="#routes">Routes</a>
&nbsp; <a href="#auth">Authorization</a>
&nbsp; <a href="#return_values">Return values</a>
&nbsp; <a href="#cache">Caching</a>
&nbsp; <a href="#lang">Content-Language</a>
&nbsp; <a href="#filter">Post-processing</a>
&nbsp; <a href="#simplebridge">SimpleBridge request object</a></p>
<p>Chicago Boss associates each URL with a function of a controller.
The URL <nobr>/foo/bar</nobr> will call the function <code>foo_controller:bar</code>.
Each controller module should go into your project's src/controller/ directory and the file name should start with the application name and end with "_controller.erl", e.g. "appname_my_controller.erl".
<p>Chicago Boss associates each URL with a function of a controller.
The URL <nobr>/foo/bar</nobr> will call the function <code>foo_controller:bar</code>.
Each controller module should go into your project's src/controller/ directory and the file name should start with the application name and end with "_controller.erl", e.g. "appname_my_controller.erl".
Helper functions should go into your project's src/lib/ directory.
Controllers can take one parameter or two parameters: the <a href="#simplebridge">SimpleBridge request object</a>, and an optional session ID (if <a href="api-session.html">sessions</a> are enabled). Declare it like:</p>
<div class="code">
Expand Down
2 changes: 1 addition & 1 deletion doc-src/api-db.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ <h2>Valid <code>Conditions</code></h2>
<div class="example row1">
<div class="code">
<code>key ∩ [Token1, Token2, ...]</code><br>
<code>{key, 'contains_any', [Token1, Token2, ...]}</code>
<code>{key, 'contains_any', [Token1, Token2, ...]}</code>
</div>
<p>The "<code>key</code>" attribute contains at least one of the tokens on the right-hand side.</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc-src/api-mail-controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h2>Sending email with templates</h2>
<ul>
<li><p><code>FromAddress</code> is the sender's email address. The address should <em>not</em> be in "friendly" form, i.e. "[email protected]" is OK, but "Kai Foo &lt;[email protected]&gt;" is not.</p></li>
<li><p><code>ToAddress</code> is recipient's email address.</p></li>
<li><p><code>HeaderFields</code> is a proplist of email header fields, e.g. <code>[{"From", "SECRETARY TO CHARLES TAYLOR &lt;[email protected]&gt;"}, {"Subject", "Unclaimed Lottery Winnings"}]</code>.
<li><p><code>HeaderFields</code> is a proplist of email header fields, e.g. <code>[{"From", "SECRETARY TO CHARLES TAYLOR &lt;[email protected]&gt;"}, {"Subject", "Unclaimed Lottery Winnings"}]</code>.
If you want the From: and To: fields to appear in the message, you need to provide values here; they will not be taken from <code>FromAddress</code> and <code>ToAddress</code>.
However, the header fields for Message-ID: and Date: will be populated automatically if not provided.
</p></li>
Expand Down
8 changes: 4 additions & 4 deletions doc-src/api-record.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "api.html" %}
{% block api_content %}
<p style="font-size: 14px;"><em>Jump to: </em>
<a href="#mappings">Specifying table and column names</a>
&nbsp; <a href="#instance">Generated instance methods</a>
<p style="font-size: 14px;"><em>Jump to: </em>
<a href="#mappings">Specifying table and column names</a>
&nbsp; <a href="#instance">Generated instance methods</a>
&nbsp; <a href="#associations">Associations (<code>belongs_to</code>, <code>has</code>)</a>
&nbsp; <a href="#hooks">Save hooks</a>
</p>
Expand All @@ -15,7 +15,7 @@
other parameters should be CamelCased attributes of your data model.</p></li>

<li><p>All parameters will be available as lower-case, underscored functions,
e.g. <code>-module(foo, [Id, TheText])</code> will generate the getter functions
e.g. <code>-module(foo, [Id, TheText])</code> will generate the getter functions
<code>id()</code> and <code>the_text()</code>.</p></li>

<li><p>Parameters can contain typespecs, e.g. <code>-module(foo, [Id, SomeString::string(), ...]).</code>. Valid types are:
Expand Down
4 changes: 2 additions & 2 deletions doc-src/api-test.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "api.html" %}
{% block api_content %}
<p style="font-size: 14px;"><em>Jump to: </em> <a href="#boss_web_test"><code>boss_web_test</code></a>
<p style="font-size: 14px;"><em>Jump to: </em> <a href="#boss_web_test"><code>boss_web_test</code></a>
&nbsp; <a href="#boss_assert">boss_assert</a></p>
<p>Chicago Boss ships with a unique functional test framework, where tests are structured as trees of continuations. All assertions are performed in callbacks, and additional tests are also performed in callbacks. For more information on the design of Boss's functional tests, see <a href="http://www.evanmiller.org/functional-tests-as-a-tree-of-continuations.html">&#8220;Functional Tests As A Tree Of Continuations&#8221;</a>.</p>

Expand Down Expand Up @@ -38,7 +38,7 @@ <h2>boss_web_test</h2>
<pre class="code">
boss_web_test:get_request("/", [], [],
[ "Click the register link", fun(Res) -&gt; ... end,
"Click the copyright link", fun(Res) -&gt; ... end,
"Click the copyright link", fun(Res) -&gt; ... end,
... ]).
</pre>
<p>The key thing to understand about <code>Continuations</code> is that they are <em>performed in parallel</em>. Any database manipulations that occur in one continuation cannot affect sibling continuations.</p>
Expand Down
2 changes: 1 addition & 1 deletion doc-src/api-websocket.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "api.html" %}
{% block api_content %}
<p>WebSockets are an HTML5 technology used for two-way messaging from inside a web page. As of version 0.8.0,
<p>WebSockets are an HTML5 technology used for two-way messaging from inside a web page. As of version 0.8.0,
Chicago Boss provides infrastructure for defining one or more WebSocket controllers.</p>
<h2>Server code</h2>
<p>The server WebSocket API is based around Erlang message-passing; to send a message to a particular client, simply send it a message like:</p>
Expand Down
16 changes: 8 additions & 8 deletions doc-src/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<strong>BossDB</strong>
{% else %}
<a href="api-db.html">BossDB</a>
{% endifequal %}
&nbsp; | &nbsp;
{% endifequal %}
&nbsp; | &nbsp;
{% ifequal this_page "api-record.html" %}
<strong>Models</strong>
{% else %}
<a href="api-record.html">Models</a>
<a href="api-record.html">Models</a>
{% endifequal %}
&nbsp; | &nbsp;
{% ifequal this_page "api-news.html" %}
Expand All @@ -34,31 +34,31 @@
{% ifequal this_page "api-controller.html" %}
<strong>Web Controllers</strong>
{% else %}
<a href="api-controller.html">Web Controllers</a>
<a href="api-controller.html">Web Controllers</a>
{% endifequal %}
&nbsp; | &nbsp;
{% ifequal this_page "api-mq.html" %}
<strong>BossMQ</strong>
{% else %}
<a href="api-mq.html">BossMQ</a>
{% endifequal %}
&nbsp; | &nbsp;
&nbsp; | &nbsp;
{% ifequal this_page "api-websocket.html" %}
<strong>WebSockets</strong>
{% else %}
<a href="api-websocket.html">WebSockets</a>
{% endifequal %}
&nbsp; | &nbsp;
&nbsp; | &nbsp;
{% ifequal this_page "api-session.html" %}
<strong>Sessions</strong>
{% else %}
<a href="api-session.html">Sessions</a>
{% endifequal %}
{% endifequal %}
&nbsp; | &nbsp;
{% ifequal this_page "api-mail-controller.html" %}
<strong>Mail</strong>
{% else %}
<a href="api-mail-controller.html">Mail</a>
<a href="api-mail-controller.html">Mail</a>
{% endifequal %}
&nbsp; | &nbsp;
{% ifequal this_page "api-view.html" %}
Expand Down
44 changes: 22 additions & 22 deletions doc-src/boss.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ span.var {
div.nav {
clear: both;
color: white;
font-size: 20px;
font-size: 20px;
margin-bottom: 20px;
}
div.nav a {
color: #000;
font-size: 20px; margin-top: 40px; margin-bottom: 20px;
}
div.subnav {
text-align: center;
text-align: center;
font-size: 14px;
padding: 16px;
}
Expand Down Expand Up @@ -163,27 +163,27 @@ div.main_header {
width: 900px; margin-left: auto; margin-right: auto;
}
div.main_logo {
text-align: left;
padding: 40px 40px 40px 30px;
color: white;
margin-right: auto;
width: 280px;
text-align: left;
padding: 40px 40px 40px 30px;
color: white;
margin-right: auto;
width: 280px;
float: left;
}
div.main_checklist {
color: black;
font-size: 30px;
text-align: left;
float: left;
margin-top: 40px;
color: black;
font-size: 30px;
text-align: left;
float: left;
margin-top: 40px;
line-height: 36px;
}
div.secondary_header {
width: 790px;
height: 50px;
margin-left: auto;
margin-right: auto;
text-align: left;
width: 790px;
height: 50px;
margin-left: auto;
margin-right: auto;
text-align: left;
color: white;
}
div.secondary_logo {
Expand All @@ -197,11 +197,11 @@ div.secondary_quote {
float: right;
}
div.content {
text-align: left;
text-align: left;
background-color: white;
position: absolute;
margin-left: -425px;
left: 50%;
position: absolute;
margin-left: -425px;
left: 50%;
padding: 30px 30px;
width: 790px;
font-size: 20px; padding-bottom: 300px;
Expand All @@ -228,4 +228,4 @@ td.code {
#link-home {
margin-top: 0px;
padding: 10px;
}
}
2 changes: 1 addition & 1 deletion include/simple_bridge.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
-record(cookie, { name, value, path="/", minutes_to_live=20 }).
-record(header, { name, value }).
-record(response, { statuscode=200, headers=[], cookies=[], data=[] }).
-record(uploaded_file, { original_name, temp_file, size }).
-record(uploaded_file, { original_name, temp_file, size }).
4 changes: 2 additions & 2 deletions include/xmerl.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
%% XML declaration
-record(xmlDecl,{
vsn, % string() XML version
encoding, % string() Character encoding
encoding, % string() Character encoding
standalone, % (yes | no)
attributes % [#xmlAttribute()] Other attributes than above
}).
Expand Down Expand Up @@ -239,6 +239,6 @@
-define(condstrip3, {_, T3, S3} = condstrip(T2,S2,false)).
-define(condstrip4, {_, T4, S4} = condstrip(T3,S3,false)).

-define(bump_col(N),
-define(bump_col(N),
?dbg("bump_col(~p), US = ~p~n", [N, S0#xmerl_scanner.user_state]),
S = S0#xmerl_scanner{col = S0#xmerl_scanner.col + N}).
26 changes: 13 additions & 13 deletions include/yaws_api.hrl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%%----------------------------------------------------------------------
%%% File : yaws_api.hrl
%%% Author : Claes Wikstrom <[email protected]>
%%% Purpose :
%%% Purpose :
%%% Created : 24 Jan 2002 by Claes Wikstrom <[email protected]>
%%%----------------------------------------------------------------------

Expand All @@ -13,11 +13,11 @@
headers, %% headers
req, %% request
clidata, %% The client data (as a binary in POST requests)
server_path, %% The normalized server path
server_path, %% The normalized server path
%% (pre-querystring part of URI)
querydata, %% For URIs of the form ...?querydata
querydata, %% For URIs of the form ...?querydata
%% equiv of cgi QUERY_STRING
appmoddata, %% (deprecated - use pathinfo instead) the remainder
appmoddata, %% (deprecated - use pathinfo instead) the remainder
%% of the path leading up to the query
docroot, %% Physical base location of data for this request
docroot_mount, %% virtual directory e.g /myapp/ that the docroot
Expand All @@ -27,13 +27,13 @@
state, %% State for use by users of the out/1 callback
pid, %% pid of the yaws worker process
opaque, %% useful to pass static data
appmod_prepath, %% (deprecated - use prepath instead) path in front
appmod_prepath, %% (deprecated - use prepath instead) path in front
%%of: <appmod><appmoddata>
prepath, %% Path prior to 'dynamic' segment of URI.
%% ie http://some.host/<prepath>/<script-point>/d/e
%% where <script-point> is an appmod mount point,
prepath, %% Path prior to 'dynamic' segment of URI.
%% ie http://some.host/<prepath>/<script-point>/d/e
%% where <script-point> is an appmod mount point,
%% or .yaws,.php,.cgi,.fcgi etc script file.
pathinfo %% Set to '/d/e' when calling c.yaws for the request
pathinfo %% Set to '/d/e' when calling c.yaws for the request
%% http://some.host/a/b/c.yaws/d/e
%% equiv of cgi PATH_INFO
}).
Expand Down Expand Up @@ -83,9 +83,9 @@


-record(setcookie,{
key,
value,
quoted,
key,
value,
quoted,
comment,
comment_url,
discard,
Expand All @@ -109,4 +109,4 @@




2 changes: 1 addition & 1 deletion priv/elixir/boss/session.ex
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defmodule Boss.Session do
Retrieve the value for a given key associated with a given session ID
"""
@spec get_session_data(:string, :term) :: any
def get_session_data(session_id, key) do
def get_session_data(session_id, key) do
:boss_session.get_session_data(:erlang.binary_to_list(session_id), key)
end

Expand Down
Loading

0 comments on commit f92d5e7

Please sign in to comment.