viewaide 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/viewaide/helpers.rb

@@ -7,7 +7,6 @@ require "viewaide/helpers/grid_helper"
 require "viewaide/helpers/message_helper"
 require "viewaide/helpers/rjs_helper"
 require "viewaide/helpers/jquery_helper"
-require "viewaide/helpers/navigation_helper"
 
 module Viewaide
   module Helpers
@@ -20,7 +19,6 @@ module Viewaide
     include MessageHelper
     include RjsHelper
     include JqueryHelper
-    include NavigationHelper
 
     protected
 

data/lib/viewaide/helpers/message_helper.rb

@@ -34,7 +34,7 @@ module Viewaide
           if messages[key].present?
             content_tag :p,
                         messages[key],
-                        :class => [key, "box", "single-line"].join(" ")
+                        :class => [key, "single-line"].join(" ")
           end
         end.join
       end

data/lib/viewaide/helpers/table_helper.rb

@@ -30,22 +30,16 @@ module Viewaide
         concat(html)
       end
 
-      # Generates a <table> and appropriate <thead> elements
+      # Generates a <table>
       # @param [*Args]
       # @return [String]
       # @example
-      #   <% recordset :headers => ["First Column", "Second Column"] do %>
+      #   <% recordset do %>
       #     <tbody>
       #     </tbody>
       #   <% end %>
       #   generates
       #   <table class="recordset" cellspacing="0">
-      #     <thead>
-      #       <tr>
-      #         <th class="first">First Column</th>
-      #         <th class="last">Second Column</th>
-      #       </tr>
-      #     </thead>
       #     <tbody>
       #     </tbody>
       #   </table>
@@ -53,39 +47,13 @@ module Viewaide
         options = args.extract_options!
         options[:table] ||= {}
 
-        headers = []
-        (options[:headers] || []).each_with_index do |header, index|
-          head = [header].flatten
-          opts = head.extract_options!
-
-          css_classes = [] << opts.delete(:class) << case index
-            when 0 then "first"
-            when (options[:headers].size - 1) then "last"
-          end
-
-          headers << if head.first =~ /^\<th/
-            th = Hpricot(head.first)
-            th_classes = th.at("th")["class"].join
-            th_classes = clean_css_classes([th_classes, css_classes])
-            th.at("th")["class"] = th_classes
-            th.to_html
-          else
-            content_tag :th,
-                        head.first,
-                        opts.merge(:class => clean_css_classes(css_classes))
-          end
-        end
-
         table_classes = ["recordset", args] << options[:table].delete(:class)
         css_classes = clean_css_classes(table_classes, {"last" => last_column})
 
-        html =  clean_column(css_classes) do
+        html = clean_column(css_classes) do
           table_options = options[:table]
           table_options.merge!(:class => css_classes, :cellspacing => 0)
-          content_tag(:table,
-                      content_tag(:thead, content_tag(:tr, headers.join)) + \
-                        capture(&block),
-                      table_options)
+          content_tag(:table, capture(&block), table_options)
         end
 
         reset_cycle

data/test/message_helper_test.rb

@@ -6,7 +6,7 @@ class MessageHelperTest < Viewaide::ViewTestCase
 
     should "default with the correct structure" do
       show_view %(<%= messages(:structure => "Flash message") %>) do
-        assert_select "p.structure.box.single-line", "Flash message"
+        assert_select "p.structure.single-line", "Flash message"
       end
     end
 

data/test/table_helper_test.rb

@@ -41,58 +41,12 @@ class TableHelperTest < Viewaide::ViewTestCase
       end
     end
 
-    should "allow headers be set" do
-      show_view %(<% recordset :headers => ["Header 1", "Header 2", "Header 3"] do %><tbody>rows</tbody><% end %>) do
-        assert_select "table.recordset[cellspacing=0]" do
-          assert_select "thead" do
-            assert_select "tr" do
-              assert_select "th.first", "Header 1"
-              assert_select "th", "Header 2"
-              assert_select "th.last", "Header 3"
-            end
-          end
-          assert_select "tbody", "rows"
-        end
-      end
-    end
-
-    should "allow headers to have attributes set" do
-      show_view %(
-        <% recordset :headers => [["Header 1", {:class => "mine", :id => "over"}]] do %>
-          <tbody>rows</tbody>
-        <% end %>
-      ) do
-        assert_select "table.recordset[cellspacing=0]" do
-          assert_select "thead" do
-            assert_select "tr" do
-              assert_select "th#over.first.mine", "Header 1"
-            end
-          end
-          assert_select "tbody", "rows"
-        end
-      end
-    end
-
     should "allow classes be assigned in a comma-delimited manner" do
       show_view %(<% recordset "my-recordset", "car-list" do %><% end %>) do
         assert_select "table.recordset.my-recordset.car-list[cellspacing=0]"
       end
     end
 
-    should "allow additional attributes be set on the recordset" do
-      show_view %(<% recordset :headers => %w(One Two Three), :table => {:id => "my-id", :class => "my-recordset"} do %><% end %>) do
-        assert_select "table#my-id.recordset.my-recordset[cellspacing=0]" do
-          assert_select "thead" do
-            assert_select "tr" do
-              assert_select "th", "One"
-              assert_select "th", "Two"
-              assert_select "th", "Three"
-            end
-          end
-        end
-      end
-    end
-
     should "reset cycles for zebra_rows" do
       show_view %(
         <% recordset do %>

data/viewaide.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{viewaide}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-31}
   s.description = %q{Making your views easier}
   s.email = %q{joshua.clayton@gmail.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "lib/viewaide/helpers/jquery_helper.rb",
      "lib/viewaide/helpers/link_helper.rb",
      "lib/viewaide/helpers/message_helper.rb",
-     "lib/viewaide/helpers/navigation_helper.rb",
      "lib/viewaide/helpers/rjs_helper.rb",
      "lib/viewaide/helpers/structure_helper.rb",
      "lib/viewaide/helpers/table_helper.rb",
@@ -43,7 +42,6 @@ Gem::Specification.new do |s|
      "test/jquery_helper_test.rb",
      "test/link_helper_test.rb",
      "test/message_helper_test.rb",
-     "test/navigation_helper_test.rb",
      "test/rjs_helper_test.rb",
      "test/structure_helper_test.rb",
      "test/table_helper_test.rb",
@@ -62,7 +60,6 @@ Gem::Specification.new do |s|
      "test/jquery_helper_test.rb",
      "test/link_helper_test.rb",
      "test/message_helper_test.rb",
-     "test/navigation_helper_test.rb",
      "test/rjs_helper_test.rb",
      "test/structure_helper_test.rb",
      "test/table_helper_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viewaide
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -05:00
+date: 2010-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,6 @@ files:
 - lib/viewaide/helpers/jquery_helper.rb
 - lib/viewaide/helpers/link_helper.rb
 - lib/viewaide/helpers/message_helper.rb
-- lib/viewaide/helpers/navigation_helper.rb
 - lib/viewaide/helpers/rjs_helper.rb
 - lib/viewaide/helpers/structure_helper.rb
 - lib/viewaide/helpers/table_helper.rb
@@ -78,7 +77,6 @@ files:
 - test/jquery_helper_test.rb
 - test/link_helper_test.rb
 - test/message_helper_test.rb
-- test/navigation_helper_test.rb
 - test/rjs_helper_test.rb
 - test/structure_helper_test.rb
 - test/table_helper_test.rb
@@ -119,7 +117,6 @@ test_files:
 - test/jquery_helper_test.rb
 - test/link_helper_test.rb
 - test/message_helper_test.rb
-- test/navigation_helper_test.rb
 - test/rjs_helper_test.rb
 - test/structure_helper_test.rb
 - test/table_helper_test.rb

data/lib/viewaide/helpers/navigation_helper.rb

@@ -1,46 +0,0 @@
-module Viewaide
-  module Helpers
-    module NavigationHelper
-      # Generates a <li> and <a> for site navigation
-      # @param [String] name the anchor text
-      # @param [String] path the URL of the anchor
-      # @param [Hash] options options hash for #link_to
-      # @param [Hash] li_options options hash for #content_tag
-      # @example
-      #   <%= tab "Home", root_path %>
-      #   generates
-      #   <li><a href="/">Home</a></li>
-      #
-      #   <%= tab "Home", root_path, :compare => (controller.action_name == "show") %>
-      #   generates
-      #   <li class="active"><a href="/">Home</a></li>
-      #
-      #   <%= tab "Home", root_path, {:class => "a"}, {:class => "li"} %>
-      #   generates
-      #   <li class="li"><a href="/" class="a">Home</a></li>
-      def tab(name, path, options = {}, li_options = {})
-        opts = parse_tab_options(name, li_options)
-
-        active = "active" if (opts[:active] == opts[:comparison]) || opts[:compare]
-        css_classes = [] << opts[:li_classes] << active
-        css_classes = clean_css_classes(css_classes)
-        li_options.merge!(:class => css_classes) if css_classes.present?
-
-        content_tag :li,
-                    link_to(name, path, options),
-                    li_options
-      end
-
-      private
-
-      def parse_tab_options(name, li_options = {})
-        returning({}) do |result|
-          result[:active]     = li_options.delete(:active)         || (name.gsub(/\s/, '').tableize || "")
-          result[:comparison] = li_options.delete(:active_compare) || controller.controller_name
-          result[:compare]    = li_options.delete(:compare)        || false
-          result[:li_classes] = li_options.delete(:class)
-        end
-      end
-    end
-  end
-end

data/test/navigation_helper_test.rb

@@ -1,130 +0,0 @@
-require "test_helper"
-
-class NavigationHelperTest < ActiveSupport::TestCase
-  include Viewaide::Helpers::NavigationHelper
-
-  context "tab" do
-    should "parse tab options properly" do
-      expects(:parse_tab_options).with("test", {:b => 2}).returns({})
-      stubs(:link_to)
-      stubs(:content_tag)
-      stubs(:clean_css_classes)
-      tab("test", "/", {:a => 1}, {:b => 2})
-    end
-
-    should "call link_to properly" do
-      stubs(:content_tag)
-      stubs(:clean_css_classes)
-      stubs(:parse_tab_options).returns({})
-      expects(:link_to).with("test", "/path", {:a => 1, :b => 2})
-      tab("test", "/path", {:a => 1, :b => 2})
-    end
-
-    context "compiling li classes" do
-      setup do
-        @result_options = { :active => "1",
-                            :comparison => "2",
-                            :compare => false,
-                            :li_classes => "one two three" }
-        stubs(:link_to).returns("link_to")
-        stubs(:content_tag)
-      end
-
-      should "properly use classes passed in the options" do
-        stubs(:parse_tab_options).returns(@result_options)
-        expects(:clean_css_classes).with(["one two three", nil])
-        tab("test", "/")
-      end
-
-      should "properly compare information" do
-        @result_options[:comparison] = "1"
-        stubs(:parse_tab_options).returns(@result_options)
-        expects(:clean_css_classes).with(["one two three", "active"])
-        tab("test", "/")
-      end
-
-      should "properly use compare value" do
-        @result_options[:compare] = true
-        stubs(:parse_tab_options).returns(@result_options)
-        expects(:clean_css_classes).with(["one two three", "active"])
-        tab("test", "/")
-      end
-
-      should "not assign class if css_classes is blank" do
-        @result_options[:li_classes] = nil
-        stubs(:parse_tab_options).returns({})
-        stubs(:clean_css_classes).returns("")
-        expects(:content_tag).with(:li, "link_to", {})
-        tab("test", "/")
-      end
-    end
-
-    context "parse_tab_options" do
-      context "calculating :active" do
-        setup do
-          stubs(:controller).returns(stub_everything)
-        end
-
-        should "be based on option" do
-          result = send(:parse_tab_options, "name", {:active => "words"})
-          assert_equal "words", result[:active]
-        end
-
-        should "be based on name" do
-          name = tableized_name = stub
-          name.expects(:gsub).with(/\s/, '').returns(tableized_name)
-          tableized_name.expects(:tableize).returns("name")
-
-          result = send(:parse_tab_options, name, {})
-          assert_equal "name", result[:active]
-        end
-      end
-
-      context "calculating :comparison" do
-        should "be based on option" do
-          result = send(:parse_tab_options, "name", {:active_compare => "active"})
-          assert_equal "active", result[:comparison]
-        end
-
-        should "be based on controller name" do
-          controller = stub(:controller_name => "controller-name")
-          expects(:controller).returns(controller)
-          result = send(:parse_tab_options, "name", {})
-          assert_equal "controller-name", result[:comparison]
-        end
-      end
-
-      context "calculating :compare" do
-        setup do
-          stubs(:controller).returns(stub_everything)
-        end
-
-        should "be based on option" do
-          result = send(:parse_tab_options, "name", {:compare => true})
-          assert_equal true, result[:compare]
-        end
-
-        should "have a default value" do
-          result = send(:parse_tab_options, "name")
-          assert_equal false, result[:compare]
-        end
-      end
-
-      context "calculating :li_classes" do
-        setup do
-          stubs(:controller).returns(stub_everything)
-        end
-
-        should "be based on option" do
-          result = send(:parse_tab_options, "name", {:class => "custom classes"})
-          assert_equal "custom classes", result[:li_classes]
-        end
-
-        should "be nil if no option is passed" do
-          result = send(:parse_tab_options, "name")
-          assert_nil result[:li_classes]
-        end
-      end
-    end
-  end
-end