fusionary-easel_helpers 0.2.13 → 0.2.14

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.13") do |p|
+Echoe.new("easel_helpers", "0.2.14") do |p|
   p.description = "Fusionary Rails View Helpers"
   p.url = "http://github.com/fusionary/easel_helpers"
   p.author = "Joshua Clayton"

data/easel_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easel_helpers}
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -52,8 +52,10 @@ module EaselHelpers
       end
 
       def container(size=nil, *args, &block)
+        opts = args.extract_options!
+        opts.merge!(:suppress_col => true) if size.nil?
         args = args.insert(0, :container)
-        column(size, *args, &block)
+        column(size, *([args, opts].flatten), &block)
       end
 
       def clean_column(classes, &block)

data/test/grid_helper_test.rb

@@ -29,6 +29,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
 
       show_view template do
         assert_select ".container", 1
+        assert_select ".container.col-24", 0
         assert_select ".col-24", 1
         assert_select ".col-12", 2
         assert_select ".col-12#primary", 1
@@ -109,7 +110,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
 
     should "properly assign classes for a deeply-nested view" do
       template = %(
-        <% container do %>
+        <% container :full do %>
           <% column :half do %>
             <% fieldset :hform, :half do %>
               <% set :one_third do %>text<% end %>
@@ -127,6 +128,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
       )
 
       show_view template do
+        assert_select "div.container.col-24", 1
         assert_select "div.container" do
           assert_select "div.col-12" do
             assert_select "fieldset.hform.col-6" do
@@ -190,7 +192,9 @@ class GridHelperTest < EaselHelpers::ViewTestCase
   context "column" do
 
     should "allow assigning options hash without having to define a width" do
-      show_view %(<% column :id => "my-custom-id", :class => "content" do %>words<% end %>) do
+      show_view %(
+        <% column :id => "my-custom-id", :class => "content" do %>words<% end %>
+      ) do
         assert_select "div.col-24.content#my-custom-id", "words"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors: 
 - Joshua Clayton