grapple 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6581b58b78fc16e21a8f26193ba0c67157cf0c64
-  data.tar.gz: 2f997ea175542080b9abc55b1bd48f0028e69775
+  metadata.gz: 6ef0f88b129f8fe4ca4d9e9b2c1e8c458f819dc2
+  data.tar.gz: 54f77fef01ea33ab190ca13e8e94089fdf212206
 SHA512:
-  metadata.gz: 62dd6f9db28ad6b735e610fa394a098264d08206a1e667707da730dec41ae53870776d1f2241c5a53f08303bf424c07d07de914f4a88ebb5d333c22a51473bcb
-  data.tar.gz: f3f74f0266d5a14af60d3fbb2e80069a98d81ae3d8b87e58cebe2a1c8be34b01be2786601b6509bfaf413a51dddb0ded7cc2c3b9ebf7b5888c2a5b30d5a39621
+  metadata.gz: a8506f028c52cb5a49f7275c9bdf647cddd954c31c748c9e4bdd6c362b9d77006949aa45a32eb120f712c1cf360e8008f3c60180e142365f8cc2254ce88b93f2
+  data.tar.gz: 70244d224b0fc8e8f3c885e2c4f3f222dbff4ce22432bacca7c217587c36aaa050b010cd5220dfb3a8bb94e991f08dc628fbeb8c9f02f266918373904383e8e7

data/README.md

@@ -182,9 +182,7 @@ end
 Create a container around the table that can be updated by the JavaScript
 ``` HTML+ERB
 <%# app/views/posts/index.html.erb %>
-<%= grapple_container(id: 'posts_table') do %>
-	<%= render :partial => 'table' %>
-<% end %>
+<%= render partial: 'table' %>
 ```
 
 Render the table using `table_for` in `app/views/posts/_table.html.erb`

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

@@ -4,7 +4,8 @@
 var urlQuery = Grapple.Util.urlQuery, 
 	parseUrlQuery = Grapple.Util.parseUrlQuery;
 
-var GrappleHistory = function() {
+var GrappleHistory = function(namespace) {
+	this.namespace = namespace;
 	if(History.init) {
 		// https://github.com/browserstate/history.js/
 		this.api = History;
@@ -29,7 +30,8 @@ GrappleHistory.IGNORE_PARAMS = { 'utf8': true, 'authenticity_token': true };
 
 GrappleHistory.prototype = {
 
-	add: function(namespace, params) {
+	add: function(params) {
+		var namespace = this.namespace;
 		var state = this.api.getState();
 		var historyParams = parseUrlQuery(urlQuery(state.url));
 		var newParams = parseUrlQuery(params);
@@ -39,9 +41,9 @@ GrappleHistory.prototype = {
 		for(var x in historyParams) {
 			var remove = namespace ? 
 				// Remove any parameters in the tables namespace
-				x.indexOf(namespace + '.') === 0 : 
+				x.indexOf(namespace + '[') === 0 : 
 				// Table is in the global namespace, remove any parameters that aren't namespaced
-				x.indexOf('.') === -1;					
+				x.indexOf('[') === -1;					
 
 			if(remove) {
 				delete historyParams[x];
@@ -51,18 +53,28 @@ GrappleHistory.prototype = {
 		// Add the new parameters
 		for(var x in newParams) {
 			if(GrappleHistory.IGNORE_PARAMS[x]) continue;
-			var key = namespace ? namespace + '.' + x : x;
-			historyParams[key] = newParams[key];
+			//var key = namespace ? namespace + '[' + x  + ']' : x;
+			historyParams[x] = newParams[x];
 		}
-
+		
 		this.api.pushState(null, document.title, '?' + $.param(historyParams));
 	},
 	
 	subscribe: function(callback) {
-		var api = this.api;
+		var api = this.api, namespace = this.namespace;
 		this.changeCallback = function(event) {
 			var state = api.getState();
-			callback(parseUrlQuery(urlQuery(state.url)));
+			var params = parseUrlQuery(urlQuery(state.url));
+			// Only include the parameters for this namespace
+			if(namespace) {
+				var r = new RegExp('^' + namespace + '\\[([^\\]]+)\\]$')
+				for(var x in params) {
+					if(r.exec(x) === null) {
+						delete params[x];
+					}
+				}
+			}
+			callback(params);
 		};
 		$(window).bind('statechange', this.changeCallback);
 	},
@@ -78,4 +90,4 @@ GrappleHistory.prototype = {
 
 Grapple.History = GrappleHistory;
 
-})(window, Grapple, $);
+})(window, Grapple, $);

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

@@ -28,7 +28,7 @@ var GrappleTable = function(element, options) {
 		this.history = options.history;
 	}
 	else if(this.element.data('grapple-ajax-history') == 1 || options.history === true) {
-		this.history = new Grapple.History();
+		this.history = new Grapple.History(this.namespace);
 	}
 	else {
 		this.history = null;
@@ -65,7 +65,7 @@ GrappleTable.prototype = {
 		if(this.history) {
 			var self = this;
 			this.history.unsubscribe();
-			this.history = new Grapple.History();
+			this.history = new Grapple.History(this.namespace);
 			this.history.subscribe(function(params) {
 				self.onHistoryChange(params);
 			});
@@ -85,7 +85,7 @@ GrappleTable.prototype = {
 
 		if(this.history) {
 			this.history.unsubscribe();
-			this.history.add(this.namespace, params);
+			this.history.add(params);
 		}
 		
 		this._updateTable(params);
@@ -114,7 +114,6 @@ GrappleTable.prototype = {
 		if(params.length) {
 			url += '?' + params;
 		}
-
 		$.ajax(url, {
 			success: function(data) {
 				// HACK
@@ -129,10 +128,7 @@ GrappleTable.prototype = {
 			},
 			error: function(a, b, c) {
 				// TODO: handle loading errors
-				console.log("Failed to load table");
-				console.log(a);
-				console.log(b);
-				console.log(c);
+				console.log("Failed to load table", a, b, c);
 			}
 		});
 	},

data/lib/grapple/ajax_data_grid_builder.rb

@@ -5,25 +5,25 @@ module Grapple
 
 		@@next_id = 1000
 
-		def self.container_attributes(template, options)
+		def container_attributes	
 			@@next_id += 1
-			options[:id] ||= "grapple_ajax_table_#{@@next_id}"
+			@options[:id] ||= "grapple_ajax_table_#{@@next_id}"
 			css = CONTAINER_CLASSES
-			css += " #{options[:container_class]}" unless options[:container_class].nil?
+			css += " #{@options[:container_class]}" unless @options[:container_class].nil?
 
 			data = {
-				"grapple-ajax-url" => options[:url] || template.url_for(action: 'table'),
+				"grapple-ajax-url" => @options[:url] || template.url_for(action: 'table'),
 				# History is disabled by default, override container_attributes
 				# in an initializer to enable it by default
-				"grapple-ajax-history" => options[:history] == true ? '1' : '0'
+				"grapple-ajax-history" => @options[:history] == true ? '1' : '0'
 			}
 			
 			# The namespace allows the query parameters to be namespaced so 
 			# multiple tables can exist on the same page
-			data["grapple-ajax-namespace"] = options[:namespace] unless options[:namespace].nil?
+			data["grapple-ajax-namespace"] = @options[:namespace] unless @options[:namespace].nil?
 			
 			return {
-				:id => options[:id],
+				:id => @options[:id],
 				:class => css,
 				:data => data
 			}
@@ -31,11 +31,11 @@ module Grapple
 
 		def after_table
 			style = 'background-image: url(' + template.image_path("grapple/loading-bar.gif") + ')'
-			template.content_tag :div, '', :class => 'loading-overlay', :style => style
+			template.content_tag :div, '', class: 'loading-overlay', style: style
 		end
 
-		def self.after_container(template, options)
-			selector = '#' + options[:id]
+		def after_container
+			selector = '#' + @options[:id]
 			js = "$(#{selector.to_json}).grapple();"
 			return template.javascript_tag(js)
 		end

data/lib/grapple/base_table_builder.rb

@@ -24,16 +24,22 @@ module Grapple
 			define_singleton_method(method) { settings }
 		end
 
-		attr_reader :columns, :records, :template, :params
+		attr_reader :columns, :records, :template, :params, :namespace
 
 		def initialize(template, columns, records, params = {}, *options)
 			@template = template
 			@columns = columns
 			@records = records
+			@options = default_options.merge(options[0] || {})
+			@namespace = @options[:namespace]
 			@params = params
-			@options = options[0] || {}
+			@params = @params[@namespace] || {} if @namespace
 			@helper_instances = {}
 		end
+		
+		def default_options
+			{ }
+		end
 
 		def before_table
 			''
@@ -42,6 +48,10 @@ module Grapple
 		def after_table
 			''
 		end
+		
+		def container(inner_html)
+			inner_html
+		end
 
 	protected
 

data/lib/grapple/components/base_component.rb

@@ -91,6 +91,11 @@ module Grapple
 				html
 			end
 			
+			# Returns a url parameter in the namespaced format
+			def url_parameter(param)
+				@builder.namespace ? @builder.namespace + '[' + param.to_s + ']' : param.to_s
+			end
+			
 		end
 	end
 end

data/lib/grapple/components/column_headings.rb

@@ -22,13 +22,14 @@ module Grapple
 
 				label = t(column[:label] || '')
 				
-				if column[:sort] && params.present?
+				if column[:sort]
 					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(label, table_url(additional_parameters.merge({sort: column[:sort]})))
+					url = table_url(additional_parameters.merge({sort: column[:sort]}))
+					content = template.link_to(label, url)
 				else
 					content = label
 				end

data/lib/grapple/components/html_component.rb

@@ -16,7 +16,15 @@ module Grapple
 				if options[:sort] == params[:sort]
 					options[:dir] = (params[:dir] == 'desc') ? 'asc' : 'desc'
 				end
-				template.url_for params.stringify_keys().merge(options.stringify_keys())
+				url_params = params.stringify_keys().merge(options.stringify_keys())
+				if @builder.namespace
+					tmp = {}
+					url_params.each do |key, value|
+						tmp[url_parameter(key)] = value
+					end
+					url_params = tmp
+				end
+				template.url_for url_params
 			end
 
 		end

data/lib/grapple/components/will_paginate_pagination.rb

@@ -19,6 +19,7 @@ module Grapple
 				elsif !params[:query].blank? and records.empty?
 					html = h(t(no_results_message))
 				else
+					paginate_parameters[:param_name] = url_parameter(:page) if builder.namespace
 					html = template.will_paginate(records, paginate_parameters) || ' '
 				end
 

data/lib/grapple/helpers/table_helper.rb

@@ -4,17 +4,23 @@ module Grapple
 
 			@@builder = Grapple::DataGridBuilder
 			mattr_accessor :builder
-
+		
 			def table_for(columns, records, *args, &block)
 				options = args[0] || {}
+				render_container = (options[:container].nil? ? !request.xhr? : options[:container]) rescue false
 				table_html_attributes = options[:html] || {}
-				builder_class = options[:builder] || @@builder
+				options[:builder] = options[:builder] || @@builder
 				# params might not be defined (being called from a mailer)
 				# HACK: "defined? params" is returning method but when it gets called the method is not defined
-				request_params = params() rescue {}
-				builder = builder_class.new(self, columns, records, request_params, options)
+				request_params = request.params() rescue {}
+				builder = options[:builder].new(self, columns, records, request_params, options)
 				output = capture(builder, &block)
-				(builder.before_table + builder.table(output, table_html_attributes) + builder.after_table).html_safe
+				table_html = (builder.before_table + builder.table(output, table_html_attributes) + builder.after_table)
+				if render_container
+					builder.container(table_html)
+				else
+					table_html.html_safe
+				end
 			end
 
 			def grapple_container(*args, &block)

data/lib/grapple/html_table_builder.rb

@@ -13,18 +13,30 @@ module Grapple
 		def table(content, attributes = {})
 			"#{template.content_tag('table', content, attributes)}\n".html_safe
 		end
-
-		def self.container_attributes(template, options)
-			return {
-				:class => 'grapple'
-			}
+		
+		# Wrap the table in a div
+		def container(inner_html)
+			html = ''
+			html << before_container
+			html << template.tag('div', container_attributes, true) + "\n"
+			html << inner_html
+			html << "</div>\n"
+			html << after_container
+			return html.html_safe
+		end
+		
+		# HTML attributes for the container
+		def container_attributes
+			{ class: 'grapple' }
 		end
 
-		def self.before_container(template, options)
+		# HTML to render before the container
+		def before_container
 			''
 		end
 
-		def self.after_container(template, options)
+		# HTML to render after the container
+		def after_container
 			''
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapple
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Edward Potocko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack