grapple 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbdfba833204a62c126fb91ec6b95e6b17a76654
-  data.tar.gz: ee880107cf1becc73adc3c46d0f908be8b7ff465
+  metadata.gz: 05a1ffcbbb6eeed509347c518f1690d9d2eb8874
+  data.tar.gz: f4d3ba52e44f0a96d25cea11ffdd31d91b7db986
 SHA512:
-  metadata.gz: 1976ae3090721348125616fdb2703bf5e568849c366c62904a81de9b6359a072522cc2fa8307d13e983961f1e9546ad54dac01ac6fc51e29bed25486eb262865
-  data.tar.gz: 591e70f06fbf5ef355a692fc082a7016a77d993a021b3f6f89c9aaff91c2eb22303825fe4f6d8496e372fffca403116aa3176a7b41938fb444363ecdabcc174e
+  metadata.gz: c550c8ab022ee4f4dfef99e54c84815a0db0e27bba5c1179e46a5f764949b8a1ab5e0bbc8bdffbefb84de45f0c6b46156c337fe847b95855c3c640384aecf9dc
+  data.tar.gz: f95c0dbc95ad4b2b1df1119da1d40caadf932d03dc4094556fc315ff4042e777f081a44b878d62381d708129ae081f75c2993dda809798b3abd078aa1dcb9033

data/app/assets/javascripts/grapple-jquery.js

@@ -16,7 +16,7 @@ var overrideLink = function(clickable, anchor, callback) {
  * Creates a new instance of the Grapple AJAX widget.
  *
  * @param {String} Selector for the table container element.
- * @param {Object} Hash of options for the table (url, history)
+ * @param {Object} Hash of options for the table (url, namespace, history)
  */
 var GrappleTable = function(element, options) {
 	options = options || {};

data/lib/grapple/ajax_data_grid_builder.rb

@@ -13,7 +13,9 @@ module Grapple
 			
 			data = {
 				"grapple-ajax-url" => options[:url] || template.url_for(action: 'table'),
-				"grapple-ajax-history" => options[:history] === false ? '0' : '1'
+				# 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 {
@@ -35,4 +37,4 @@ module Grapple
 		end
 
 	end
-end
+end

data/lib/grapple/components/actions.rb

@@ -10,9 +10,8 @@ module Grapple
 					if action.kind_of?(String)
 						html << action
 					else
-						# TODO: why are we deleting the label and url?
-						label = action.delete(:label)
-						url = action.delete(:url)
+						label = t(action[:label])
+						url = action[:url]
 						html << template.send(link_to_helper, label, url, action)
 					end
 				end			

data/lib/grapple/components/base_component.rb

@@ -50,7 +50,10 @@ module Grapple
 			end
 		
 			# Shortcut for translations
+			# Won't try to translate strings, just symbols
 			def t(*args)
+				# Don't translate strings
+				return args[0] if args.length == 1 && args[0].kind_of?(String)
 				begin
 					return template.t(*args) if template.method_defined?(:t)
 				ensure
@@ -58,6 +61,7 @@ module Grapple
 				end
 			end
 		
+			# Number of columns in the table
 			def num_columns
 				@columns.length
 			end
@@ -71,6 +75,7 @@ module Grapple
 				block.nil? ? render_components(components, options, &block).join : capture_block(&block)
 			end
 			
+			# Render an array of components 
 			def render_components(components, options, &block)
 				html = []
 				components.each do |component|

data/lib/grapple/components/column_headings.rb

@@ -4,12 +4,13 @@ module Grapple
 
 			setting :alignment_classes, { left: 'text-left', center: 'text-center', right: 'text-right' }
 			setting :tooltip_class, 'table-tooltip'
+			setting :row_class, 'column-headers'
 
 			def render(url_params = {})
 				cols = columns.collect do |column|
 					indent + column_header(column, url_params)
 				end
-				builder.row cols.join("\n"), :class => 'column-headers'
+				builder.row cols.join("\n"), :class => row_class
 			end
 
 			def column_header(column, additional_parameters = {})
@@ -19,15 +20,17 @@ module Grapple
 				liner_classes = []
 				liner_classes << tooltip_class if column[:title].present?
 
+				label = t(column[:label] || '')
+				
 				if column[:sort] && params.present?
 					cell_classes << 'sortable'
 					if column[:sort] == params[:sort]
 						liner_classes << (params[:dir] == 'desc' ? 'sort-desc' : 'sort-asc')
 						cell_classes << 'sorted'
 					end
-					content = template.link_to(column[:label], table_url(additional_parameters.merge({:sort => column[:sort]})))
+					content = template.link_to(label, table_url(additional_parameters.merge({sort: column[:sort]})))
 				else
-					content = column[:label]
+					content = label
 				end
 				
 				cell_classes = ' class="' + cell_classes.join(' ') + '"'

data/lib/grapple/components/html_row.rb

@@ -2,6 +2,7 @@ module Grapple
 	module Components
 		class HtmlRow < HtmlComponent
 			
+			# TODO: should be able to take a block for the content
 			def render(content, *options)
 				(indent + template.content_tag(:tr, content.html_safe, *options) + "\n").html_safe
 			end

data/lib/grapple/components/search_form.rb

@@ -9,8 +9,12 @@ module Grapple
 			def render(*options, &block)
 				options = options[0] ? options[0] : {}
 				form_classes = [form_class]
+				form_path = options[:form_path] || {}
+				form_options = options[:form_options] || {}
+				form_options[:class] = form_classes.join(' ')
+
 				html = ''
-				html << template.form_tag({}, { :class => form_classes.join(' ') })
+				html << template.form_tag(form_path, form_options)
 				html << template.hidden_field_tag(page_param, 1)
 				# TODO: don't use tables for vertical alignment
 				html << '<table><tr>'

data/lib/grapple/components/search_query_field.rb

@@ -6,7 +6,11 @@ module Grapple
 			setting :search_query_field_class, 'search-query'
 			
 			def render(*options, &block)
-				template.text_field_tag(search_query_param.to_s, params[search_query_param.to_sym], { :class => search_query_field_class })
+				template.text_field_tag(
+					search_query_param.to_s, 
+					params[search_query_param.to_sym], 
+					{ :class => search_query_field_class }
+				)
 			end
 
 		end

data/lib/grapple/components/search_submit.rb

@@ -2,8 +2,10 @@ module Grapple
 	module Components
 		class SearchSubmit < HtmlComponent
 
+			setting :label, 'Filter'
+		
 			def render
-				template.submit_tag(t(:filter))
+				template.submit_tag(t(label))
 			end
 
 		end

data/lib/grapple/html_table_builder.rb

@@ -9,6 +9,7 @@ module Grapple
 		helper :footer, Grapple::Components::HtmlFooter
 
 		def table(content)
+			# TODO: support attributes on the table tag
 			"<table>#{content}</table>\n".html_safe
 		end
 		

data/spec/builders/base_table_builder_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'Base Table Builder' do
+	include GrappleSpecHelper
+
+	before do
+		@output_buffer = ''
+		mock_everything
+	end
+	
+end

data/spec/builders/data_grid_builder_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'Base Table Builder' do
+	include GrappleSpecHelper
+
+	before do
+		@output_buffer = ''
+		mock_everything
+	end
+
+
+	it "should be correct" do
+		builder = Grapple::DataGridBuilder.new(self, users_columns, users_records, {})
+
+		html = builder.search_submit
+		expect(html).to have_tag('input', with: { type: "submit"})
+
+		html = builder.search_query_field
+		expect(html).to have_tag('input', with: { type: "text"})
+
+		html = builder.search_form
+		expect(html).to have_tag('form')
+
+		html = builder.actions
+		expect(html).to have_tag('div.actions')
+
+		html = builder.toolbar
+		expect(html).to have_tag('tr.toolbar')
+
+		html = builder.column_headings
+		expect(html).to have_tag('tr.column-headers')
+
+	end
+	
+end

data/spec/builders/html_table_builder_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Base Table Builder' do
+	include GrappleSpecHelper
+
+	before do
+		@output_buffer = ''
+		mock_everything
+	end
+
+	it "container_attributes should be correct" do
+		attr = Grapple::HtmlTableBuilder.container_attributes(self, { :id => 'my_table' })
+		expect(attr[:class]).to include("grapple")
+	end
+
+	it "table should be correct" do
+		builder = Grapple::HtmlTableBuilder.new(self, users_columns, users_records, {})
+
+		html = builder.table("<tr><td>TEST</td></tr>")
+
+		#puts html
+
+		expect(html).to have_tag('table') do
+			with_tag("tr", count: 1) do 
+				with_tag("td", count: 1) do
+					with_text("TEST")
+				end
+			end
+		end
+	end
+	
+end

data/spec/components/search_form_spec.rb

@@ -14,7 +14,7 @@ describe 'search form' do
 		
 		html = builder.search_form()
 
-		puts html
+		#puts html
 
 		expect(html).to have_tag('form.search-form', with: {method: "post"}) do
 			with_tag('input', with: {type: "hidden", name: "page"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapple
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Edward Potocko
@@ -167,6 +167,9 @@ files:
 - lib/grapple/helpers/table_helper.rb
 - lib/grapple/html_table_builder.rb
 - spec/builders/ajax_data_grid_builder_spec.rb
+- spec/builders/base_table_builder_spec.rb
+- spec/builders/data_grid_builder_spec.rb
+- spec/builders/html_table_builder_spec.rb
 - spec/components/actions_spec.rb
 - spec/components/column_headings_spec.rb
 - spec/components/html_body_spec.rb