awesome_tables 0.0.5 → 0.0.6

data.tar.gz.sig

@@ -1,2 +1 @@
-|a�K[����n1�X
aW�`��~W	�_����R������0V;�����-y���A��z���h���i�9H���uaOڂ�!�kă#S�g�����	"��`��1�����v�W�cI�[��
-��+�X��B�'{�AP������[�p�A?Q�Z�C*X�2*S����nH�;�9>���~秌��ZS:P��[.~�fh�	�����2ȭ@����9�;
+N� �����=�M|��r�J
+�I��,�D���͒�Q�t�oAE��ק�uC�>�zG�*V؞3~�q��9$�|G�.oc���39��&�����RZ���R݇f8<�)F��>�V�H�Vo[͖ɒ[��=?���qM��`����Y�]d������߷l�gý�H��/�$���H�!�����0���gV\-%��

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.0.6, released 2010-11-07
+
+* added blocks to available ways to pass to t.column
+* cleaned up view helpers
+* updated templates/_base.html.erb to reflect cleaned up helpers
+
 == 0.0.5, released 2010-10-24
 
 * added awesome_tables generator that copies the base template to app/view/awesome_tables/_base.html.erb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('awesome_tables', '0.0.5') do |p|
+Echoe.new('awesome_tables', '0.0.6') do |p|
   p.description    = "A gem for creating awesome, consistently styled tables"
   p.url            = "http://github.com/danengle/awesome_tables"
   p.author         = "Dan Engle"

data/awesome_tables.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awesome_tables}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Engle"]
   s.cert_chain = ["/Users/danengle/.ssh/gem-public_cert.pem"]
-  s.date = %q{2010-10-24}
+  s.date = %q{2010-11-07}
   s.description = %q{A gem for creating awesome, consistently styled tables}
   s.email = %q{engle.68 @nospam@ gmail.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/awesome_tables.rb", "lib/awesome_tables/awesome_table.rb", "lib/awesome_tables/formatters.rb", "lib/awesome_tables/formatters/html.rb", "lib/awesome_tables/railtie.rb", "lib/awesome_tables/scrap.rb", "lib/awesome_tables/view_helpers/action_view.rb", "lib/generators/awesome_tables_generator.rb", "lib/generators/templates/_base.html.erb"]

data/lib/awesome_tables.rb

@@ -1,12 +1,21 @@
 module AwesomeTables
   
-  class NoBlockGivenException < Exception
-  end
+  class Error < StandardError; end
+
+  class NoBlockGiven < Error; end
+  
+  class UnknownTableType < Error; end 
   
-  class UnknownTableTypeException < Exception 
-  end 
+  class NoPartial < Error; end
+
+  class BadData < Error; end
+  
+  def self.register(table_type, &block)
+    AwesomeTables::AwesomeTable::register(table_type, &block)
+  end
   
-  class NoPartialException < Exception
+  def self.new(table_type, collection = [], options = {})
+    AwesomeTables::AwesomeTable::new(table_type, collection, options)
   end
 end
 

data/lib/awesome_tables/awesome_table.rb

@@ -2,20 +2,20 @@ module AwesomeTables
   class AwesomeTable
     @@tables = {}
     
-    attr_accessor :data, :columns, :partial, :caption
+    attr_accessor :collection, :columns, :partial, :caption, :template
 
     def self.register(table_type, &block)
-      raise AwesomeTables::NoBlockGivenException unless block_given?
+      raise AwesomeTables::NoBlockGiven unless block_given?
       @@tables[table_type] = block
     end
     
-    def initialize(table_type, data = [], options = {})
-      @data = data
-      @paginate = true if @data.is_a? WillPaginate::Collection
+    def initialize(table_type, collection = [], options = {})
+      @collection = collection
+      @paginate = true if @collection.is_a? WillPaginate::Collection
       @columns = []
       @template = options[:template] ||= 'awesome_tables/base'
       # is this the best way to do this?
-      raise AwesomeTables::UnknownTableTypeException if @@tables[table_type].blank?
+      raise AwesomeTables::UnknownTableType if @@tables[table_type].blank?
       @@tables[table_type].call(self)
     end
     
@@ -33,18 +33,37 @@ module AwesomeTables
     # example column colls
     # t.column :created_at, :display_created_at
     # t.column :body, :partial => 'awesome_tables/posts/body'
-    # t.column :comments, :comment_count, :with_image => 'comments.png'
+    # t.column :comments, :comment_count, :with_header => 'comments.png'
     # t.column :full_name
-    def column(*args)
+    # I can't figure out how to get content_tag and other helper methods to
+    # get used correctly when used inside blocks. For now, passing in reference
+    # to self that has those methods defined.
+    # t.column :full_name do |obj, c|
+    #   obj.full_name +
+    #   c.content_tag(:div, :class => 'actions') do
+    #   c.link_to("Edit", c.edit_admin_user_path(obj))
+    #   end
+    # end
+    def column(*args, &block)
       name = args[0].to_s.titleize
-      if args[1].nil?
+      if block_given?
+        method = block
+        options = args[1]
+      # t.column :full_name
+      elsif args[1].nil?
         method = args[0]
+      # t.column :created_at, :display_created_at
       elsif args[1].is_a? Symbol
         method = args[1]
         options = args[2]
+      # t.column :body, :partial => 'awesome_tables/posts/body'
+      # t.column :comments, :with_header => 'comments.png'
       else
-        raise AwesomeTables::NoPartialProvidedException unless args[1].keys.include?(:partial)
-        method = args[1].delete(:partial)
+        method = if args[1].keys.include?(:partial)
+          args[1].delete(:partial)
+        else
+          args[0]
+        end  
         options = args[1]
       end
       @columns << { :header => name, :method => method, :options => options ||= {} }

data/lib/awesome_tables/view_helpers/action_view.rb

@@ -4,11 +4,65 @@ module AwesomeTables
       # TODO make this only need table_type and infer objects by name
       # TODO add a render method so calling partial is not needed here
       #    e.g. AwesomeTables::AwesomeTable.new(table_type, data).render
-      def awesome_table(table_type, data)
-        raise "awesome_table data is not an Array" unless data.is_a? Array
-        awesome_table = AwesomeTables::AwesomeTable.new(table_type, data)
+      def awesome_table(table_type, collection = nil)
+        if collection.nil?
+          collection_name = "@#{table_type}"
+          collection = instance_variable_get(collection_name)
+        end
+        raise AwesomeTables::BadData unless collection.is_a? Array
+        awesome_table = AwesomeTables.new(table_type, collection)
         render :partial => awesome_table.template, :locals => { :table => awesome_table }
       end
+
+      def table_headers(table)
+        content_tag :tr do
+          th_tags = []
+          table.columns.each do |column|
+            th_tags << th_tag(column)
+          end
+          th_tags.join('')
+        end
+      end
+      
+      def th_tag(column)
+        content_tag(:th, :class => column[:options][:class]) do
+          if column[:options][:header_image]
+            image_tag(column[:options][:header_image], :border => 0)
+          else
+            column[:header]
+          end
+        end
+      end
+      
+      def table_rows(table)
+        rows = []
+        table.collection.each do |object|
+          rows << table_row(object, table.columns)
+        end
+        raw(rows.join(''))
+      end
+      
+      def table_row(object, columns)
+        content_tag :tr do
+          row = []
+          columns.each do |column|
+            row << td_tag(column, object)
+          end
+          row.join('')
+        end
+      end
+      
+      def td_tag(column, object)
+        content_tag(:td) do
+          if column[:method].is_a?(Proc)
+            column[:method].call(object, self)
+          elsif object.respond_to? column[:method]
+            object.send(column[:method]).to_s
+          else
+            render :partial => column[:method], :locals => { :obj => object }
+          end
+        end
+      end
     end
   end
 end

data/lib/generators/templates/_base.html.erb

@@ -1,33 +1,17 @@
-<table>
+<table class="awesome_tables add_margin">
   <% if table.caption? %>
-    <caption class="medium_round_top"><%= table.caption %></caption>
+    <caption><%= table.caption %></caption>
   <% end %>
-  <tr>
-    <% table.columns.each do |column| %>
-      <th<%= " class=#{column[:class]}" unless column[:class].blank? %>><%= column[:image].blank? ? column[:header] : image_tag(column[:image]) %></th>
-    <% end %>
-  </tr>
-  <% if table.data.blank? %>
+  <%= table_headers(table) %>
+  <% if table.collection.blank? %>
     <tr><td colspan="<%= table.columns.size %>">0 results</td></tr>
   <% else %>
-    <% table.data.each do |object| %>
-      <tr>
-        <% table.columns.each do |column| %>
-          <td<%= " class=#{column[:class]}" unless column[:class].blank? %>>
-            <% if object.respond_to?(column[:method]) %>
-                <%= object.send(column[:method]) %>
-            <% else %>
-              <%= render :partial => column[:method], :locals => { :obj => object } %>
-            <% end %>
-          </td>
-        <% end %>
-      </tr>
-    <% end %>
+    <%= table_rows(table) %>
     <% if table.paginate? %>
       <tr>
         <td class="pagination_links" colspan="<%= table.columns.size %>">
-          <div class="pagination_info"><%= page_entries_info table.data %></div>
-          <%= will_paginate table.data %>
+          <div class="pagination_info"><%= page_entries_info table.collection %></div>
+          <%= will_paginate table.collection %>
         </td>
       </tr>
     <% end %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dan Engle
@@ -35,7 +35,7 @@ cert_chain:
   2MS0NMYj
   -----END CERTIFICATE-----
 
-date: 2010-10-24 00:00:00 -05:00
+date: 2010-11-07 01:00:00 -05:00
 default_executable: 
 dependencies: []