ballast 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd59bbb0c6206ad0a3389ea19f5832b069080841
-  data.tar.gz: b162883d21ad6f5661d7e1ba324766e78eb87432
+  metadata.gz: dc5799f1e29dc591080f335e942871ad0941546d
+  data.tar.gz: 1fa78408a9ab5e5de07394b508803bf21c3b98cf
 SHA512:
-  metadata.gz: cd120366facef08cd59d4b9e0e667a7ae0859d27d47bbe56780f0bcfdd3d7787506c370fc966235f9042b6c6053a450ed01c1f531cbd209134cff3fef4f6871b
-  data.tar.gz: 08469e4cbdda11b1c528ce5c4bda41c3056a0aaa2af1c9985318f2c691ca756a9a491b6f42f1a9339fadcfb6cae2407e039a4427f8de9cc286e8231d9deeee84
+  metadata.gz: 736d23b13df218cba6cb2b93b88018d7e73b8c29c203c62e556a03efec18f6176a9eef07efd2994244a01d64f9a5f68c7f6af499ea7191b1952347b78071529d
+  data.tar.gz: dbc51a1733cfcffbf0586e7f7f21ddb6e0488b52a4419c0a2a9ecab5571db78d8cc14f287c47a3cbbbf78e8cc3c908d518ac70414931cbf585a29fbc0e6db555

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.5.1 / 2014-01-04
+
+* Fixed is_json? detection.
+
 ### 1.5.0 / 2014-01-04
 
 * Added is_json? to Concerns::Common.

data/doc/Ballast/Concerns/Ajax.html

@@ -424,7 +424,7 @@
       <pre class="code"><span class="info file"># File 'lib/ballast/concerns/ajax.rb', line 16</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_is_ajax?'>is_ajax?</span>
-  <span class='lparen'>(</span><span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:xhr?</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_xhr?'>xhr?</span><span class='rparen'>)</span> <span class='op'>||</span> <span class='id identifier rubyid_params'>params</span><span class='lbracket'>[</span><span class='symbol'>:xhr</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_to_boolean'>to_boolean</span> <span class='op'>?</span> <span class='kw'>true</span> <span class='op'>:</span> <span class='kw'>false</span>
+  <span class='lparen'>(</span><span class='lparen'>(</span><span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:xhr?</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_xhr?'>xhr?</span><span class='rparen'>)</span> <span class='op'>||</span> <span class='id identifier rubyid_params'>params</span><span class='lbracket'>[</span><span class='symbol'>:xhr</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_to_boolean'>to_boolean</span><span class='rparen'>)</span> <span class='op'>?</span> <span class='kw'>true</span> <span class='op'>:</span> <span class='kw'>false</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -797,7 +797,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Concerns/Common.html

@@ -790,7 +790,7 @@ and <code>%:Z</code> for the zone name considering also DST.</p>
       <pre class="code"><span class="info file"># File 'lib/ballast/concerns/common.rb', line 13</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_is_json?'>is_json?</span>
-  <span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_format'>format</span><span class='period'>.</span><span class='id identifier rubyid_to_s'>to_s</span> <span class='op'>=~</span> <span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^json</span><span class='regexp_end'>/</span></span> <span class='op'>||</span> <span class='id identifier rubyid_params'>params</span><span class='lbracket'>[</span><span class='symbol'>:json</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_to_boolean'>to_boolean</span> <span class='op'>?</span> <span class='kw'>true</span> <span class='op'>:</span> <span class='kw'>false</span>
+  <span class='lparen'>(</span><span class='lbracket'>[</span><span class='symbol'>:json</span><span class='comma'>,</span> <span class='symbol'>:jsonp</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_include?'>include?</span><span class='lparen'>(</span><span class='id identifier rubyid_request'>request</span><span class='period'>.</span><span class='id identifier rubyid_format'>format</span><span class='period'>.</span><span class='id identifier rubyid_to_sym'>to_sym</span><span class='rparen'>)</span> <span class='op'>||</span> <span class='id identifier rubyid_params'>params</span><span class='lbracket'>[</span><span class='symbol'>:json</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_to_boolean'>to_boolean</span><span class='rparen'>)</span> <span class='op'>?</span> <span class='kw'>true</span> <span class='op'>:</span> <span class='kw'>false</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -967,7 +967,7 @@ and <code>%:Z</code> for the zone name considering also DST.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Concerns/ErrorsHandling.html

@@ -291,7 +291,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Concerns/View.html

@@ -638,7 +638,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Concerns.html

@@ -118,7 +118,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Configuration.html

@@ -273,7 +273,7 @@ Subfolders are not supported.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:58 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Context.html

@@ -408,7 +408,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Errors/BaseError.html

@@ -317,7 +317,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Errors/InvalidDomain.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Errors/PerformError.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Errors/ValidationError.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Errors.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Middlewares/DefaultHost.html

@@ -345,7 +345,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:05 2014 by
+  Generated on Sat Jan  4 10:31:58 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Middlewares.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Operation.html

@@ -1295,7 +1295,7 @@ as owner will be created.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:58 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/OperationsChain.html

@@ -576,7 +576,7 @@ as owner will be created.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:05 2014 by
+  Generated on Sat Jan  4 10:31:58 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/RequestDomainMatcher.html

@@ -908,7 +908,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:05 2014 by
+  Generated on Sat Jan  4 10:31:58 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast/Version.html

@@ -149,7 +149,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>0</span></pre></dd>
+        <dd><pre class="code"><span class='int'>1</span></pre></dd>
       
         <dt id="STRING-constant" class="">STRING =
           <div class="docstring">
@@ -180,7 +180,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/Ballast.html

@@ -121,7 +121,7 @@ Licensed under the MIT license, which can be found at http://www.opensource.org/
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/_index.html

@@ -310,7 +310,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/file.README.html

@@ -106,7 +106,7 @@
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/index.html

@@ -106,7 +106,7 @@
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jan  4 10:24:04 2014 by
+  Generated on Sat Jan  4 10:31:57 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.1.0).
 </div>

data/lib/ballast/concerns/ajax.rb

@@ -14,7 +14,7 @@ module Ballast
       #
       # @return [Boolean] `true` if the request is AJAX, `false` otherwise.
       def is_ajax?
-        (request.respond_to?(:xhr?) && request.xhr?) || params[:xhr].to_boolean ? true : false
+        ((request.respond_to?(:xhr?) && request.xhr?) || params[:xhr].to_boolean) ? true : false
       end
 
       # Prepares an AJAX response.

data/lib/ballast/concerns/common.rb

@@ -11,7 +11,7 @@ module Ballast
       #
       # @return [Boolean] `true` if the request is JSON, `false` otherwise.
       def is_json?
-        request.format.to_s =~ /^json/ || params[:json].to_boolean ? true : false
+        ([:json, :jsonp].include?(request.format.to_sym) || params[:json].to_boolean) ? true : false
       end
 
       # Checks if the user is sending any data.

data/lib/ballast/version.rb

@@ -16,7 +16,7 @@ module Ballast
     MINOR = 5
 
     # The patch version.
-    PATCH = 0
+    PATCH = 1
 
     # The current version of ballast.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ballast
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Shogun