ballast 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90752416d3960380afc5cd5d0a3816080d308dc3
-  data.tar.gz: a9e14654abd5fa74c46c6fb99261e05705ea8c59
+  metadata.gz: 3388a7a801511693256a1137f34b3825e377e485
+  data.tar.gz: cbe11293e58b2fbdc4d04297e3d188ce1001165c
 SHA512:
-  metadata.gz: b68c31697bc02ae9c7d26bad19b04c7188e42b91c6c1195652d7a7f4da36bdc603af1d4cbaf7693c8c0675105c0020a7e885190d081dcf178bfcf6bd71e4c74f
-  data.tar.gz: 4edd006dfd2b1c014f5d961d16a35b596ddf8afe744a4ac726825783ddb1255a35972f707a9837dc39272186f679e4114ad608fe9e2f0d7ecf0852e7e9898b0c
+  metadata.gz: a95df246c2fa28afefc163e7a1732b3cf7f2f96e448d00e0af0e48fa71b0a026b0399f889231fe6cff8ffc1c7f523495c5b4fd490ac07b910a3f0bbde3680641
+  data.tar.gz: f40b1b1dab152befbcb2c305f98971d0ed28489b443ff1ca768c2b6752ce9df5f9bb4ccd34e450c0009da20c094b9fad85618245fb4dd4c60abb613b2b2d7698

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.0 / 2013-12-25
+
+* Changed Javascript parameters output interface.
+
 ### 1.1.2 / 2013-12-25
 
 * Made Concerns::Common#format_short_amount second parameter optional.

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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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/Ajax.html

@@ -797,7 +797,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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

@@ -887,7 +887,7 @@ and <code>%:Z</code> for the zone name considering also DST.</p>
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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

@@ -274,7 +274,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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

@@ -181,7 +181,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#javascript_params-instance_method" title="#javascript_params (instance method)">- (String|Hash) <strong>javascript_params</strong>(as_html = true, tag = :details, id = nil) </a>
+      <a href="#javascript_params-instance_method" title="#javascript_params (instance method)">- (String|Hash) <strong>javascript_params</strong>(id = nil, tag = :details) </a>
     
 
     
@@ -309,6 +309,7 @@
       <pre class="lines">
 
 
+47
 48
 49
 50
@@ -320,11 +321,10 @@
 56
 57
 58
-59
-60</pre>
+59</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/ballast/concerns/view.rb', line 48</span>
+      <pre class="code"><span class="info file"># File 'lib/ballast/concerns/view.rb', line 47</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_add_javascript_params'>add_javascript_params</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='id identifier rubyid_replace'>replace</span> <span class='op'>=</span> <span class='kw'>false</span><span class='rparen'>)</span>
   <span class='ivar'>@javascript_params</span> <span class='op'>||=</span> <span class='const'>HashWithIndifferentAccess</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
@@ -484,7 +484,7 @@
       <div class="method_details ">
   <h3 class="signature " id="javascript_params-instance_method">
   
-    - (<tt>String|Hash</tt>) <strong>javascript_params</strong>(as_html = true, tag = :details, id = nil) 
+    - (<tt>String|Hash</tt>) <strong>javascript_params</strong>(id = nil, tag = :details) 
   
 
   
@@ -503,17 +503,17 @@
   
     <li>
       
-        <span class='name'>as_html</span>
+        <span class='name'>id</span>
       
       
-        <span class='type'>(<tt>Boolean</tt>)</span>
+        <span class='type'>(<tt>String|NilClass|FalseClass</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>true</tt>)</em>
+        <em class="default">(defaults to: <tt>nil</tt>)</em>
       
       
         &mdash;
-        <div class='inline'><p>Whether to return the parameters as HTML rather than hash.</p>
+        <div class='inline'><p>The id for the tag. If <code>nil</code> or <code>false</code>, the parameters will be returned as an hash.</p>
 </div>
       
     </li>
@@ -535,23 +535,6 @@
       
     </li>
   
-    <li>
-      
-        <span class='name'>id</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>nil</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'><p>The id for the tag.</p>
-</div>
-      
-    </li>
-  
 </ul>
 
 <p class="tag_title">Returns:</p>
@@ -578,15 +561,15 @@
       <pre class="lines">
 
 
+38
 39
-40
-41</pre>
+40</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/ballast/concerns/view.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/ballast/concerns/view.rb', line 38</span>
 
-<span class='kw'>def</span> <span class='id identifier rubyid_javascript_params'>javascript_params</span><span class='lparen'>(</span><span class='id identifier rubyid_as_html'>as_html</span> <span class='op'>=</span> <span class='kw'>true</span><span class='comma'>,</span> <span class='id identifier rubyid_tag'>tag</span> <span class='op'>=</span> <span class='symbol'>:details</span><span class='comma'>,</span> <span class='id identifier rubyid_id'>id</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_as_html'>as_html</span> <span class='op'>?</span> <span class='id identifier rubyid_content_tag'>content_tag</span><span class='lparen'>(</span><span class='id identifier rubyid_tag'>tag</span><span class='comma'>,</span> <span class='ivar'>@javascript_params</span><span class='period'>.</span><span class='id identifier rubyid_to_json'>to_json</span><span class='period'>.</span><span class='id identifier rubyid_html_safe'>html_safe</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>data-jid</span><span class='tstring_end'>&quot;</span></span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id'>id</span><span class='rparen'>)</span><span class='op'>:</span> <span class='ivar'>@javascript_params</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_javascript_params'>javascript_params</span><span class='lparen'>(</span><span class='id identifier rubyid_id'>id</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='comma'>,</span> <span class='id identifier rubyid_tag'>tag</span> <span class='op'>=</span> <span class='symbol'>:details</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_id'>id</span> <span class='op'>?</span> <span class='id identifier rubyid_content_tag'>content_tag</span><span class='lparen'>(</span><span class='id identifier rubyid_tag'>tag</span><span class='comma'>,</span> <span class='ivar'>@javascript_params</span><span class='period'>.</span><span class='id identifier rubyid_to_json'>to_json</span><span class='period'>.</span><span class='id identifier rubyid_html_safe'>html_safe</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>data-jid</span><span class='tstring_end'>&quot;</span></span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id'>id</span><span class='rparen'>)</span><span class='op'>:</span> <span class='ivar'>@javascript_params</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -655,7 +638,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Dec 25 14:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:05 2013 by
+  Generated on Wed Dec 25 15:52:54 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:50:05 2013 by
+  Generated on Wed Dec 25 15:52:54 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:50:05 2013 by
+  Generated on Wed Dec 25 15:52:54 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:50:05 2013 by
+  Generated on Wed Dec 25 15:52:54 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

@@ -134,7 +134,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>1</span></pre></dd>
+        <dd><pre class="code"><span class='int'>2</span></pre></dd>
       
         <dt id="PATCH-constant" class="">PATCH =
           <div class="docstring">
@@ -149,7 +149,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>2</span></pre></dd>
+        <dd><pre class="code"><span class='int'>0</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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:52 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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:50:04 2013 by
+  Generated on Wed Dec 25 15:52:53 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/view.rb

@@ -32,12 +32,11 @@ module Ballast
 
       # Outputs the Javascript parameters.
       #
-      # @param as_html [Boolean] Whether to return the parameters as HTML rather than hash.
+      # @param id [String|NilClass|FalseClass] The id for the tag. If `nil` or `false`, the parameters will be returned as an hash.
       # @param tag [Symbol] The tag to use for HTML.
-      # @param id [String] The id for the tag.
       # @return [String|Hash] Javascript parameters as HTML or the hash.
-      def javascript_params(as_html = true, tag = :details, id = nil)
-        as_html ? content_tag(tag, @javascript_params.to_json.html_safe, "data-jid" => id): @javascript_params
+      def javascript_params(id = nil, tag = :details)
+        id ? content_tag(tag, @javascript_params.to_json.html_safe, "data-jid" => id): @javascript_params
       end
 
       # Appends new Javascript parameters.

data/lib/ballast/version.rb

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

data/spec/ballast/concerns/view_spec.rb

@@ -62,11 +62,12 @@ describe Ballast::Concerns::View do
 
     it "should output Javascript as HTML" do
       expect(subject).to receive(:content_tag).with(:tag, '{"a":"1","b":2}', {"data-jid" => "ID"}).and_return("HTML")
-      expect(subject.javascript_params(true, :tag, "ID")).to eq("HTML")
+      expect(subject.javascript_params("ID", :tag)).to eq("HTML")
     end
 
     it "should return Javascript as Hash" do
       expect(subject.javascript_params(false)).to eq({a: "1", b: 2})
+      expect(subject.javascript_params(nil)).to eq({a: "1", b: 2})
     end
   end
 

metadata

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