viewaide 0.3.0 → 0.3.1

data/Rakefile

@@ -18,3 +18,11 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/*_test.rb"]
+  t.verbose = true
+end
+
+task :default => [:test]

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/viewaide/helpers/grid_helper.rb

@@ -40,7 +40,7 @@ module Viewaide
         @@column_prefix = "span"
       end
 
-      easel_grid!
+      blueprint_grid!
 
       def last_column
         @@last_column

data/test/form_helper_test.rb

@@ -60,19 +60,19 @@ class FormHelperTest < Viewaide::ViewTestCase
 
     should "assign default class if width class is passed as the only class" do
       show_view "<% set :half do %>words<% end %>" do
-        assert_select "div.text.col-12", "words"
+        assert_select "div.text.span-12", "words"
       end
     end
 
     should "assign default class if last class is passed as the only class" do
       show_view "<% set :half, :last do %>words<% end %>" do
-        assert_select "div.col-12.text.col-last", "words"
+        assert_select "div.span-12.text.last", "words"
       end
     end
 
     should "assign default class if error class is passed" do
       show_view "<% set :half, :last, :error do %>words<% end %>" do
-        assert_select "div.col-12.text.col-last.error", "words"
+        assert_select "div.span-12.text.last.error", "words"
       end
     end
 
@@ -101,14 +101,14 @@ class FormHelperTest < Viewaide::ViewTestCase
     end
 
     should "allow adding fieldset classes" do
-      show_view "<% fieldset :hform, 'col-last' do %>words<% end %>" do
-        assert_select "fieldset.hform.col-last", "words"
+      show_view "<% fieldset :hform, :last do %>words<% end %>" do
+        assert_select "fieldset.hform.last", "words"
       end
     end
 
     should "allow adding fieldset classes and a legend" do
-      show_view "<% fieldset 'User Information', :hform, 'col-last' do %>words<% end %>" do
-        assert_select "fieldset.hform.col-last", /words/ do
+      show_view "<% fieldset 'User Information', :hform, :last do %>words<% end %>" do
+        assert_select "fieldset.hform.last", /words/ do
           assert_select "h3.legend", "User Information"
         end
       end

data/test/grid_helper_test.rb

@@ -29,16 +29,16 @@ class GridHelperTest < Viewaide::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
-        assert_select ".col-12#secondary", 1
-        assert_select ".col-4", 2
+        assert_select ".container.span-24", 0
+        assert_select ".span-24", 1
+        assert_select ".span-12", 2
+        assert_select ".span-12#primary", 1
+        assert_select ".span-12#secondary", 1
+        assert_select ".span-4", 2
         assert_select ".prepend-4", 1
-        assert_select ".col-24.col-last", 0
-        assert_select ".col-12.col-last", 1
-        assert_select ".col-4.col-last", 1
+        assert_select ".span-24.last", 0
+        assert_select ".span-12.last", 1
+        assert_select ".span-4.last", 1
         assert_select "hr", 2
       end
     end
@@ -55,12 +55,12 @@ class GridHelperTest < Viewaide::ViewTestCase
       )
 
       show_view template do
-        assert_select "div.col-24" do
-          assert_select "fieldset.hform.col-12" do
-            assert_select "div.col-4", "text"
-            assert_select "div.col-8.col-last", "more text"
+        assert_select "div.span-24" do
+          assert_select "fieldset.hform.span-12" do
+            assert_select "div.span-4", "text"
+            assert_select "div.span-8.last", "more text"
           end
-          assert_select "table.col-12.col-last", "table"
+          assert_select "table.span-12.last", "table"
         end
       end
     end
@@ -87,24 +87,24 @@ class GridHelperTest < Viewaide::ViewTestCase
       )
 
       show_view template do
-        assert_select "fieldset.hform.col-12" do
-          assert_select "div.col-4", "text"
-          assert_select "div.col-8.col-last", "more text"
-
-          assert_select "div.col-12.col-last" do
-            assert_select "div.col-4", "one third"
-            assert_select "div.col-8.col-last" do
-              assert_select "div.col-4", "half"
-              assert_select "div.col-4.col-last", "last half"
+        assert_select "fieldset.hform.span-12" do
+          assert_select "div.span-4", "text"
+          assert_select "div.span-8.last", "more text"
+
+          assert_select "div.span-12.last" do
+            assert_select "div.span-4", "one third"
+            assert_select "div.span-8.last" do
+              assert_select "div.span-4", "half"
+              assert_select "div.span-4.last", "last half"
             end
           end
         end
-        assert_select "div.col-8" do
-          assert_select "div.col-2", "two wide"
-          assert_select "div.col-4", "four wide"
-          assert_select "div.col-2.col-last", "two more wide"
+        assert_select "div.span-8" do
+          assert_select "div.span-2", "two wide"
+          assert_select "div.span-4", "four wide"
+          assert_select "div.span-2.last", "two more wide"
         end
-        assert_select "table.col-4.col-last", "table"
+        assert_select "table.span-4.last", "table"
       end
     end
 
@@ -128,20 +128,20 @@ class GridHelperTest < Viewaide::ViewTestCase
       )
 
       show_view template do
-        assert_select "div.container.col-24", 1
+        assert_select "div.container.span-24", 1
         assert_select "div.container" do
-          assert_select "div.col-12" do
-            assert_select "fieldset.hform.col-6" do
-              assert_select "div.col-2", "text"
-              assert_select "div.col-4.col-last", "more text"
+          assert_select "div.span-12" do
+            assert_select "fieldset.hform.span-6" do
+              assert_select "div.span-2", "text"
+              assert_select "div.span-4.last", "more text"
             end
-            assert_select "table.col-6.col-last", "table"
+            assert_select "table.span-6.last", "table"
           end
 
-          assert_select "div.col-8", "one third!"
+          assert_select "div.span-8", "one third!"
 
-          assert_select "div.col-4.col-last" do
-            assert_select "fieldset.vform.col-4.col-last" do
+          assert_select "div.span-4.last" do
+            assert_select "fieldset.vform.span-4.last" do
               assert_select "div", "text"
             end
           end
@@ -149,7 +149,7 @@ class GridHelperTest < Viewaide::ViewTestCase
       end
     end
 
-    should "properly assign classes when using Blueprint grid" do
+    should "properly assign classes when using Easel grid" do
       template = %(
         <% container do %>
           <% column do %>
@@ -171,21 +171,21 @@ class GridHelperTest < Viewaide::ViewTestCase
           <% end %>
         <% end %>
       )
-      Viewaide::Helpers::GridHelper.blueprint_grid!
+      Viewaide::Helpers::GridHelper.easel_grid!
       show_view template do
         assert_select ".container", 1
-        assert_select ".span-24", 1
-        assert_select ".span-12", 2
-        assert_select ".span-12#primary", 1
-        assert_select ".span-12#secondary", 1
-        assert_select ".span-4", 2
+        assert_select ".col-24", 1
+        assert_select ".col-12", 2
+        assert_select ".col-12#primary", 1
+        assert_select ".col-12#secondary", 1
+        assert_select ".col-4", 2
         assert_select ".prepend-4", 1
-        assert_select ".span-24.last", 0
-        assert_select ".span-12.last", 1
-        assert_select ".span-4.last", 1
+        assert_select ".col-24.col-last", 0
+        assert_select ".col-12.col-last", 1
+        assert_select ".col-4.col-last", 1
         assert_select "hr", 2
       end
-      Viewaide::Helpers::GridHelper.easel_grid!
+      Viewaide::Helpers::GridHelper.blueprint_grid!
     end
   end
 
@@ -195,7 +195,7 @@ class GridHelperTest < Viewaide::ViewTestCase
       show_view %(
         <% column :id => "my-custom-id", :class => "content" do %>words<% end %>
       ) do
-        assert_select "div.col-24.content#my-custom-id", "words"
+        assert_select "div.span-24.content#my-custom-id", "words"
       end
     end
 
@@ -208,18 +208,18 @@ class GridHelperTest < Viewaide::ViewTestCase
           <% column 1, :last do %>one<% end %>
         <% end %>
       ) do
-        assert_select "div.col-6.sidebar" do
-          assert_select "div.col-6.col-last#main", "main sidebar"
-          assert_select "div.col-3", "three"
-          assert_select "div.col-2", "two"
-          assert_select "div.col-1.col-last", "one"
+        assert_select "div.span-6.sidebar" do
+          assert_select "div.span-6.last#main", "main sidebar"
+          assert_select "div.span-3", "three"
+          assert_select "div.span-2", "two"
+          assert_select "div.span-1.last", "one"
         end
       end
     end
 
     should "allow tag overriding" do
       show_view %(<% column :tag => :section do %>content<% end %>) do
-        assert_select "section.col-24:not([tag=section])", "content"
+        assert_select "section.span-24:not([tag=section])", "content"
       end
     end
   end

data/viewaide.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{viewaide}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viewaide
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joshua Clayton