ballast 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 831bec995600c12211acef57807be3ef3418d464
4
- data.tar.gz: 9faabdb0f6bba36a70e586fddeb0c1e508c9f971
3
+ metadata.gz: 6e0045bb5b0118483db7f72217afda2de7e046e1
4
+ data.tar.gz: c22a0b06575026afcf3434bb652fe4d23efe3cc9
5
5
  SHA512:
6
- metadata.gz: acdfb157d6f82f80c3dc844b82a1d71355cb6a185ecf22dd41fd477291ffe2187eb273fa2797a3da7b0cac307fca9e7af6df0c9a5418d64d44401f6d102938ee
7
- data.tar.gz: 4875408b81e99f33f31281478a1734b3b34930ab550dc9cb4ab765b629c3753a60f06917dd16a0c11b0f19e15caf321bdfcf08066f7745e3dbf16c8f2d43446f
6
+ metadata.gz: 60cae974e698ed37241e89a5a847fd82f020430c2c5c7c721c05ddc6c2c95510565b1bc73118f5161e597f10224006070118f540593e8f407b4195e30d44e7f0
7
+ data.tar.gz: 4d8d0f9ab9623e8d6ac4873fef3c5c7bd985d8c74d78d2c07049f44206ba59bd945990df1b32cd09e63ad416aa8f06fe1b796638c6c322cc5faccde5f1b95269
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ### 2.2.1 / 2014-02-07
2
+
3
+ * Minor fix in `Ballast::Service::Response.reply`.
4
+
1
5
  ### 2.2.0 / 2014-02-06
2
6
 
3
7
  * Removed `fail!(..., on_validation: true)` in favor of `fail_validation!(...)` inside `Ballast::Service`.
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 Fri Feb 6 16:18:34 2015 by
259
+ Generated on Sat Feb 7 19:16:42 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>
@@ -561,7 +561,8 @@
561
561
  82
562
562
  83
563
563
  84
564
- 85</pre>
564
+ 85
565
+ 86</pre>
565
566
  </td>
566
567
  <td>
567
568
  <pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
@@ -609,9 +610,10 @@
609
610
  <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>
610
611
 
611
612
  <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>
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>
613
+ <span class='rubyid_content identifier id'>content</span> <span class='assign token'>=</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
614
+ <span class='rubyid_content identifier id'>content</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_content identifier id'>content</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_content identifier id'>content</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>
613
615
 
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'>&gt;</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>
616
+ <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'>&gt;</span> <span class='rubyid_content identifier id'>content</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>
615
617
  <span class='rubyid_end end kw'>end</span>
616
618
 
617
619
  <span class='rubyid_private identifier id'>private</span>
@@ -631,7 +633,7 @@
631
633
  <span class='rubyid_end end kw'>end</span>
632
634
 
633
635
  <span class='comment val'># :nodoc:</span>
634
- <span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
636
+ <span class='rubyid_def def kw'>def</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
635
637
  <span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='rubyid_Utils constant id'>Utils</span><span class='dot token'>.</span><span class='rubyid_status_code identifier id'>status_code</span><span class='lparen token'>(</span><span class='rubyid_status identifier id'>status</span><span class='rparen token'>)</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
638
  <span class='rubyid_end end kw'>end</span>
637
639
  <span class='rubyid_end end kw'>end</span>
@@ -753,7 +755,8 @@
753
755
  82
754
756
  83
755
757
  84
756
- 85</pre>
758
+ 85
759
+ 86</pre>
757
760
  </td>
758
761
  <td>
759
762
  <pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
@@ -801,9 +804,10 @@
801
804
  <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>
802
805
 
803
806
  <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>
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>
807
+ <span class='rubyid_content identifier id'>content</span> <span class='assign token'>=</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
808
+ <span class='rubyid_content identifier id'>content</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_content identifier id'>content</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_content identifier id'>content</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>
805
809
 
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'>&gt;</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>
810
+ <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'>&gt;</span> <span class='rubyid_content identifier id'>content</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>
807
811
  <span class='rubyid_end end kw'>end</span>
808
812
 
809
813
  <span class='rubyid_private identifier id'>private</span>
@@ -823,7 +827,7 @@
823
827
  <span class='rubyid_end end kw'>end</span>
824
828
 
825
829
  <span class='comment val'># :nodoc:</span>
826
- <span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
830
+ <span class='rubyid_def def kw'>def</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
827
831
  <span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='rubyid_Utils constant id'>Utils</span><span class='dot token'>.</span><span class='rubyid_status_code identifier id'>status_code</span><span class='lparen token'>(</span><span class='rubyid_status identifier id'>status</span><span class='rparen token'>)</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
832
  <span class='rubyid_end end kw'>end</span>
829
833
  <span class='rubyid_end end kw'>end</span>
@@ -945,7 +949,8 @@
945
949
  82
946
950
  83
947
951
  84
948
- 85</pre>
952
+ 85
953
+ 86</pre>
949
954
  </td>
950
955
  <td>
951
956
  <pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
@@ -993,9 +998,10 @@
993
998
  <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>
994
999
 
995
1000
  <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>
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>
1001
+ <span class='rubyid_content identifier id'>content</span> <span class='assign token'>=</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
1002
+ <span class='rubyid_content identifier id'>content</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_content identifier id'>content</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_content identifier id'>content</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>
997
1003
 
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'>&gt;</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>
1004
+ <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'>&gt;</span> <span class='rubyid_content identifier id'>content</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>
999
1005
  <span class='rubyid_end end kw'>end</span>
1000
1006
 
1001
1007
  <span class='rubyid_private identifier id'>private</span>
@@ -1015,7 +1021,7 @@
1015
1021
  <span class='rubyid_end end kw'>end</span>
1016
1022
 
1017
1023
  <span class='comment val'># :nodoc:</span>
1018
- <span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
1024
+ <span class='rubyid_def def kw'>def</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
1019
1025
  <span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='rubyid_Utils constant id'>Utils</span><span class='dot token'>.</span><span class='rubyid_status_code identifier id'>status_code</span><span class='lparen token'>(</span><span class='rubyid_status identifier id'>status</span><span class='rparen token'>)</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
1026
  <span class='rubyid_end end kw'>end</span>
1021
1027
  <span class='rubyid_end end kw'>end</span>
@@ -1137,7 +1143,8 @@
1137
1143
  82
1138
1144
  83
1139
1145
  84
1140
- 85</pre>
1146
+ 85
1147
+ 86</pre>
1141
1148
  </td>
1142
1149
  <td>
1143
1150
  <pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 17</span>
@@ -1185,9 +1192,10 @@
1185
1192
  <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>
1186
1193
 
1187
1194
  <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>
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>
1195
+ <span class='rubyid_content identifier id'>content</span> <span class='assign token'>=</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
1196
+ <span class='rubyid_content identifier id'>content</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_content identifier id'>content</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_content identifier id'>content</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>
1189
1197
 
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'>&gt;</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>
1198
+ <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'>&gt;</span> <span class='rubyid_content identifier id'>content</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>
1191
1199
  <span class='rubyid_end end kw'>end</span>
1192
1200
 
1193
1201
  <span class='rubyid_private identifier id'>private</span>
@@ -1207,7 +1215,7 @@
1207
1215
  <span class='rubyid_end end kw'>end</span>
1208
1216
 
1209
1217
  <span class='comment val'># :nodoc:</span>
1210
- <span class='rubyid_def def kw'>def</span> <span class='rubyid_payload identifier id'>payload</span>
1218
+ <span class='rubyid_def def kw'>def</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
1211
1219
  <span class='lbrace token'>{</span><span class='label val'>status:</span> <span class='rubyid_Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='rubyid_Utils constant id'>Utils</span><span class='dot token'>.</span><span class='rubyid_status_code identifier id'>status_code</span><span class='lparen token'>(</span><span class='rubyid_status identifier id'>status</span><span class='rparen token'>)</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
1220
  <span class='rubyid_end end kw'>end</span>
1213
1221
  <span class='rubyid_end end kw'>end</span>
@@ -1435,7 +1443,8 @@
1435
1443
  60
1436
1444
  61
1437
1445
  62
1438
- 63</pre>
1446
+ 63
1447
+ 64</pre>
1439
1448
  </td>
1440
1449
  <td>
1441
1450
  <pre class="code"><span class="info file"># File 'lib/ballast/ajax_response.rb', line 56</span>
@@ -1444,9 +1453,10 @@
1444
1453
  <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>
1445
1454
 
1446
1455
  <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>
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>
1456
+ <span class='rubyid_content identifier id'>content</span> <span class='assign token'>=</span> <span class='rubyid_prepare_content identifier id'>prepare_content</span>
1457
+ <span class='rubyid_content identifier id'>content</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_content identifier id'>content</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_content identifier id'>content</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>
1448
1458
 
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'>&gt;</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>
1459
+ <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'>&gt;</span> <span class='rubyid_content identifier id'>content</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>
1450
1460
  <span class='rubyid_end end kw'>end</span>
1451
1461
  </pre>
1452
1462
  </td>
@@ -1459,7 +1469,7 @@
1459
1469
  </div>
1460
1470
 
1461
1471
  <div id="footer">
1462
- Generated on Fri Feb 6 16:18:34 2015 by
1472
+ Generated on Sat Feb 7 19:16:43 2015 by
1463
1473
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
1464
1474
  0.8.7.6 (ruby-2.2.0).
1465
1475
  </div>
@@ -118,7 +118,7 @@
118
118
  </div>
119
119
 
120
120
  <div id="footer">
121
- Generated on Fri Feb 6 16:18:34 2015 by
121
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
661
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
959
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
277
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
884
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
454
+ Generated on Sat Feb 7 19:16:43 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>
@@ -116,7 +116,7 @@
116
116
  </div>
117
117
 
118
118
  <div id="footer">
119
- Generated on Fri Feb 6 16:18:34 2015 by
119
+ Generated on Sat Feb 7 19:16:42 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 Fri Feb 6 16:18:34 2015 by
408
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
793
+ Generated on Sat Feb 7 19:16:42 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>
@@ -116,7 +116,7 @@
116
116
  </div>
117
117
 
118
118
  <div id="footer">
119
- Generated on Fri Feb 6 16:18:34 2015 by
119
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
349
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
155
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
151
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
159
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
119
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
350
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:34 2015 by
917
+ Generated on Sat Feb 7 19:16:43 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>
@@ -1513,7 +1513,7 @@
1513
1513
  </div>
1514
1514
 
1515
1515
  <div id="footer">
1516
- Generated on Fri Feb 6 16:18:34 2015 by
1516
+ Generated on Sat Feb 7 19:16:43 2015 by
1517
1517
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
1518
1518
  0.8.7.6 (ruby-2.2.0).
1519
1519
  </div>
@@ -1269,7 +1269,7 @@
1269
1269
  </div>
1270
1270
 
1271
1271
  <div id="footer">
1272
- Generated on Fri Feb 6 16:18:34 2015 by
1272
+ Generated on Sat Feb 7 19:16:43 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>
@@ -151,7 +151,7 @@
151
151
 
152
152
  </div>
153
153
  </dt>
154
- <dd><pre class="code"><span class='integer val'>0</span>
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 Fri Feb 6 16:18:34 2015 by
187
+ Generated on Sat Feb 7 19:16:43 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 Fri Feb 6 16:18:33 2015 by
342
+ Generated on Sat Feb 7 19:16:42 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 Fri Feb 6 16:18:33 2015 by
109
+ Generated on Sat Feb 7 19:16:42 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 Fri Feb 6 16:18:33 2015 by
109
+ Generated on Sat Feb 7 19:16:42 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 Fri Feb 6 16:18:34 2015 by
106
+ Generated on Sat Feb 7 19:16:42 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,9 +57,10 @@ 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(payload) : ActiveSupport::JSON.encode(payload)) if [:json, :jsonp, :text].include?(format)
60
+ content = prepare_content
61
+ content = (pretty_json ? Oj.dump(content) : ActiveSupport::JSON.encode(content)) if [:json, :jsonp, :text].include?(format)
61
62
 
62
- transport.render(format => data, status: numeric_status, callback: callback, content_type: content_type)
63
+ transport.render(format => content, status: numeric_status, callback: callback, content_type: content_type)
63
64
  end
64
65
 
65
66
  private
@@ -79,7 +80,7 @@ module Ballast
79
80
  end
80
81
 
81
82
  # :nodoc:
82
- def payload
83
+ def prepare_content
83
84
  {status: Rack::Utils.status_code(status), data: data, error: error}
84
85
  end
85
86
  end
@@ -16,7 +16,7 @@ module Ballast
16
16
  MINOR = 2
17
17
 
18
18
  # The patch version.
19
- PATCH = 0
19
+ PATCH = 1
20
20
 
21
21
  # The current version of ballast.
22
22
  STRING = [MAJOR, MINOR, PATCH].compact.join(".")
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.2.0
4
+ version: 2.2.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-02-07 00:00:00.000000000 Z
11
+ date: 2015-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack