grapple 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a1ffcbbb6eeed509347c518f1690d9d2eb8874
-  data.tar.gz: f4d3ba52e44f0a96d25cea11ffdd31d91b7db986
+  metadata.gz: dbc0c19f5351b685a28eb3cccbf18aa71418fd0d
+  data.tar.gz: f7a5a428ead03812a503ec79c04cf8eaae98fcf9
 SHA512:
-  metadata.gz: c550c8ab022ee4f4dfef99e54c84815a0db0e27bba5c1179e46a5f764949b8a1ab5e0bbc8bdffbefb84de45f0c6b46156c337fe847b95855c3c640384aecf9dc
-  data.tar.gz: f95c0dbc95ad4b2b1df1119da1d40caadf932d03dc4094556fc315ff4042e777f081a44b878d62381d708129ae081f75c2993dda809798b3abd078aa1dcb9033
+  metadata.gz: 86a7d8935dfff0004548900811f161d8e44329f3c97cc4092f989b16f346b2599e584dce0ee1dc4aead5e6b5d616addd5a8b9ee32175bcb9f082970fc0ab3186
+  data.tar.gz: f5f9b9bc3512489b545230d45bdf574690ecd1aa10902505cf9f24b96433021c1e674a71f38e6acb942402434786e9449e6e7bb56d13b5fb4a47b7f0f5c72ff1

data/lib/grapple/ajax_data_grid_builder.rb

@@ -1,8 +1,8 @@
 module Grapple
 	class AjaxDataGridBuilder < DataGridBuilder
-	
+
 		CONTAINER_CLASSES = 'grapple grapple-ajax grapple-ajax-loading'
-	
+
 		@@next_id = 1000
 
 		def self.container_attributes(template, options)
@@ -10,17 +10,17 @@ module Grapple
 			options[:id] ||= "grapple_ajax_table_#{@@next_id}"
 			css = CONTAINER_CLASSES
 			css += " #{options[:container_class]}" unless options[:container_class].nil?
-			
+
 			data = {
 				"grapple-ajax-url" => options[:url] || template.url_for(action: 'table'),
-				# History is disabled by default, override container_attributes 
+				# History is disabled by default, override container_attributes
 				# in an initializer to enable it by default
 				"grapple-ajax-history" => options[:history] == true ? '1' : '0'
 			}
 
 			return {
 				:id => options[:id],
-				:class => css, 
+				:class => css,
 				:data => data
 			}
 		end
@@ -29,7 +29,7 @@ module Grapple
 			style = 'background-image: url(' + template.image_path("grapple/loading-bar.gif") + ')'
 			template.content_tag :div, '', :class => 'loading-overlay', :style => style
 		end
-		
+
 		def self.after_container(template, options)
 			selector = '#' + options[:id]
 			js = "$(#{selector.to_json}).grapple();"

data/lib/grapple/base_table_builder.rb

@@ -11,7 +11,7 @@ module Grapple
 			define_singleton_method(:"class_for_#{name}") { klass }
 			define_singleton_method(:"settings_for_#{name}") { settings }
 		end
-		
+
 		# Update settings for a helper
 		def self.configure(helper_name, *options)
 			settings = options[0] || {}
@@ -34,17 +34,17 @@ module Grapple
 			@options = options[0] || {}
 			@helper_instances = {}
 		end
-		
+
 		def before_table
 			''
 		end
-		
+
 		def after_table
 			''
 		end
 
 	protected
-	
+
 		def invoke_helper(name, *arguments, &block)
 			unless @helper_instances.has_key?(name)
 				klass = self.class.send(:"class_for_#{name}")
@@ -53,6 +53,6 @@ module Grapple
 			end
 			@helper_instances[name].send(:render, *arguments, &block)
 		end
-		
+
 	end
-end
+end

data/lib/grapple/components/html_caption.rb

@@ -0,0 +1,12 @@
+module Grapple
+	module Components
+		class HtmlCaption < HtmlComponent
+
+			def render(*options, &block)
+				html = capture_block(options[0] || '', &block)
+				"<caption>\n#{html}</caption>\n".html_safe
+			end
+
+		end
+	end
+end

data/lib/grapple/components/html_colgroup.rb

@@ -1,14 +1,14 @@
 module Grapple
 	module Components
 		class HtmlColgroup < HtmlComponent
-			
+
 			def render
 				cols = columns.collect do |col|
 					indent + (col[:width].nil? ? "<col>" : "<col width=\"#{col[:width]}\">")
 				end
 				"<colgroup>\n#{cols.join("\n")}\n</colgroup>\n".html_safe
 			end
-			
+
 		end
 	end
-end
+end

data/lib/grapple/components/html_component.rb

@@ -1,9 +1,9 @@
 module Grapple
 	module Components
 		class HtmlComponent < BaseComponent
-			
+
 			setting :indent, "\t"
-			
+
 		protected
 
 			include ERB::Util
@@ -11,14 +11,14 @@ module Grapple
 			def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
 				template.content_tag(name, content_or_options_with_block, options, escape, &block)
 			end
-			
+
 			def table_url(options)
 				if options[:sort] == params[:sort]
 					options[:dir] = (params[:dir] == 'desc') ? 'asc' : 'desc'
 				end
 				template.url_for params.stringify_keys().merge(options.stringify_keys())
 			end
-		
+
 		end
 	end
-end
+end

data/lib/grapple/components.rb

@@ -9,6 +9,7 @@ module Grapple
 		autoload :HtmlBody
 		autoload :HtmlFooter
 		autoload :HtmlColgroup
+		autoload :HtmlCaption
 		autoload :ColumnHeadings
 		autoload :WillPaginate
 		autoload :Toolbar
@@ -20,4 +21,4 @@ module Grapple
 		autoload :WillPaginateInfobar
 
 	end
-end
+end

data/lib/grapple/data_grid_builder.rb

@@ -1,24 +1,24 @@
 module Grapple
 	class DataGridBuilder < HtmlTableBuilder
 
-		helper :infobar, Grapple::Components::WillPaginateInfobar		
+		helper :infobar, Grapple::Components::WillPaginateInfobar
 
-		# Toolbar		
+		# Toolbar
 		helper :search_submit, Grapple::Components::SearchSubmit
-		helper :search_query_field, Grapple::Components::SearchQueryField		
+		helper :search_query_field, Grapple::Components::SearchQueryField
 		helper :search_form, Grapple::Components::SearchForm
 		helper :actions, Grapple::Components::Actions
 		helper :toolbar, Grapple::Components::Toolbar, components: [:search_form, :actions]
 
 		# Sortable column headings
 		helper :column_headings, Grapple::Components::ColumnHeadings
-		
-		configure :header, components: [:infobar, :toolbar, :column_headings] 
-		
+
+		configure :header, components: [:infobar, :toolbar, :column_headings]
+
 		# Paging
 		helper :pagination, Grapple::Components::WillPaginatePagination
-		
+
 		configure :footer, components: [:pagination]
 
 	end
-end
+end

data/lib/grapple/helpers/table_helper.rb

@@ -5,6 +5,15 @@ module Grapple
 			@@builder = Grapple::DataGridBuilder
 			mattr_accessor :builder
 
+			def table_for(columns, records, *args, &block)
+				options = args[0] || {}
+				table_html_attributes = options[:html] || {}
+				builder_class = options[:builder] || @@builder
+				builder = builder_class.new(self, columns, records, params, options)
+				output = capture(builder, &block)
+				(builder.before_table + builder.table(output, table_html_attributes) + builder.after_table).html_safe
+			end
+
 			def grapple_container(*args, &block)
 				options = args[0] || {}
 				builder_class = options[:builder] || @@builder
@@ -17,15 +26,7 @@ module Grapple
 				html << builder_class.after_container(self, options)
 				return html.html_safe
 			end
-		
-			def table_for(columns, records, *args, &block)
-				options = args[0] || {}
-				builder_class = options[:builder] || @@builder
-				builder = builder_class.new(self, columns, records, params, options)
-				output = capture(builder, &block)
-				(builder.before_table + builder.table(output) + builder.after_table).html_safe
-			end
-		
+
 		end
 	end
 end

data/lib/grapple/html_table_builder.rb

@@ -2,31 +2,32 @@ module Grapple
 
 	class HtmlTableBuilder < BaseTableBuilder
 
+		# Standard HTML table elements
+		helper :caption, Grapple::Components::HtmlCaption
 		helper :row, Grapple::Components::HtmlRow
 		helper :colgroup, Grapple::Components::HtmlColgroup
 		helper :header, Grapple::Components::HtmlHeader
 		helper :body, Grapple::Components::HtmlBody
 		helper :footer, Grapple::Components::HtmlFooter
 
-		def table(content)
-			# TODO: support attributes on the table tag
-			"<table>#{content}</table>\n".html_safe
+		def table(content, attributes = {})
+			"#{template.content_tag('table', content, attributes)}\n".html_safe
 		end
-		
+
 		def self.container_attributes(template, options)
 			return {
-				:class => 'grapple' 
+				:class => 'grapple'
 			}
 		end
-		
+
 		def self.before_container(template, options)
 			''
 		end
-		
+
 		def self.after_container(template, options)
 			''
 		end
-		
+
 	end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapple
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Edward Potocko
@@ -150,6 +150,7 @@ files:
 - lib/grapple/components/base_component.rb
 - lib/grapple/components/column_headings.rb
 - lib/grapple/components/html_body.rb
+- lib/grapple/components/html_caption.rb
 - lib/grapple/components/html_colgroup.rb
 - lib/grapple/components/html_component.rb
 - lib/grapple/components/html_footer.rb