ballast 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8838024de6682d876a4dd3fdb4d57f3fda2d0d2
-  data.tar.gz: 9ed8b341289200f31225a3c8f278f1a31bfe5712
+  metadata.gz: 96bbf671f803a5034149d924d4030cdb89582fe5
+  data.tar.gz: eabe6347f93c5cb97f58f7cb1b1cedc73dda934e
 SHA512:
-  metadata.gz: 5b566f331d9fe3443c5624246bc2b5cc43076f9fa9eb66396956705ddacdaff1ffabb818572ba7fe878bcd2aec1dac880c38f4834d77ec8e56aef682af667a51
-  data.tar.gz: cb565f2dbd53b62eb3e279e06b3748446b16dd101c2eb0a3d053d871d12aa6bacacb1a86080d4474f98d2d3f9b01e4ed6c2a74f479cfd74ea2098fa94cb17b21
+  metadata.gz: 4e3e3b9026d53322563e9c2b685ce8d8cdfe7ae36f57b9b97ac13c34af6e625f9e72ea9b9914c7dab068eb56ce2c36cda355e3cddea3b7f8b7b27aeb81dafc7b
+  data.tar.gz: d90d12d537af952daea0803499cc2a648eebbbdffa8c2e910f67285581e3064509bceac335d35067b9e41cff4c3d8f0bbee9d8851ff0046a066585669b4507b4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.1.1 / 2013-12-25
+
+* Fixed authentication error handling.
+
 ### 1.1.0 / 2013-12-25
 
 * Added domain handling.

data/doc/Ballast/Concerns/Ajax.html

@@ -797,7 +797,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Concerns/Common.html

@@ -361,10 +361,7 @@
 88
 89
 90
-91
-92
-93
-94</pre>
+91</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/ballast/concerns/common.rb', line 81</span>
@@ -377,10 +374,7 @@
 
   <span class='kw'>if</span> <span class='op'>!</span><span class='id identifier rubyid_authenticated'>authenticated</span> <span class='kw'>then</span>
     <span class='id identifier rubyid_headers'>headers</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>WWW-Authenticate</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Basic realm=\&quot;</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_area'>area</span><span class='embexpr_end'>}</span><span class='tstring_content'>\&quot;</span><span class='tstring_end'>&quot;</span></span>
-    <span class='ivar'>@error_title</span> <span class='op'>=</span> <span class='id identifier rubyid_title'>title</span>
-    <span class='ivar'>@error_code</span> <span class='op'>=</span> <span class='int'>401</span>
-    <span class='ivar'>@error_message</span> <span class='op'>=</span> <span class='id identifier rubyid_message'>message</span>
-    <span class='id identifier rubyid_handle_error'>handle_error</span>
+    <span class='id identifier rubyid_handle_error'>handle_error</span><span class='lparen'>(</span><span class='lbrace'>{</span><span class='label'>status:</span> <span class='int'>401</span><span class='comma'>,</span> <span class='label'>title:</span> <span class='id identifier rubyid_title'>title</span><span class='comma'>,</span> <span class='label'>message:</span> <span class='id identifier rubyid_message'>message</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -891,7 +885,7 @@ and <code>%:Z</code> for the zone name considering also DST.</p>
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Concerns/ErrorsHandling.html

@@ -90,7 +90,7 @@
 
 <h2>Overview</h2><div class="docstring">
   <div class="discussion">
-    <p>A concern to handle errors.</p>
+    <p>A concern to handle errors. It requires the Ajax concern.</p>
 
 
   </div>
@@ -254,7 +254,7 @@
     <span class='ivar'>@error_title</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Debug</span><span class='tstring_end'>&quot;</span></span>
     <span class='ivar'>@error_code</span> <span class='op'>=</span> <span class='int'>503</span>
   <span class='kw'>elsif</span> <span class='ivar'>@error</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>Hash</span><span class='rparen'>)</span> <span class='kw'>then</span>
-    <span class='ivar'>@error_title</span> <span class='op'>=</span> <span class='id identifier rubyid_title'>title</span>
+    <span class='ivar'>@error_title</span> <span class='op'>=</span> <span class='ivar'>@error</span><span class='lbracket'>[</span><span class='symbol'>:title</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='id identifier rubyid_title'>title</span>
     <span class='ivar'>@error_code</span> <span class='op'>=</span> <span class='ivar'>@error</span><span class='lbracket'>[</span><span class='symbol'>:status</span><span class='rbracket'>]</span>
     <span class='ivar'>@error_message</span> <span class='op'>=</span> <span class='ivar'>@error</span><span class='lbracket'>[</span><span class='symbol'>:error</span><span class='rbracket'>]</span>
   <span class='kw'>else</span>
@@ -274,7 +274,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Concerns/View.html

@@ -655,7 +655,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Concerns.html

@@ -118,7 +118,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Context.html

@@ -408,7 +408,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Errors/BaseError.html

@@ -317,7 +317,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Errors/InvalidDomain.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Errors/PerformError.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Errors/ValidationError.html

@@ -148,7 +148,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Errors.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Middlewares/DefaultHost.html

@@ -345,7 +345,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Middlewares.html

@@ -116,7 +116,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/Operation.html

@@ -1295,7 +1295,7 @@ as owner will be created.</p>
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/OperationsChain.html

@@ -576,7 +576,7 @@ as owner will be created.</p>
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/Ballast/RequestDomainMatcher.html

@@ -908,7 +908,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.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 Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.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 Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/_index.html

@@ -303,7 +303,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:17:59 2013 by
+  Generated on Wed Dec 25 14:38:15 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/file.README.html

@@ -106,7 +106,7 @@
 </div></div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/index.html

@@ -106,7 +106,7 @@
 </div></div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:18:00 2013 by
+  Generated on Wed Dec 25 14:38:16 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.3 (ruby-2.0.0).
 </div>

data/lib/ballast/concerns/common.rb

@@ -86,10 +86,7 @@ module Ballast
 
         if !authenticated then
           headers["WWW-Authenticate"] = "Basic realm=\"#{area}\""
-          @error_title = title
-          @error_code = 401
-          @error_message = message
-          handle_error
+          handle_error({status: 401, title: title, message: message})
         end
       end
     end

data/lib/ballast/concerns/errors_handling.rb

@@ -5,7 +5,7 @@
 
 module Ballast
   module Concerns
-    # A concern to handle errors.
+    # A concern to handle errors. It requires the Ajax concern.
     module ErrorsHandling
       extend ActiveSupport::Concern
 
@@ -21,7 +21,7 @@ module Ballast
           @error_title = "Debug"
           @error_code = 503
         elsif @error.is_a?(Hash) then
-          @error_title = title
+          @error_title = @error[:title] || title
           @error_code = @error[:status]
           @error_message = @error[:error]
         else

data/lib/ballast/version.rb

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

data/spec/ballast/concerns/common_spec.rb

@@ -78,23 +78,18 @@ describe Ballast::Concerns::Common do
 
     it "in case of failure, it should set error" do
       expect(subject).to receive(:authenticate_with_http_basic).and_return(false)
-      expect(subject).to receive(:handle_error)
-      subject.authenticate_user
+      expect(subject).to receive(:handle_error).with({status: 401, title: "Authentication required.", message: "To view this resource you have to authenticate."})
 
+      subject.authenticate_user
       expect(subject.headers["WWW-Authenticate"]).to eq("Basic realm=\"Private Area\"")
-      expect(subject.instance_variable_get(:@error_title)).to eq("Authentication required.")
-      expect(subject.instance_variable_get(:@error_message)).to eq("To view this resource you have to authenticate.")
-      expect(subject.instance_variable_get(:@error_code)).to eq(401)
     end
 
     it "in case of failure, it should show custom messages" do
       expect(subject).to receive(:authenticate_with_http_basic).and_return(false)
-      expect(subject).to receive(:handle_error)
-      subject.authenticate_user("AREA", "TITLE", "MESSAGE")
+      expect(subject).to receive(:handle_error).with({status: 401, title: "TITLE", message: "MESSAGE"})
 
+      subject.authenticate_user("AREA", "TITLE", "MESSAGE")
       expect(subject.headers["WWW-Authenticate"]).to eq("Basic realm=\"AREA\"")
-      expect(subject.instance_variable_get(:@error_title)).to eq("TITLE")
-      expect(subject.instance_variable_get(:@error_message)).to eq("MESSAGE")
     end
   end
 end

metadata

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