blot 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a786bd43a519269a7e46fe60f9400a84b4f7f972
-  data.tar.gz: 4793aa337c554b481e64f5d0e108615d16deac08
+  metadata.gz: 75fb82eb36721ba625375899e41786b2f1af8dd9
+  data.tar.gz: aeb72d5a8b0e61f2a0230c254e6bf9204bf21358
 SHA512:
-  metadata.gz: d7638da818a17bd9ed9d7aece291060b403f686c73c8a668755a23a5d2189959b37dc27eec82212fe68d8882a9cfede8d501660ad62bea2533c99e461d5cee13
-  data.tar.gz: 525bec7f37bdfcd6dae2ff2f115ed3e833dfcc1eba9db39358f0f07db7d8355e696d6cfddd8303f643b6d5ead77b9f158a1d8a37e341e4f86c80beb675f55ec8
+  metadata.gz: 2befd7af52d2815d14e87587d2db752460602a5d8fb4525d5164b822f88ef601625244311dab11aa40fd4c1d7a8e8db813e878ac6359bc996079b60425d5862b
+  data.tar.gz: 23042442e8b71804da4f9352b6ab55e2973e09ceb875ec9fe64dc990940ed50e138ab859f8e902ecb3c2540c63e0ea9561cd95e7803584b2f3d6e2bda3b19e87

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# CHANGELOG
+
+## 1.2.0
+
+From @BenMorganIO
+
+- Added `center` tag.
+- You are no longer required to set `wrapper(class: 'wrapper')` anymore. It is now simply: `wrapper`.
+- The `wrapper` method is backwards compatible if options are provided.
+
+## 1.1.1
+
+From @BenMorganIO
+
+- Content from `layout` is now HTML safe.
+- `layout` can now be provided `nil` content.
+
+## 1.1.0
+
+From @BenMorganIO
+
+- Added `layout` method with options to include styles into the head.
+
+## 1.0.0
+
+Initial release

data/README.md

@@ -97,15 +97,15 @@ The grid in Blot matches Ink very well. It is able to produce rows, sub-grids, c
 ```ruby
 container do
   row do
-    wrapper(class: 'wrapper last') do
+    wrapper(class: 'last') do
       columns(:twelve, class: 'panel') { '.twelve.columns' }
     end
   end
   row do
-    wrapper(class: 'wrapper') do
+    wrapper do
       columns(:six, class: 'panel') { '.six.columns' }
     end
-    wrapper(class: 'wrapper last') do
+    wrapper(class: 'last') do
       columns(:six, class: 'panel') { '.six.columns' }
     end
   end
@@ -166,10 +166,34 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'wrapper') do
+  center do
+    'Content'
+  end
+end
+```
+
+```html
+<table class="row">
+  <tr>
+    <td align="center" class="center">
+      <center>
+
+        Content
+
+      </center>
+    </td>
+  </tr>
+</table>
+```
+
+#### Render Centered Content from Columns
+
+```ruby
+row do
+  wrapper do
     columns(:six, class: 'center panel') { 'Centered content' }
   end
-  wrapper(class: 'wrapper last') do
+  wrapper(class: 'last') do
     columns(:six, class: 'center panel') do
       image_tag 'http://placehold.it/125x125&text=Centered%20Image', class: 'center', alt: 'centered image'
     end
@@ -212,7 +236,7 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'wrapper offset-by-four') do
+  wrapper(class: 'offset-by-four') do
     columns(:eight, class: 'panel') { 'Offset Content' }
   end
 end
@@ -239,13 +263,13 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'wrapper') do
+  wrapper do
     columns(:four, class: 'left-text-pad') { 'Text' }
   end
-  wrapper(class: 'wrapper') do
+  wrapper do
     columns(:four) { 'Text' }
   end
-  wrapper(class: 'wrapper last') do
+  wrapper(class: 'last') do
     columns(:four, class: 'right-text-pad') { 'Text' }
   end
 end
@@ -292,7 +316,7 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'center', align: 'center') do
+  center do
     container(class: 'wrapper last') do
       columns(:twelve) { 'Content' }
     end
@@ -331,13 +355,13 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'wrapper') do
+  wrapper do
     columns(:eight, sub_columns: true) do
       sub_columns(:eight) { '.eight.sub-columns' } +
       sub_columns(:four, class: 'last') { '.four.sub-columns' }
     end
   end
-  wrapper(class: 'wrapper last') do
+  wrapper(class: 'last') do
     columns(:four) { '.four.columns' }
   end
 end
@@ -376,8 +400,8 @@ end
 ```ruby
 container do
   block_grid(up: :two) do
-    wrapper { 'Column #1' }
-    wrapper { 'Column #2' }
+    content_tag(:td) { 'Column #1' }
+    content_tag(:td) { 'Column #2' }
   end
 end
 ```
@@ -403,10 +427,10 @@ end
 
 ```ruby
 row do
-  wrapper(class: 'wrapper') do
+  wrapper do
     columns(:eight) { 'Main content' }
   end
-  wrapper(class: 'wrapper last') do
+  wrapper(class: 'last') do
     columns(:four, class: 'panel') { 'Panel content' }
   end
 end
@@ -506,7 +530,7 @@ hide_for_small
 
 ```ruby
 row do
-  wrapper(class: 'wrapper last') do
+  wrapper(class: 'last') do
     show_for_small do
       columns(:twelve, class: 'panel') { '.show-for-small' }
     end

data/lib/blot/helpers/grid.rb

@@ -13,7 +13,9 @@ module Blot
       def container(options={})
         content_tag :table, class: 'container' do
           content_tag :tr do
-            wrapper(options) { yield if block_given? }
+            content_tag :td, options do
+              yield if block_given?
+            end
           end
         end
       end
@@ -42,7 +44,9 @@ module Blot
             content = if options[:sub_columns]
               block_given? ? yield : nil
             elsif !options.empty? || block_given?
-              wrapper(options) { yield if block_given? }
+              content_tag :td, options do
+                optional_content(options) { yield if block_given? }
+              end
             else
               nil
             end
@@ -55,16 +59,29 @@ module Blot
 
       def sub_columns(width, options={})
         options[:class] = "#{width} sub-columns #{options[:class]}".strip
-        wrapper(options) { yield if block_given? }
+        content_tag :td, options do
+          optional_content(options) { yield if block_given? }
+        end
       end
       alias :sub_column :sub_columns
 
       def wrapper(options={}, &block)
+        unless options.delete(:wrapper).is_a?(FalseClass) || options[:class] && options[:class].split(' ').include?('wrapper')
+          options[:class] = "wrapper #{options[:class]}".squish
+        end
         content_tag :td, options do
           optional_content(options) { yield if block_given? }
         end
       end
 
+      def center(&block)
+        content_tag :td, class: 'center', align: 'center' do
+          content_tag :center do
+            yield if block_given?
+          end
+        end
+      end
+
       private
 
       def expander

data/lib/blot/version.rb

@@ -1,3 +1,3 @@
 module Blot
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/blot/helpers/grid_spec.rb

@@ -105,29 +105,57 @@ describe Blot::Helpers::Grid do
   end
 
   describe '.wrapper' do
-    it 'can be empty' do
-      expect(view.wrapper).to eql <<-HTML.compress
+    it 'can be empty by setting to false' do
+      expect(view.wrapper(wrapper: false)).to eql <<-HTML.compress
         <td></td>
       HTML
     end
 
     it 'can yield content' do
       expect(view.wrapper { "Content" }).to eql <<-HTML.compress
-        <td>Content</td>
+        <td class="wrapper">Content</td>
       HTML
     end
 
     it 'can have a class' do
-      expect(view.wrapper(class: 'wrapper') { 'Content' }).to eql <<-HTML.compress
-        <td class="wrapper">Content</td>
+      expect(view.wrapper(class: 'last') { 'Content' }).to eql <<-HTML.compress
+        <td class="wrapper last">Content</td>
       HTML
     end
 
     it 'can have multiple classes' do
-      expect(view.wrapper(class: 'wrapper last') { 'Content' }).to eql <<-HTML.compress
-        <td class="wrapper last">Content</td>
+      expect(view.wrapper(class: 'my-wrapper last') { 'Content' }).to eql <<-HTML.compress
+        <td class="wrapper my-wrapper last">Content</td>
       HTML
     end
+
+    it 'can have wrapper as a class' do
+      expect(view.wrapper(class: 'wrapper')).to eql <<-HTML.compress
+        <td class="wrapper"></td>
+      HTML
+    end
+  end
+
+  describe '.center' do
+    it 'can be empty' do
+      expect(view.center).to eql <<-HTML.compress
+        <td align="center" class="center">
+          <center></center>
+        </td>
+      HTML
+    end
+
+    it 'can yield centered content' do
+      expect(view.center { 'Content' }).to eql <<-HTML.compress
+        <td align="center" class="center">
+          <center>Content</center>
+        </td>
+      HTML
+    end
+
+    it 'cannot have classes' do
+      expect { view.center(class: 'wrapper') }.to raise_error(ArgumentError)
+    end
   end
 
   context 'private' do
@@ -145,15 +173,15 @@ describe Blot::Helpers::Grid do
     it 'can render two rows, twelve and six by six' do
       example = view.container do
         view.row do
-          view.wrapper(class: 'wrapper last') do
+          view.wrapper(class: 'last') do
             view.columns(:twelve, class: 'panel') { '.twelve.columns' }
           end
         end +
         view.row do
-          view.wrapper(class: 'wrapper') do
+          view.wrapper do
             view.columns(:six, class: 'panel') { '.six.columns' }
           end +
-          view.wrapper(class: 'wrapper last') do
+          view.wrapper(class: 'last') do
             view.columns(:six, class: 'panel') { '.six.columns' }
           end
         end
@@ -212,10 +240,10 @@ describe Blot::Helpers::Grid do
 
     it 'can render centered content' do
       example = view.row do
-        view.wrapper(class: 'wrapper') do
+        view.wrapper do
           view.columns(:six, class: 'center panel') { 'Centered content' }
         end +
-        view.wrapper(class: 'wrapper last') do
+        view.wrapper(class: 'last') do
           view.columns(:six, class: 'center panel') do
             image_tag 'http://placehold.it/125x125&text=Centered%20Image', class: 'center', alt: 'centered image'
           end
@@ -256,7 +284,7 @@ describe Blot::Helpers::Grid do
 
     it 'can render offset columns' do
       example = view.row do
-        view.wrapper(class: 'wrapper offset-by-four') do
+        view.wrapper(class: 'offset-by-four last') do
           view.columns(:eight, class: 'panel') { 'Offset Content' }
         end
       end
@@ -264,7 +292,7 @@ describe Blot::Helpers::Grid do
       expect(example).to eql <<-HTML.compress
         <table class="row">
           <tr>
-            <td class="wrapper offset-by-four">
+            <td class="wrapper offset-by-four last">
             
               <table class="eight columns">
                 <tr>
@@ -281,13 +309,13 @@ describe Blot::Helpers::Grid do
 
     it 'can render text-padding' do
       example = view.row do
-        view.wrapper(class: 'wrapper') do
+        view.wrapper do
           view.columns(:four, class: 'left-text-pad') { 'Text' }
         end +
-        view.wrapper(class: 'wrapper') do
+        view.wrapper do
           view.columns(:four) { 'Text' }
         end +
-        view.wrapper(class: 'wrapper last') do
+        view.wrapper(class: 'last') do
           view.columns(:four, class: 'right-text-pad') { 'Text' }
         end
       end
@@ -332,7 +360,7 @@ describe Blot::Helpers::Grid do
 
     it 'can render full-width rows' do
       example = view.row do
-        view.wrapper(class: 'center', align: 'center') do
+        view.center do
           view.container(class: 'wrapper last') do
             view.columns(:twelve) { 'Content' }
           end
@@ -369,13 +397,13 @@ describe Blot::Helpers::Grid do
 
     it 'can render a sub-grid' do
       example = view.row do
-        view.wrapper(class: 'wrapper') do
+        view.wrapper do
           view.columns(:eight, sub_columns: true) do
             view.sub_columns(:eight) { '.eight.sub-columns' } +
             view.sub_columns(:four, class: 'last') { '.four.sub-columns' }
           end
         end +
-        view.wrapper(class: 'wrapper last') do
+        view.wrapper(class: 'last') do
           view.columns(:four) { '.four.columns' }
         end
       end
@@ -412,8 +440,8 @@ describe Blot::Helpers::Grid do
     it 'can render a block-grid' do
       example = view.container do
         view.block_grid(up: :two) do
-          view.wrapper { 'Column #1' } +
-          view.wrapper { 'Column #2' }
+          view.content_tag(:td) { 'Column #1' } +
+          view.content_tag(:td) { 'Column #2' }
         end
       end
 
@@ -437,10 +465,10 @@ describe Blot::Helpers::Grid do
 
     it 'can render a sidebar' do
       example = view.row do
-        view.wrapper(class: 'wrapper') do
+        view.wrapper do
           view.columns(:eight) { 'Main content' }
         end +
-        view.wrapper(class: 'wrapper last') do
+        view.wrapper(class: 'last') do
           view.columns(:four, class: 'panel') { 'Panel content' }
         end
       end

data/spec/blot/helpers/visibility_spec.rb

@@ -30,7 +30,7 @@ describe Blot::Helpers::Visibility do
   context 'example' do
     it 'can render visibility of columns in a row' do
       example = view.row do
-        view.wrapper(class: 'wrapper last') do
+        view.wrapper(class: 'last') do
           view.show_for_small do
             view.columns(:twelve, class: 'panel') { '.show-for-small' }
           end +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blot
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben A Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md