weaver 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c353ccbc567eb541727a44254ba814ac5e8eafd3
-  data.tar.gz: 86828051371239af0b3a663580a31113599f8cb1
+  metadata.gz: 0bbee7c107a2c4938c07cfcf0e0f8a7357589667
+  data.tar.gz: e574b0658c639c772fb42a3c48a16d8f85c46e53
 SHA512:
-  metadata.gz: ea92131d491f3e80a35529f4f4be0dfb0e16a2d59c39198fa14781c6bdebdbd5b108f30028a942069ed019cd0a64b6210f5e02ca66b1ceaa9f0231d2dafa6b29
-  data.tar.gz: 1aeebe6c64304feb61ce8c8c0ca8a91fa922c8ff1f28c5a462743f428bb71cfd3ef2ac4cd79288f60506d6a342181096ad292bbd8954f2828656ca05538ecd32
+  metadata.gz: 3d941ce753c4d92d3ebda8a3536f56b83e238fb55e64a810ad1f998d80e823de0c6b35cb5806ac56ec2ecec8dffdcc9df97a5147b7e2effcbe8cb9611c1ed480
+  data.tar.gz: eeb5d8d0182dffadd3eac2ba86951c439a753e0563a94337874f025a459d303bdee243698e87157eebefb706d28ad873d6fb14c196a144ebd3caf902be3ef270

data/data/weaver/css/style.css

@@ -2337,7 +2337,9 @@ label.error {
   margin-left: 5px;
 }
 .form-control.error {
-  border: 1px dotted #cc5965;
+    background: rgb(251, 227, 228);
+    border: 1px solid #fbc2c4;
+    color: #8a1f11;
 }
 /* ngGrid */
 .gridStyle {

data/exe/weaver

@@ -2,6 +2,7 @@
 
 require 'weaver'
 require 'trollop'
+require 'sinatra/base'
 
 class Website < Sinatra::Base
 
@@ -95,7 +96,7 @@ where [options] are:
 	end
 
 	puts "Building site..."
-
+	
 	buildDir = "#{Dir.pwd}/build" 
 	FileUtils::rm_rf buildDir
 	FileUtils.cp_r(Gem.datadir("weaver"), buildDir)

data/lib/weaver/version.rb

@@ -1,3 +1,3 @@
 module Weaver
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/weaver.rb

@@ -1,7 +1,6 @@
 require "weaver/version"
 
 require 'fileutils'
-require 'sinatra'
 require 'json'
 require 'active_support/core_ext/object/to_query'
 
@@ -353,7 +352,6 @@ ENDROW
 			type = :a if options[:toggle]
 
 
-
 			method_missing type, buttonOptions do
 				if title.is_a? Symbol
 					icon title
@@ -590,12 +588,19 @@ ENDROW
 
 	class DynamicTableCell < Elements
 
+		attr_accessor :transform_script
+
 		def data_button(anIcon, title={}, options={}, &block)
 			options[:icon] = anIcon
 			options[:title] = title
 			options[:data] = "$(this).closest('td').data('object')"
 			_button(options, &block)
 		end
+
+		def transform(script)
+			@transform_script = script
+		end
+
 	end
 
 	class JavaScriptObject
@@ -658,6 +663,7 @@ ENDROW
 
 			title = options[:title] || name
 			format = nil
+			transform = nil
 
 			if options[:icon]
         		elem = Elements.new(@page, @anchors)
@@ -672,9 +678,20 @@ ENDROW
         		elem = DynamicTableCell.new(@page, @anchors)
         		elem.instance_eval(&block)
 				format = elem.generate
+				if elem.transform_script
+					func_name = @page.create_anchor "transform"
+					@page.write_script_once <<-SCRIPT
+document.transform_#{func_name} = function (input)
+{
+#{elem.transform_script}
+}
+					SCRIPT
+
+					transform = func_name
+				end
 			end
 
-			@columns << {name: name, title: title, format: format}
+			@columns << {name: name, title: title, format: format, transform: transform}
 
 		end
 
@@ -723,15 +740,20 @@ ENDROW
 				query_string = "+ \"?\" + $.param(query_object)"
 			end
 
+			member_expr = ""
+			if @options[:member]
+				member_expr = ".#{@options[:member]}"
+			end
+
 			<<-DATATABLE_SCRIPT
 
 	function refresh_table_#{@table_name}()
 	{
 		var query_object = #{query_object_declaration};
 
-		$.get( "#{@url}" #{query_string}, function( data )
+		$.get( "#{@url}" #{query_string}, function( returned_data )
 		{
-
+			var data = returned_data#{member_expr};
 			var data_object = {};
 			if (data !== null && typeof data === 'object')
 			{
@@ -800,6 +822,7 @@ ENDROW
 					var row = $('<tr>');
 					for (var columnIndex = 0; columnIndex < Object.keys(columns).length; columnIndex++) {
 						var cell_data = data_object[index][ Object.keys(columns)[columnIndex] ];
+
 						if (columnData && columnData[columnIndex]["format"])
 						{
 							var format = columnData[columnIndex]["format"];
@@ -812,10 +835,18 @@ ENDROW
 								result = result.replaceAll(matches[matchIndex], data_object[index][member_name]);
 							}
 
+							if (columnData && columnData[columnIndex]["transform"])
+							{
+								result = document["transform_" + columnData[columnIndex]["transform"]](result);
+							}
 							row.append($('<td>').html( result ).data("object", data_object[index]) );
 						}
 						else
 						{
+							if (columnData && columnData[columnIndex]["transform"])
+							{
+								cell_data = document["transform_" + columnData[columnIndex]["transform"]](cell_data);
+							}
 							row.append($('<td>').text( cell_data ).data("object", data_object[index]) );
 						}
 					}
@@ -957,6 +988,58 @@ function #{@actionName}(caller, data) {
 		end
 	end
 
+	class TextfieldJavascript
+
+		def initialize(id)
+			@id = id
+		end
+
+		def onchange(script)
+			@change_script = script
+		end
+
+		def validate(script)
+			@validate_script = script
+		end
+
+		def generate(&block)
+			if block
+			instance_eval(&block)
+				<<-SCRIPT
+$("##{@id}").keyup(function()
+{
+	function validate()
+	{
+		#{@validate_script};
+		return true;
+	}
+
+	var object = $("##{@id}");
+	#{@change_script};
+
+	if (validate())
+	{
+		object.removeClass("required");
+		object.removeClass("error");
+		object.removeAttr("aria-invalid");
+	}
+	else
+	{
+		object.addClass("required");
+		object.addClass("error");
+		object.attr("aria-required", "true");
+		object.attr("aria-invalid", "true");
+	}
+})
+
+
+				SCRIPT
+			end
+
+		end
+
+	end
+
 	class Form < Elements
 		def initialize(page, anchors, options)
 			super(page, anchors)
@@ -966,7 +1049,7 @@ function #{@actionName}(caller, data) {
 			@formName = options[:id] || @page.create_anchor("form")
 		end
 
-		def passwordfield(name, textfield_label=nil, options={})
+		def passwordfield(name, textfield_label=nil, options={}, &block)
 
 			if textfield_label.is_a? Hash
 				options = textfield_label
@@ -974,17 +1057,17 @@ function #{@actionName}(caller, data) {
 			end
 
 			options[:type] = "password"
-			textfield(name, textfield_label, options)
+			textfield(name, textfield_label, options, &block)
 		end
 
-		def textfield(name, textfield_label=nil, options={})
+		def textfield(name, textfield_label=nil, options={}, &block)
 
 			if textfield_label.is_a? Hash
 				options = textfield_label
 				textfield_label = nil
 			end
 
-			textfield_name = @page.create_anchor "textfield"
+			textfield_name = options[:id] || @page.create_anchor("textfield")
 			options[:type] ||= "text"
 			options[:placeholder] ||= ""
 			options[:name] = name
@@ -996,6 +1079,7 @@ function #{@actionName}(caller, data) {
 			input_options[:name] = options[:name]
 			input_options[:rows] = options[:rows]
 			input_options[:class] = "form-control"
+			input_options[:value] = options[:value]
 
 			input_options[:autocomplete] = options[:autocomplete] || "on"
 			input_options[:autocorrect] = options[:autocorrect] || "on"
@@ -1008,7 +1092,7 @@ function #{@actionName}(caller, data) {
 				input_options[:"data-mask"] = options[:mask]
 			end
 
-			div :class => "form-group" do
+			div :class => "form-group #{options[:extra_class]}", id: "#{input_options[:id]}-group" do
 				label textfield_label if textfield_label
 				if input_options[:rows] and input_options[:rows] > 1
 					textarea input_options do
@@ -1018,11 +1102,31 @@ function #{@actionName}(caller, data) {
 				end
 			end
 
+			textjs = TextfieldJavascript.new(input_options[:id])
+
+			@page.on_page_load textjs.generate(&block) if block
+
 			@scripts << <<-SCRIPT
 	object["#{name}"] = $('##{textfield_name}').val();
 			SCRIPT
 		end
 
+		def hiddenfield(name, value, options={})
+			hiddenfield_name = options[:id] || @page.create_anchor("hiddenfield")
+
+			input_options = {}
+			input_options[:type] = "hidden"
+			input_options[:value] = value
+			input_options[:id] = hiddenfield_name
+			input_options[:name] = name
+
+			input input_options
+
+			@scripts << <<-SCRIPT
+	object["#{name}"] = $('##{hiddenfield_name}').val();
+			SCRIPT
+
+		end
 	
 		def dropdown(name, dropdown_label, choice_array, options={})
 			select_name = @page.create_anchor "select"
@@ -1124,26 +1228,36 @@ function #{@actionName}(caller, data) {
 
 			radio_name = @page.create_anchor "radio"
 
-			first = true
-			choice_array.each do |choice|
-
-				value = choice
-				label = choice
+			choice_array = choice_array.map do |choice|
 				if choice.is_a? Hash
-					value = choice[:value]
-					label = choice[:label]
+					{value: choice[:value], label: choice[:label]}
+				else
+					{value: choice, label: choice}
 				end
+			end
+
+			active = choice_array[0][:value]
+			if options[:value] and choice_array.index { |x| x[:value] == options[:value] } != nil
+				active = options[:value]
+			end
+
+			choice_array.each do |choice|
+
+				value = choice[:value]
+				label = choice[:label]
 
 				the_options = Hash.new(options)
-				if first
+
+				if active == value
 					the_options[:checked] = ""
-					first = false
 				end
 				the_options[:type] = "radio"
 				the_options[:value] = value
 				the_options[:name] = name
 				text boolean_element(label, the_options)
 			end
+
+
 			@scripts << <<-SCRIPT
 	object["#{name}"] = $('input[name=#{name}]:checked', '##{@formName}').val()
 			SCRIPT
@@ -1224,6 +1338,7 @@ $(document).ready(function () {
 				}
 
 				form_opts[:action] = options[:action] if options[:action]
+				form_opts[:method] = options[:method] if options[:method]
 				form_opts[:class] = options[:class] if options[:class]
 
 				method_missing :form, form_opts do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -720,7 +720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Website generator