ballast 2.1.0 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/doc/Ballast.html +1 -1
- data/doc/Ballast/AjaxResponse.html +50 -10
- data/doc/Ballast/Concerns.html +1 -1
- data/doc/Ballast/Concerns/AjaxHandling.html +1 -1
- data/doc/Ballast/Concerns/Common.html +1 -1
- data/doc/Ballast/Concerns/ErrorsHandling.html +1 -1
- data/doc/Ballast/Concerns/View.html +1 -1
- data/doc/Ballast/Configuration.html +1 -1
- data/doc/Ballast/Emoji.html +1 -1
- data/doc/Ballast/Emoji/Character.html +1 -1
- data/doc/Ballast/Emoji/Utils.html +1 -1
- data/doc/Ballast/Errors.html +1 -1
- data/doc/Ballast/Errors/Base.html +1 -1
- data/doc/Ballast/Errors/Failure.html +1 -1
- data/doc/Ballast/Errors/InvalidDomain.html +1 -1
- data/doc/Ballast/Errors/ValidationFailure.html +1 -1
- data/doc/Ballast/Middlewares.html +1 -1
- data/doc/Ballast/Middlewares/DefaultHost.html +1 -1
- data/doc/Ballast/RequestDomainMatcher.html +1 -1
- data/doc/Ballast/Service.html +1 -1
- data/doc/Ballast/Service/Response.html +1 -1
- data/doc/Ballast/Version.html +2 -2
- data/doc/_index.html +1 -1
- data/doc/file.README.html +1 -1
- data/doc/index.html +1 -1
- data/doc/top-level-namespace.html +1 -1
- data/lib/ballast/ajax_response.rb +6 -1
- data/lib/ballast/version.rb +1 -1
- data/spec/ballast/ajax_response_spec.rb +7 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 939e493b1312aefe200ad228f91309bf89a4665f
|
4
|
+
data.tar.gz: 91f58ec75cabaeea9afbb2e85587a5e048371565
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 98b0f82450f505af6d4cd416c4cd071ba62f370cdc3cd18ab3729dca0c73ac7d7f833d16db37e7e27508437545a6cd0054385c97de5866806898040a3517a004
|
7
|
+
data.tar.gz: 06218d65b4090f7a6d2b4493d8dca69b167250a21a278f92ab01664e92a0712eff38d162e3009c5cecd658dd757994a8e5f9d57a493638b902de0f61224ae18d
|
data/CHANGELOG.md
CHANGED
data/doc/Ballast.html
CHANGED
@@ -256,7 +256,7 @@ Licensed under the MIT license, which can be found at http://www.opensource.org/
|
|
256
256
|
</div>
|
257
257
|
|
258
258
|
<div id="footer">
|
259
|
-
Generated on
|
259
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
260
260
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
261
261
|
0.8.7.6 (ruby-2.2.0).
|
262
262
|
</div>
|
@@ -556,7 +556,12 @@
|
|
556
556
|
77
|
557
557
|
78
|
558
558
|
79
|
559
|
-
80
|
559
|
+
80
|
560
|
+
81
|
561
|
+
82
|
562
|
+
83
|
563
|
+
84
|
564
|
+
85</pre>
|
560
565
|
</td>
|
561
566
|
<td>
|
562
567
|
<pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
|
@@ -604,7 +609,7 @@
|
|
604
609
|
<span class='rubyid_return return kw'>return</span> <span class='rubyid_if if_mod kw'>if</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_performed? fid id'>performed?</span>
|
605
610
|
|
606
611
|
<span class='rubyid_format identifier id'>format</span><span class='comma token'>,</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='rubyid_content_type identifier id'>content_type</span> <span class='assign token'>=</span> <span class='rubyid_format_reply identifier id'>format_reply</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
607
|
-
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='
|
612
|
+
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='rubyid_ActiveSupport constant id'>ActiveSupport</span><span class='colon2 op'>::</span><span class='rubyid_JSON constant id'>JSON</span><span class='dot token'>.</span><span class='rubyid_encode identifier id'>encode</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span><span class='rparen token'>)</span> <span class='rubyid_if if_mod kw'>if</span> <span class='lbrack token'>[</span><span class='symbol val'>:json</span><span class='comma token'>,</span> <span class='symbol val'>:jsonp</span><span class='comma token'>,</span> <span class='symbol val'>:text</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='rubyid_include? fid id'>include?</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
608
613
|
|
609
614
|
<span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_render identifier id'>render</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='assign token'>=</span><span class='gt op'>></span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>status:</span> <span class='rubyid_numeric_status identifier id'>numeric_status</span><span class='comma token'>,</span> <span class='label val'>callback:</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='label val'>content_type:</span> <span class='rubyid_content_type identifier id'>content_type</span><span class='rparen token'>)</span>
|
610
615
|
<span class='rubyid_end end kw'>end</span>
|
@@ -624,6 +629,11 @@
|
|
624
629
|
<span class='rubyid_def def kw'>def</span> <span class='rubyid_choose_format identifier id'>choose_format</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
625
630
|
<span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_params identifier id'>params</span><span class='lbrack token'>[</span><span class='symbol val'>:format</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_request identifier id'>request</span><span class='dot token'>.</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='string val'>"json"</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='rubyid_to_sym identifier id'>to_sym</span>
|
626
631
|
<span class='rubyid_end end kw'>end</span>
|
632
|
+
|
633
|
+
<span class='comment val'># :nodoc:</span>
|
634
|
+
<span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
|
635
|
+
<span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_status identifier id'>status</span><span class='comma token'>,</span> <span class='label val'>data:</span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>error:</span> <span class='rubyid_error identifier id'>error</span><span class='rbrace token'>}</span>
|
636
|
+
<span class='rubyid_end end kw'>end</span>
|
627
637
|
<span class='rubyid_end end kw'>end</span>
|
628
638
|
</pre>
|
629
639
|
</td>
|
@@ -738,7 +748,12 @@
|
|
738
748
|
77
|
739
749
|
78
|
740
750
|
79
|
741
|
-
80
|
751
|
+
80
|
752
|
+
81
|
753
|
+
82
|
754
|
+
83
|
755
|
+
84
|
756
|
+
85</pre>
|
742
757
|
</td>
|
743
758
|
<td>
|
744
759
|
<pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
|
@@ -786,7 +801,7 @@
|
|
786
801
|
<span class='rubyid_return return kw'>return</span> <span class='rubyid_if if_mod kw'>if</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_performed? fid id'>performed?</span>
|
787
802
|
|
788
803
|
<span class='rubyid_format identifier id'>format</span><span class='comma token'>,</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='rubyid_content_type identifier id'>content_type</span> <span class='assign token'>=</span> <span class='rubyid_format_reply identifier id'>format_reply</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
789
|
-
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='
|
804
|
+
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='rubyid_ActiveSupport constant id'>ActiveSupport</span><span class='colon2 op'>::</span><span class='rubyid_JSON constant id'>JSON</span><span class='dot token'>.</span><span class='rubyid_encode identifier id'>encode</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span><span class='rparen token'>)</span> <span class='rubyid_if if_mod kw'>if</span> <span class='lbrack token'>[</span><span class='symbol val'>:json</span><span class='comma token'>,</span> <span class='symbol val'>:jsonp</span><span class='comma token'>,</span> <span class='symbol val'>:text</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='rubyid_include? fid id'>include?</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
790
805
|
|
791
806
|
<span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_render identifier id'>render</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='assign token'>=</span><span class='gt op'>></span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>status:</span> <span class='rubyid_numeric_status identifier id'>numeric_status</span><span class='comma token'>,</span> <span class='label val'>callback:</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='label val'>content_type:</span> <span class='rubyid_content_type identifier id'>content_type</span><span class='rparen token'>)</span>
|
792
807
|
<span class='rubyid_end end kw'>end</span>
|
@@ -806,6 +821,11 @@
|
|
806
821
|
<span class='rubyid_def def kw'>def</span> <span class='rubyid_choose_format identifier id'>choose_format</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
807
822
|
<span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_params identifier id'>params</span><span class='lbrack token'>[</span><span class='symbol val'>:format</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_request identifier id'>request</span><span class='dot token'>.</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='string val'>"json"</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='rubyid_to_sym identifier id'>to_sym</span>
|
808
823
|
<span class='rubyid_end end kw'>end</span>
|
824
|
+
|
825
|
+
<span class='comment val'># :nodoc:</span>
|
826
|
+
<span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
|
827
|
+
<span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_status identifier id'>status</span><span class='comma token'>,</span> <span class='label val'>data:</span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>error:</span> <span class='rubyid_error identifier id'>error</span><span class='rbrace token'>}</span>
|
828
|
+
<span class='rubyid_end end kw'>end</span>
|
809
829
|
<span class='rubyid_end end kw'>end</span>
|
810
830
|
</pre>
|
811
831
|
</td>
|
@@ -920,7 +940,12 @@
|
|
920
940
|
77
|
921
941
|
78
|
922
942
|
79
|
923
|
-
80
|
943
|
+
80
|
944
|
+
81
|
945
|
+
82
|
946
|
+
83
|
947
|
+
84
|
948
|
+
85</pre>
|
924
949
|
</td>
|
925
950
|
<td>
|
926
951
|
<pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
|
@@ -968,7 +993,7 @@
|
|
968
993
|
<span class='rubyid_return return kw'>return</span> <span class='rubyid_if if_mod kw'>if</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_performed? fid id'>performed?</span>
|
969
994
|
|
970
995
|
<span class='rubyid_format identifier id'>format</span><span class='comma token'>,</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='rubyid_content_type identifier id'>content_type</span> <span class='assign token'>=</span> <span class='rubyid_format_reply identifier id'>format_reply</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
971
|
-
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='
|
996
|
+
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='rubyid_ActiveSupport constant id'>ActiveSupport</span><span class='colon2 op'>::</span><span class='rubyid_JSON constant id'>JSON</span><span class='dot token'>.</span><span class='rubyid_encode identifier id'>encode</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span><span class='rparen token'>)</span> <span class='rubyid_if if_mod kw'>if</span> <span class='lbrack token'>[</span><span class='symbol val'>:json</span><span class='comma token'>,</span> <span class='symbol val'>:jsonp</span><span class='comma token'>,</span> <span class='symbol val'>:text</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='rubyid_include? fid id'>include?</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
972
997
|
|
973
998
|
<span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_render identifier id'>render</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='assign token'>=</span><span class='gt op'>></span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>status:</span> <span class='rubyid_numeric_status identifier id'>numeric_status</span><span class='comma token'>,</span> <span class='label val'>callback:</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='label val'>content_type:</span> <span class='rubyid_content_type identifier id'>content_type</span><span class='rparen token'>)</span>
|
974
999
|
<span class='rubyid_end end kw'>end</span>
|
@@ -988,6 +1013,11 @@
|
|
988
1013
|
<span class='rubyid_def def kw'>def</span> <span class='rubyid_choose_format identifier id'>choose_format</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
989
1014
|
<span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_params identifier id'>params</span><span class='lbrack token'>[</span><span class='symbol val'>:format</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_request identifier id'>request</span><span class='dot token'>.</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='string val'>"json"</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='rubyid_to_sym identifier id'>to_sym</span>
|
990
1015
|
<span class='rubyid_end end kw'>end</span>
|
1016
|
+
|
1017
|
+
<span class='comment val'># :nodoc:</span>
|
1018
|
+
<span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
|
1019
|
+
<span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_status identifier id'>status</span><span class='comma token'>,</span> <span class='label val'>data:</span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>error:</span> <span class='rubyid_error identifier id'>error</span><span class='rbrace token'>}</span>
|
1020
|
+
<span class='rubyid_end end kw'>end</span>
|
991
1021
|
<span class='rubyid_end end kw'>end</span>
|
992
1022
|
</pre>
|
993
1023
|
</td>
|
@@ -1102,7 +1132,12 @@
|
|
1102
1132
|
77
|
1103
1133
|
78
|
1104
1134
|
79
|
1105
|
-
80
|
1135
|
+
80
|
1136
|
+
81
|
1137
|
+
82
|
1138
|
+
83
|
1139
|
+
84
|
1140
|
+
85</pre>
|
1106
1141
|
</td>
|
1107
1142
|
<td>
|
1108
1143
|
<pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
|
@@ -1150,7 +1185,7 @@
|
|
1150
1185
|
<span class='rubyid_return return kw'>return</span> <span class='rubyid_if if_mod kw'>if</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_performed? fid id'>performed?</span>
|
1151
1186
|
|
1152
1187
|
<span class='rubyid_format identifier id'>format</span><span class='comma token'>,</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='rubyid_content_type identifier id'>content_type</span> <span class='assign token'>=</span> <span class='rubyid_format_reply identifier id'>format_reply</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
1153
|
-
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='
|
1188
|
+
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='rubyid_ActiveSupport constant id'>ActiveSupport</span><span class='colon2 op'>::</span><span class='rubyid_JSON constant id'>JSON</span><span class='dot token'>.</span><span class='rubyid_encode identifier id'>encode</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span><span class='rparen token'>)</span> <span class='rubyid_if if_mod kw'>if</span> <span class='lbrack token'>[</span><span class='symbol val'>:json</span><span class='comma token'>,</span> <span class='symbol val'>:jsonp</span><span class='comma token'>,</span> <span class='symbol val'>:text</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='rubyid_include? fid id'>include?</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
1154
1189
|
|
1155
1190
|
<span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_render identifier id'>render</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='assign token'>=</span><span class='gt op'>></span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>status:</span> <span class='rubyid_numeric_status identifier id'>numeric_status</span><span class='comma token'>,</span> <span class='label val'>callback:</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='label val'>content_type:</span> <span class='rubyid_content_type identifier id'>content_type</span><span class='rparen token'>)</span>
|
1156
1191
|
<span class='rubyid_end end kw'>end</span>
|
@@ -1170,6 +1205,11 @@
|
|
1170
1205
|
<span class='rubyid_def def kw'>def</span> <span class='rubyid_choose_format identifier id'>choose_format</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
1171
1206
|
<span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_params identifier id'>params</span><span class='lbrack token'>[</span><span class='symbol val'>:format</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_request identifier id'>request</span><span class='dot token'>.</span><span class='rubyid_format identifier id'>format</span> <span class='orop op'>||</span> <span class='string val'>"json"</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='rubyid_to_sym identifier id'>to_sym</span>
|
1172
1207
|
<span class='rubyid_end end kw'>end</span>
|
1208
|
+
|
1209
|
+
<span class='comment val'># :nodoc:</span>
|
1210
|
+
<span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
|
1211
|
+
<span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_status identifier id'>status</span><span class='comma token'>,</span> <span class='label val'>data:</span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>error:</span> <span class='rubyid_error identifier id'>error</span><span class='rbrace token'>}</span>
|
1212
|
+
<span class='rubyid_end end kw'>end</span>
|
1173
1213
|
<span class='rubyid_end end kw'>end</span>
|
1174
1214
|
</pre>
|
1175
1215
|
</td>
|
@@ -1404,7 +1444,7 @@
|
|
1404
1444
|
<span class='rubyid_return return kw'>return</span> <span class='rubyid_if if_mod kw'>if</span> <span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_performed? fid id'>performed?</span>
|
1405
1445
|
|
1406
1446
|
<span class='rubyid_format identifier id'>format</span><span class='comma token'>,</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='rubyid_content_type identifier id'>content_type</span> <span class='assign token'>=</span> <span class='rubyid_format_reply identifier id'>format_reply</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
1407
|
-
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='
|
1447
|
+
<span class='rubyid_data identifier id'>data</span> <span class='assign token'>=</span> <span class='lparen token'>(</span><span class='rubyid_pretty_json identifier id'>pretty_json</span> <span class='integer val'>? </span><span class='rubyid_Oj constant id'>Oj</span><span class='dot token'>.</span><span class='rubyid_dump identifier id'>dump</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='rubyid_ActiveSupport constant id'>ActiveSupport</span><span class='colon2 op'>::</span><span class='rubyid_JSON constant id'>JSON</span><span class='dot token'>.</span><span class='rubyid_encode identifier id'>encode</span><span class='lparen token'>(</span><span class='rubyid_payload identifier id'>payload</span><span class='rparen token'>)</span><span class='rparen token'>)</span> <span class='rubyid_if if_mod kw'>if</span> <span class='lbrack token'>[</span><span class='symbol val'>:json</span><span class='comma token'>,</span> <span class='symbol val'>:jsonp</span><span class='comma token'>,</span> <span class='symbol val'>:text</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='rubyid_include? fid id'>include?</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span><span class='rparen token'>)</span>
|
1408
1448
|
|
1409
1449
|
<span class='rubyid_transport identifier id'>transport</span><span class='dot token'>.</span><span class='rubyid_render identifier id'>render</span><span class='lparen token'>(</span><span class='rubyid_format identifier id'>format</span> <span class='assign token'>=</span><span class='gt op'>></span> <span class='rubyid_data identifier id'>data</span><span class='comma token'>,</span> <span class='label val'>status:</span> <span class='rubyid_numeric_status identifier id'>numeric_status</span><span class='comma token'>,</span> <span class='label val'>callback:</span> <span class='rubyid_callback identifier id'>callback</span><span class='comma token'>,</span> <span class='label val'>content_type:</span> <span class='rubyid_content_type identifier id'>content_type</span><span class='rparen token'>)</span>
|
1410
1450
|
<span class='rubyid_end end kw'>end</span>
|
@@ -1419,7 +1459,7 @@
|
|
1419
1459
|
</div>
|
1420
1460
|
|
1421
1461
|
<div id="footer">
|
1422
|
-
Generated on
|
1462
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
1423
1463
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
1424
1464
|
0.8.7.6 (ruby-2.2.0).
|
1425
1465
|
</div>
|
data/doc/Ballast/Concerns.html
CHANGED
@@ -118,7 +118,7 @@
|
|
118
118
|
</div>
|
119
119
|
|
120
120
|
<div id="footer">
|
121
|
-
Generated on
|
121
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
122
122
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
123
123
|
0.8.7.6 (ruby-2.2.0).
|
124
124
|
</div>
|
@@ -658,7 +658,7 @@
|
|
658
658
|
</div>
|
659
659
|
|
660
660
|
<div id="footer">
|
661
|
-
Generated on
|
661
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
662
662
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
663
663
|
0.8.7.6 (ruby-2.2.0).
|
664
664
|
</div>
|
@@ -956,7 +956,7 @@ and <code>%:Z</code> for the zone name considering also DST.</p>
|
|
956
956
|
</div>
|
957
957
|
|
958
958
|
<div id="footer">
|
959
|
-
Generated on
|
959
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
960
960
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
961
961
|
0.8.7.6 (ruby-2.2.0).
|
962
962
|
</div>
|
@@ -274,7 +274,7 @@
|
|
274
274
|
</div>
|
275
275
|
|
276
276
|
<div id="footer">
|
277
|
-
Generated on
|
277
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
278
278
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
279
279
|
0.8.7.6 (ruby-2.2.0).
|
280
280
|
</div>
|
@@ -881,7 +881,7 @@
|
|
881
881
|
</div>
|
882
882
|
|
883
883
|
<div id="footer">
|
884
|
-
Generated on
|
884
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
885
885
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
886
886
|
0.8.7.6 (ruby-2.2.0).
|
887
887
|
</div>
|
@@ -451,7 +451,7 @@ Subfolders are not supported.</p>
|
|
451
451
|
</div>
|
452
452
|
|
453
453
|
<div id="footer">
|
454
|
-
Generated on
|
454
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
455
455
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
456
456
|
0.8.7.6 (ruby-2.2.0).
|
457
457
|
</div>
|
data/doc/Ballast/Emoji.html
CHANGED
@@ -116,7 +116,7 @@
|
|
116
116
|
</div>
|
117
117
|
|
118
118
|
<div id="footer">
|
119
|
-
Generated on
|
119
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
120
120
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
121
121
|
0.8.7.6 (ruby-2.2.0).
|
122
122
|
</div>
|
@@ -405,7 +405,7 @@
|
|
405
405
|
</div>
|
406
406
|
|
407
407
|
<div id="footer">
|
408
|
-
Generated on
|
408
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
409
409
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
410
410
|
0.8.7.6 (ruby-2.2.0).
|
411
411
|
</div>
|
@@ -790,7 +790,7 @@
|
|
790
790
|
</div>
|
791
791
|
|
792
792
|
<div id="footer">
|
793
|
-
Generated on
|
793
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
794
794
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
795
795
|
0.8.7.6 (ruby-2.2.0).
|
796
796
|
</div>
|
data/doc/Ballast/Errors.html
CHANGED
@@ -116,7 +116,7 @@
|
|
116
116
|
</div>
|
117
117
|
|
118
118
|
<div id="footer">
|
119
|
-
Generated on
|
119
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
120
120
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
121
121
|
0.8.7.6 (ruby-2.2.0).
|
122
122
|
</div>
|
@@ -346,7 +346,7 @@
|
|
346
346
|
</div>
|
347
347
|
|
348
348
|
<div id="footer">
|
349
|
-
Generated on
|
349
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
350
350
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
351
351
|
0.8.7.6 (ruby-2.2.0).
|
352
352
|
</div>
|
@@ -152,7 +152,7 @@
|
|
152
152
|
</div>
|
153
153
|
|
154
154
|
<div id="footer">
|
155
|
-
Generated on
|
155
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
156
156
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
157
157
|
0.8.7.6 (ruby-2.2.0).
|
158
158
|
</div>
|
@@ -148,7 +148,7 @@
|
|
148
148
|
</div>
|
149
149
|
|
150
150
|
<div id="footer">
|
151
|
-
Generated on
|
151
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
152
152
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
153
153
|
0.8.7.6 (ruby-2.2.0).
|
154
154
|
</div>
|
@@ -156,7 +156,7 @@
|
|
156
156
|
</div>
|
157
157
|
|
158
158
|
<div id="footer">
|
159
|
-
Generated on
|
159
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
160
160
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
161
161
|
0.8.7.6 (ruby-2.2.0).
|
162
162
|
</div>
|
@@ -116,7 +116,7 @@
|
|
116
116
|
</div>
|
117
117
|
|
118
118
|
<div id="footer">
|
119
|
-
Generated on
|
119
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
120
120
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
121
121
|
0.8.7.6 (ruby-2.2.0).
|
122
122
|
</div>
|
@@ -347,7 +347,7 @@
|
|
347
347
|
</div>
|
348
348
|
|
349
349
|
<div id="footer">
|
350
|
-
Generated on
|
350
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
351
351
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
352
352
|
0.8.7.6 (ruby-2.2.0).
|
353
353
|
</div>
|
@@ -914,7 +914,7 @@
|
|
914
914
|
</div>
|
915
915
|
|
916
916
|
<div id="footer">
|
917
|
-
Generated on
|
917
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
918
918
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
919
919
|
0.8.7.6 (ruby-2.2.0).
|
920
920
|
</div>
|
data/doc/Ballast/Service.html
CHANGED
@@ -1301,7 +1301,7 @@
|
|
1301
1301
|
</div>
|
1302
1302
|
|
1303
1303
|
<div id="footer">
|
1304
|
-
Generated on
|
1304
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
1305
1305
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
1306
1306
|
0.8.7.6 (ruby-2.2.0).
|
1307
1307
|
</div>
|
@@ -1269,7 +1269,7 @@
|
|
1269
1269
|
</div>
|
1270
1270
|
|
1271
1271
|
<div id="footer">
|
1272
|
-
Generated on
|
1272
|
+
Generated on Fri Jan 30 16:37:17 2015 by
|
1273
1273
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
1274
1274
|
0.8.7.6 (ruby-2.2.0).
|
1275
1275
|
</div>
|
data/doc/Ballast/Version.html
CHANGED
@@ -151,7 +151,7 @@
|
|
151
151
|
|
152
152
|
</div>
|
153
153
|
</dt>
|
154
|
-
<dd><pre class="code"><span class='integer val'>
|
154
|
+
<dd><pre class="code"><span class='integer val'>1</span>
|
155
155
|
</pre></dd>
|
156
156
|
|
157
157
|
<dt id="STRING-constant" class="">STRING =
|
@@ -184,7 +184,7 @@
|
|
184
184
|
</div>
|
185
185
|
|
186
186
|
<div id="footer">
|
187
|
-
Generated on
|
187
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
188
188
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
189
189
|
0.8.7.6 (ruby-2.2.0).
|
190
190
|
</div>
|
data/doc/_index.html
CHANGED
@@ -339,7 +339,7 @@
|
|
339
339
|
</div>
|
340
340
|
|
341
341
|
<div id="footer">
|
342
|
-
Generated on
|
342
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
343
343
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
344
344
|
0.8.7.6 (ruby-2.2.0).
|
345
345
|
</div>
|
data/doc/file.README.html
CHANGED
@@ -106,7 +106,7 @@
|
|
106
106
|
</div></div>
|
107
107
|
|
108
108
|
<div id="footer">
|
109
|
-
Generated on
|
109
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
110
110
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
111
111
|
0.8.7.6 (ruby-2.2.0).
|
112
112
|
</div>
|
data/doc/index.html
CHANGED
@@ -106,7 +106,7 @@
|
|
106
106
|
</div></div>
|
107
107
|
|
108
108
|
<div id="footer">
|
109
|
-
Generated on
|
109
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
110
110
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
111
111
|
0.8.7.6 (ruby-2.2.0).
|
112
112
|
</div>
|
@@ -103,7 +103,7 @@
|
|
103
103
|
</div>
|
104
104
|
|
105
105
|
<div id="footer">
|
106
|
-
Generated on
|
106
|
+
Generated on Fri Jan 30 16:37:16 2015 by
|
107
107
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
108
108
|
0.8.7.6 (ruby-2.2.0).
|
109
109
|
</div>
|
@@ -57,7 +57,7 @@ module Ballast
|
|
57
57
|
return if transport.performed?
|
58
58
|
|
59
59
|
format, callback, content_type = format_reply(format)
|
60
|
-
data = (pretty_json ? Oj.dump(
|
60
|
+
data = (pretty_json ? Oj.dump(payload) : ActiveSupport::JSON.encode(payload)) if [:json, :jsonp, :text].include?(format)
|
61
61
|
|
62
62
|
transport.render(format => data, status: numeric_status, callback: callback, content_type: content_type)
|
63
63
|
end
|
@@ -77,5 +77,10 @@ module Ballast
|
|
77
77
|
def choose_format(format)
|
78
78
|
(format || transport.params[:format] || transport.request.format || "json").to_sym
|
79
79
|
end
|
80
|
+
|
81
|
+
# :nodoc:
|
82
|
+
def payload
|
83
|
+
{status: status, data: data, error: error}
|
84
|
+
end
|
80
85
|
end
|
81
86
|
end
|
data/lib/ballast/version.rb
CHANGED
@@ -51,6 +51,13 @@ describe Ballast::AjaxResponse do
|
|
51
51
|
subject.reply(format: :jsonp)
|
52
52
|
end
|
53
53
|
|
54
|
+
it "should not include the transport for pretty JSON" do
|
55
|
+
subject.status = 403
|
56
|
+
|
57
|
+
expect(@transport).to receive(:render).with(json: "{\n \"status\":403,\n \"data\":\"DATA\",\n \"error\":\"ERROR\"\n}\n", status: 403, callback: nil, content_type: nil)
|
58
|
+
subject.reply(format: nil, pretty_json: true)
|
59
|
+
end
|
60
|
+
|
54
61
|
it "should fallback to transport request format" do
|
55
62
|
subject.status = 403
|
56
63
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ballast
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shogun
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionpack
|