weaver 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e4cc69b1948c31ab3a1009dc8e50f070046798
-  data.tar.gz: abea801b287d059e8691a5d31ae81ae50ee8ddaa
+  metadata.gz: 658551b5f5c8d27c88a383e9b8c56d8e5a9a3dd6
+  data.tar.gz: 1da3a9c03c4e424f621b79499c822b0d5742c266
 SHA512:
-  metadata.gz: fd21bda7490fad1acdf8e4ba0647c5d46e11e514649a412ab8c8637a7cdae78e9509cd8cba10829c35b30ff380f0d3f28eff53181aed3064d2445d56ce11aeac
-  data.tar.gz: 55a8a8493579a1a81730fdc806214e7ff642cbd3208c648a6aabd7bbecd2d6ba181fa033da37b9bcb709aafffe8a5caa972be1ea3d2c0d3bc8c4d3aeea53364e
+  metadata.gz: a96b06fc728b9de80d0d84aa5b743d496709e2355ffbece6bd57db26f478be4eb0520232c339cf910b33bde36b9a7c70de95a239e622ae3aedc7f90c5cda2406
+  data.tar.gz: ab41c813e37b25dd416ff085a0fb50b0a84297b45cec00fa2c1da50cb88e6693d6ccabbbbdba5752e250bfa643669170615e2822e2b530a80eb09b230037d8c1

data/lib/weaver.rb

@@ -50,6 +50,13 @@ module Weaver
 			end
 		end
 
+		def form(options={}, &block)
+        	theform = Form.new(@page, @anchors, options)
+        	theform.instance_eval(&block)
+        	@inner_content << theform.generate
+        	@page.scripts << theform.generate_script
+		end
+
         def ibox(options={}, &block)
         	panel = Panel.new(@page, @anchors, options)
         	panel.instance_eval(&block)
@@ -213,7 +220,7 @@ ENDROW
 			div :class => "jumbotron", style: additional_style, &block
 		end
 
-		def _button(options={})
+		def _button(options={}, &block)
 
 			anIcon = options[:icon]
 			title = options[:title]
@@ -222,12 +229,11 @@ ENDROW
 				options.merge! title
 				title = anIcon
 				anIcon = nil
-
 			end
 
 			style = options[:style] || :primary
 			size = "btn-#{options[:size]}" if options[:size]
-			block = "btn-block" if options[:block]
+			blockstyle = "btn-block" if options[:block]
 			outline = "btn-outline" if options[:outline]
 			dim = "dim" if options[:threedee]
 			dim = "dim btn-large-dim" if options[:bigthreedee]
@@ -236,9 +242,16 @@ ENDROW
 
 			buttonOptions = {
 				:type => "button",
-				:class => "btn btn-#{style} #{size} #{block} #{outline} #{dim}"
+				:class => "btn btn-#{style} #{size} #{blockstyle} #{outline} #{dim}"
 			}
 
+			if block
+				action = Action.new(@page, @anchors, &block)
+				buttonOptions[:onclick] = "#{action.name}(this)"
+				buttonOptions[:onclick] = "#{action.name}(this, #{options[:data]})" if options[:data]
+				@page.scripts << action.generate
+			end
+
 			type = :button
 
 			buttonOptions[:"data-toggle"] = "button" if options[:toggle]
@@ -256,76 +269,126 @@ ENDROW
 			end
 		end
 
-		def button(anIcon, title, options={})
+		def button(anIcon, title={}, options={}, &block)
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def block_button(anIcon, title, options={})
+		def block_button(anIcon, title={}, options={}, &block)
 			options[:block] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def outline_button(anIcon, title, options={})
+		def outline_button(anIcon, title={}, options={}, &block)
 			options[:outline] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def big_button(anIcon, title, options={})
+		def big_button(anIcon, title={}, options={}, &block)
 			options[:size] = :lg
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def small_button(anIcon, title, options={})
+		def small_button(anIcon, title={}, options={}, &block)
 			options[:size] = :sm
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def tiny_button(anIcon, title, options={})
+		def tiny_button(anIcon, title={}, options={}, &block)
 			options[:size] = :xs
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def embossed_button(anIcon, title, options={})
+		def embossed_button(anIcon, title={}, options={}, &block)
 			options[:threedee] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def big_embossed_button(anIcon, title, options={})
+		def big_embossed_button(anIcon, title={}, options={}, &block)
 			options[:bigthreedee] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def rounded_button(anIcon, title, options={})
+		def rounded_button(anIcon, title={}, options={}, &block)
 			options[:rounded] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def circle_button(anIcon, title, options={})
+		def circle_button(anIcon, title={}, options={}, &block)
 			options[:circle] = true
 			options[:icon] = anIcon
 			options[:title] = title
-			_button(options)
+			_button(options, &block)
 		end
 
-		def table_from_hashes(hashes)
+		def table(options={}, &block)
+
+			if !@anchors["tables"]
+				@anchors["tables"] = []
+			end
+
+			tableArray = @anchors["tables"]
+
+			table_name = "table#{tableArray.length}"
+			if options[:id] != nil
+				table_name = options[:id]
+			end
+			tableArray << table_name
+
+			classname = "table"
+
+			classname += " table-bordered" if options[:bordered]
+			classname += " table-hover" if options[:hover]
+			classname += " table-striped" if options[:striped]
+
+			if options[:system] == :data_table
+				@page.request_js "js/plugins/dataTables/jquery.dataTables.js"
+				@page.request_js "js/plugins/dataTables/dataTables.bootstrap.js"
+				@page.request_js "js/plugins/dataTables/dataTables.responsive.js"
+				@page.request_js "js/plugins/dataTables/dataTables.tableTools.min.js"
+
+				@page.request_css "css/plugins/dataTables/dataTables.bootstrap.css"
+				@page.request_css "css/plugins/dataTables/dataTables.responsive.css"
+				@page.request_css "css/plugins/dataTables/dataTables.tableTools.min.css"
+
+				@page.scripts << <<-DATATABLE_SCRIPT
+		$('##{table_name}').DataTable();
+				DATATABLE_SCRIPT
+			end
+
+			if options[:system] == :foo_table
+				classname += " toggle-arrow-tiny"
+				@page.request_js "js/plugins/footable/footable.all.min.js"
+
+				@page.request_css "css/plugins/footable/footable.core.css"
+
+				@page.scripts << <<-DATATABLE_SCRIPT
+		$('##{table_name}').footable();
+				DATATABLE_SCRIPT
+			end
+
+
+			method_missing(:table, :class => classname, id: table_name, &block)
+		end
+
+		def table_from_hashes(hashes, options={})
 
 			keys = {}
 			hashes.each do |hash|
@@ -334,7 +397,7 @@ ENDROW
 				end
 			end
 
-			table class: "table" do
+			table options do
 
 				thead do
 					keys.each do |key, _| 
@@ -346,7 +409,7 @@ ENDROW
 
 					tr do
 						keys.each do |key, _|
-							td hash[key] || "&nbsp;"
+							td "#{hash[key]}" || "&nbsp;"
 						end
 					end
 				end
@@ -359,6 +422,45 @@ ENDROW
 		end
 	end
 
+	class Action
+		def initialize(page, anchors, &block)
+			@page = page
+			@anchors = anchors
+
+			actionsArray = @anchors["action"]
+
+			if !@anchors["action"]
+				@anchors["action"] = []
+			end
+
+			actionsArray = @anchors["action"]
+
+			@actionName = "action#{actionsArray.length}"
+			actionsArray << @actionName
+
+			@code = ""
+
+			self.instance_eval(&block)
+		end
+
+		def script(code)
+			@code = code
+		end
+
+		def generate
+			puts @code
+			<<-FUNCTION
+function #{@actionName}(caller, data) {
+	#{@code}
+}
+			FUNCTION
+		end
+
+		def name
+			@actionName
+		end
+	end
+
 	class Code
 		def initialize(page, anchors, lang)
 			@page = page
@@ -375,7 +477,7 @@ ENDROW
 			codeArray = @anchors["code"]
 
 			@codeName = "code#{codeArray.length}"
-			codeArray << @accordion_name
+			codeArray << @codeName
 
 			@page.request_css "css/plugins/codemirror/codemirror.css"
 			@page.request_js "js/plugins/codemirror/codemirror.js"
@@ -445,6 +547,174 @@ ENDROW
 		end
 	end
 
+	class Form < Elements
+		def initialize(page, anchors, options)
+			super(page, anchors)
+			@options = options
+			@scripts = []
+
+			@formName = @page.create_anchor "form"
+		end
+
+		def passwordfield(name, textfield_label, options={})
+			options[:type] = "password"
+			textfield(name, textfield_label, options)
+		end
+
+		def textfield(name, textfield_label, options={})
+
+			textfield_name = @page.create_anchor "textfield"
+			options[:type] ||= "text"
+			options[:placeholder] ||= ""
+			options[:name] = name
+
+			div :class => "form-group" do
+				label textfield_label
+				input type: options[:type], placeholder: options[:placeholder], id: textfield_name, name: options[:name], class: "form-control"
+			end
+
+			@scripts << <<-SCRIPT
+	object["#{name}"] = $('##{textfield_name}').val();
+			SCRIPT
+		end
+
+	
+		def dropdown(name, dropdown_label, choice_array, options={})
+			select_name = @page.create_anchor "select"
+
+			div :class => "form-group" do
+				label dropdown_label, :class => "control-label"
+
+				options[:class] = "form-control"
+				options[:name] = name
+				options[:id] = select_name
+
+				method_missing :select, options do
+					choice_array.each do |choice|
+						option choice
+					end
+				end
+			end
+
+			if options[:multiple]
+				@scripts << <<-SCRIPT
+	var selections = []; 
+	$("##{select_name} option:selected").each(function(i, selected){ 
+  		selections[i] = $(selected).text(); 
+	});
+	object["#{name}"] = selections;
+				SCRIPT
+			else
+				@scripts << <<-SCRIPT
+	object["#{name}"] = $( "##{select_name} option:selected" ).text();
+				SCRIPT
+			end
+
+		end
+
+		def radio(name, choice_array, options={})
+
+			radio_name = @page.create_anchor "radio"
+
+			first = true
+			choice_array.each do |choice|
+
+				value = choice
+				label = choice
+				if choice.is_a? Hash
+					value = choice[:value]
+					label = choice[:label]
+				end
+
+				the_options = Hash.new(options)
+				if first
+					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
+			
+		end
+
+		def checkbox(name, checkbox_label, options={})
+			checkbox_name = @page.create_anchor "checkbox"
+			options[:type] = "checkbox"
+			options[:name] = name
+			options[:id] = checkbox_name
+			text boolean_element(checkbox_label, options)
+			@scripts << <<-SCRIPT
+	object["#{name}"] = $('##{checkbox_name}').is(":checked");
+			SCRIPT
+		end
+
+
+		def submit(anIcon, title={}, options={}, &block)
+			options[:icon] = anIcon
+			options[:title] = title
+			options[:data] = "get_#{@formName}_object()"
+			_button(options, &block)
+		end
+
+		def generate_script
+			<<-SCRIPT
+function get_#{@formName}_object()
+{
+	var object = {}
+#{@scripts.join "\n"}
+	return object;
+}
+			SCRIPT
+		end
+
+		def boolean_element(checkbox_label, options={})
+
+			@page.request_css "css/plugins/iCheck/custom.css"
+			@page.request_js "js/plugins/iCheck/icheck.min.js"
+
+			@page.write_script_once <<-SCRIPT
+$(document).ready(function () {
+    $('.i-checks').iCheck({
+        checkboxClass: 'icheckbox_square-green',
+        radioClass: 'iradio_square-green',
+    });
+});
+			SCRIPT
+
+			elem = Elements.new(@page, @anchors)
+			elem.instance_eval do
+				div class: "i-checks" do
+					label do
+						input options do
+							text " #{checkbox_label}"
+						end
+					end
+				end
+			end
+
+			elem.generate
+		end
+
+		def generate
+			inner = super
+			formName = @formName
+
+			elem = Elements.new(@page, @anchors)
+			elem.instance_eval do
+				method_missing :form, id: formName, role: "form" do
+					text inner
+				end
+			end
+
+			elem.generate
+		end
+	end
+
 	class Panel < Elements
 		def initialize(page, anchors, options)
 			super(page, anchors)
@@ -770,10 +1040,26 @@ ENDROW
 			@scripts = []
 			@top_content = ""
 
+			@scripts_once = {}
+
 			@requested_scripts = {}
 			@requested_css = {}
 		end
 
+		def create_anchor(name)
+
+			if !@anchors[name]
+				@anchors[name] = []
+			end
+
+			anchor_array = @anchors[name]
+
+			anchor_name = "#{name}#{anchor_array.length}"
+			anchor_array << anchor_name
+
+			anchor_name
+		end
+
 		def root
 			return @options[:root]
 		end
@@ -786,6 +1072,10 @@ ENDROW
 			@requested_css[path] = true
 		end
 
+		def write_script_once(script)
+			@scripts_once[script] = true
+		end
+
 		def top(&block)
 			elem = Elements.new(@page, @anchors)
 			elem.instance_eval(&block)
@@ -812,7 +1102,7 @@ ENDROW
 			body_tag = "<body class='#{@body_class}'>" if @body_class
 
 			loading_bar = ""
-			loading_bar = '<script src="js/plugins/pace/pace.min.js"></script>' if @loading_bar_visible
+			loading_bar = '<script src="#{mod}js/plugins/pace/pace.min.js"></script>' if @loading_bar_visible
 
 			extra_scripts = @requested_scripts.map {|key,value| <<-SCRIPT_DECL
     <script src="#{mod}#{key}"></script>
@@ -824,6 +1114,11 @@ ENDROW
 				STYLESHEET_DECL
 			}.join "\n"
 
+			extra_one_time_scripts = @scripts_once.map {|key,value| <<-SCRIPT_DECL
+#{key}
+				SCRIPT_DECL
+			}.join "\n"
+
 			<<-SKELETON
 <!DOCTYPE html>
 <html>
@@ -883,6 +1178,7 @@ ENDROW
 
     <script>
 #{scripts}
+#{extra_one_time_scripts}
     </script>
 
     <div id="blueimp-gallery" class="blueimp-gallery">
@@ -995,6 +1291,8 @@ ENDROW
 		def nav(name, icon=:question, url=nil, &block)
 			if url 
 				@items << { name: name, link: url, icon: icon }
+			else
+				@items << { name: name, link: "#", icon: icon }
 			end
 			if block
 				menu = Menu.new

data/lib/weaver/version.rb

@@ -1,3 +1,3 @@
 module Weaver
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra