weaver 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658551b5f5c8d27c88a383e9b8c56d8e5a9a3dd6
-  data.tar.gz: 1da3a9c03c4e424f621b79499c822b0d5742c266
+  metadata.gz: ae6c5d9dc5321714d7473018da8bc8738d62bee1
+  data.tar.gz: 1e4402daa077db93b77cf933a8b3e482f3041d89
 SHA512:
-  metadata.gz: a96b06fc728b9de80d0d84aa5b743d496709e2355ffbece6bd57db26f478be4eb0520232c339cf910b33bde36b9a7c70de95a239e622ae3aedc7f90c5cda2406
-  data.tar.gz: ab41c813e37b25dd416ff085a0fb50b0a84297b45cec00fa2c1da50cb88e6693d6ccabbbbdba5752e250bfa643669170615e2822e2b530a80eb09b230037d8c1
+  metadata.gz: 4d2fc0027cba08b8400979f2cee102de30f23635bab9a1776163bbcb45c80d71b0f80cf602b87c7fed9232d1ba36a254fad179043107620ad21bf9bb265070c2
+  data.tar.gz: bd9eaf24fe0e0ef30c3ffb3ee416704cbd1a0e248f3204792e4ef9085918f952961ce5084f1fc37d9162a2e02c4c3903a2f37af3ef3135192818803261971764

data/data/weaver/js/inspinia.js

@@ -4,7 +4,11 @@
  *   version 2.2
  *
  */
-
+ 
+String.prototype.replaceAll = function(search, replacement) {
+    var target = this;
+    return target.replace(new RegExp(search, 'g'), replacement);
+};
 
 $(document).ready(function () {
 
@@ -92,10 +96,10 @@ $(document).ready(function () {
 
     // Append config box / Only for demo purpose
     // Uncomment on server mode to enable XHR calls
-    $.get("skin-config.html", function (data) {
-        if (!$('body').hasClass('no-skin-config'))
-            $('body').append(data);
-    });
+    //$.get("skin-config.html", function (data) {
+    //    if (!$('body').hasClass('no-skin-config'))
+    //        $('body').append(data);
+    //});
 
     // Minimalize menu
     $('.navbar-minimalize').click(function () {

data/exe/weaver

@@ -7,6 +7,7 @@ class Website < Sinatra::Base
 
 	set :static, true 							# set up static file routing
 	set :public_folder, Gem.datadir("weaver")	# set up the static dir (with images/js/css inside)
+	set :bind, '0.0.0.0'
 
 	def getWeavefile(viewname)
 
@@ -153,6 +154,7 @@ end
 	to_create = "#{args[0]}"
 	FileUtils::mkdir_p "#{to_create}"
 	FileUtils::mkdir_p "#{to_create}/source"
+	FileUtils::mkdir_p "#{to_create}/images"
 	File.write "#{to_create}/Gemfile", gemfile
 	File.write "#{to_create}/source/index.weave", source
 end

data/lib/weaver/version.rb

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

data/lib/weaver.rb

@@ -128,6 +128,20 @@ module Weaver
 			@inner_content << theText
 		end
 
+		def badge(label, options={})
+			options[:type] ||= "plain"
+
+			kind = "label"
+			kind = "badge" if options[:rounded]
+			tag_options = options.clone
+			tag_options[:class] = "#{kind} #{kind}-#{options[:type]}"
+
+			span tag_options do
+				text label
+			end
+		end
+
+
 		def link(url, title=nil, &block)
 			if !title
 				title = url
@@ -340,17 +354,13 @@ ENDROW
 
 		def table(options={}, &block)
 
-			if !@anchors["tables"]
-				@anchors["tables"] = []
-			end
 
-			tableArray = @anchors["tables"]
+			table_name = options[:id] || @page.create_anchor("table")
+			table_style = ""
 
-			table_name = "table#{tableArray.length}"
-			if options[:id] != nil
-				table_name = options[:id]
+			if options[:style] != nil
+				table_style = options[:style]
 			end
-			tableArray << table_name
 
 			classname = "table"
 
@@ -385,7 +395,17 @@ ENDROW
 			end
 
 
-			method_missing(:table, :class => classname, id: table_name, &block)
+			method_missing(:table, :class => classname, id: table_name, style: table_style, &block)
+		end
+
+		def table_from_source(url, options={}, &block)
+
+			dyn_table = DynamicTable.new(@page, @anchors, url, options, &block)
+
+			text dyn_table.generate_table
+
+			@page.scripts << dyn_table.generate_script
+
 		end
 
 		def table_from_hashes(hashes, options={})
@@ -405,15 +425,17 @@ ENDROW
 					end
 				end
 
-				hashes.each do |hash|
+				tbody do
 
-					tr do
-						keys.each do |key, _|
-							td "#{hash[key]}" || "&nbsp;"
+					hashes.each do |hash|
+
+						tr do
+							keys.each do |key, _|
+								td "#{hash[key]}" || "&nbsp;"
+							end
 						end
 					end
 				end
-
 			end
 		end
 
@@ -422,6 +444,192 @@ ENDROW
 		end
 	end
 
+	class DynamicTableCell < Elements
+
+		def data_button(anIcon, title={}, options={}, &block)
+			options[:icon] = anIcon
+			options[:title] = title
+			options[:data] = "$(this).closest('td').data('object')"
+			_button(options, &block)
+		end
+	end
+
+	class DynamicTable
+
+		def initialize(page, anchors, url, options={}, &block)
+			@page = page
+			@anchors = anchors
+			@url = url
+			@options = options
+			@columns = nil
+
+			self.instance_eval(&block) if block
+
+			@options[:id] ||= @page.create_anchor "dyn_table"
+			@table_name = @options[:id]
+			@head_name = "#{@table_name}_head"
+			@body_name = "#{@table_name}_body"
+
+
+		end
+
+		def column(name, options={}, &block)
+			if @columns == nil
+				@columns = []
+			end
+
+			title = options[:title] || name
+			format = nil
+
+			if options[:icon]
+        		elem = Elements.new(@page, @anchors)
+        		elem.instance_eval do
+        			icon options[:icon]
+        			text " #{title}"
+        		end
+        		title = elem.generate
+			end
+
+			if block
+        		elem = DynamicTableCell.new(@page, @anchors)
+        		elem.instance_eval(&block)
+				format = elem.generate
+			end
+
+			@columns << {name: name, title: title, format: format}
+
+		end
+
+		def generate_table
+
+			table_name = @table_name
+			head_name = @head_name
+			body_name = @body_name
+			options = @options
+
+			columns = @columns || [ {title: "Key"}, {title: "Value"} ]
+
+        	elem = Elements.new(@page, @anchors)
+        	elem.instance_eval do
+
+				table options do
+					thead id: head_name do
+						columns.each do |column, _|
+							if column.is_a? Hash
+								th column[:title].to_s
+							else
+								th column.to_s
+							end 
+						end
+					end
+
+					tbody id: body_name do
+					end
+				end
+        	end
+
+        	elem.generate
+		end
+
+		def generate_script
+
+			<<-DATATABLE_SCRIPT
+
+	function refresh_table_#{@table_name}()
+	{
+		$.get( "#{@url}", function( data )
+		{
+			var data_object = JSON.parse(data);
+			var head = $("##{@head_name}")
+			var body = $("##{@body_name}")
+
+			if($.isPlainObject(data_object))
+			{
+				for (var key in data_object)
+				{
+					var row = $('<tr>');
+					row.append($('<td>').text(key));
+					row.append($('<td>').text(data_object[key]));
+					body.append(row);
+				}
+			}
+
+			if ($.isArray(data_object))
+			{
+
+				var columnData = JSON.parse(#{@columns.to_json.inspect});
+				var columns = {};
+				var columnTitles = [];
+				head.empty();
+				if (#{@columns == nil})
+				{
+					// Set up columns
+					for (var index in data_object)
+					{
+						for (var key in data_object[index])
+						{
+							columns[key] = Object.keys(columns).length;
+						}
+					}
+					for (var key in columns)
+					{
+						columnTitles.push(key);
+					}
+				}
+				else
+				{
+					for (var key in columnData)
+					{
+						columns[columnData[key]["name"]] = Object.keys(columns).length;
+						columnTitles.push(columnData[key]["title"]);
+					}
+				}
+
+				var row = $('<tr>');
+				for (var key in columnTitles)
+				{
+					var columnTitle = $('<th>').html(columnTitles[key]);
+					row.append(columnTitle);
+				}
+				head.append(row);
+
+				for (var index in data_object)
+				{
+					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"];
+							var matches = format.match(/###.+?###/g)
+
+							var result = format;
+							for (var matchIndex in matches)
+							{
+								var member_name = matches[matchIndex].match(/[^#]+/)[0];
+								result = result.replaceAll(matches[matchIndex], data_object[index][member_name]);
+							}
+
+							row.append($('<td>').html( result ).data("object", data_object[index]) );
+						}
+						else
+						{
+							row.append($('<td>').text( cell_data ).data("object", data_object[index]) );
+						}
+					}
+					body.append(row);
+				}
+			}
+
+		});
+	}
+
+	refresh_table_#{@table_name}();
+
+			DATATABLE_SCRIPT
+		end
+	end
+
 	class Action
 		def initialize(page, anchors, &block)
 			@page = page
@@ -568,9 +776,24 @@ function #{@actionName}(caller, data) {
 			options[:placeholder] ||= ""
 			options[:name] = name
 
+			input_options = {}
+			input_options[:type] = options[:type]
+			input_options[:placeholder] = options[:placeholder]
+			input_options[:id] = textfield_name
+			input_options[:name] = options[:name]
+			input_options[:class] = "form-control"
+
+			if options[:mask]
+				@page.request_css "css/plugins/jasny/jasny-bootstrap.min.css"
+				@page.request_js "js/plugins/jasny/jasny-bootstrap.min.js"
+
+				input_options[:"data-mask"] = options[:mask]
+
+			end
+
 			div :class => "form-group" do
 				label textfield_label
-				input type: options[:type], placeholder: options[:placeholder], id: textfield_name, name: options[:name], class: "form-control"
+				input input_options
 			end
 
 			@scripts << <<-SCRIPT
@@ -582,21 +805,37 @@ function #{@actionName}(caller, data) {
 		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
+			options[:class] = "form-control"
+			options[:name] = name
+			options[:id] = select_name
+			options[:placeholder] ||= " "
 
-				method_missing :select, options do
-					choice_array.each do |choice|
-						option choice
-					end
-				end
-			end
+			form_options = options.clone
 
 			if options[:multiple]
+
+				if options[:multiple_style] == :chosen
+					@page.request_css "css/plugins/chosen/chosen.css"
+					@page.request_js "js/plugins/chosen/chosen.jquery.js"
+
+					@page.write_script_once <<-SCRIPT
+	var config = {
+		'.chosen-select'           : {placeholder_text_multiple: "#{options[:placeholder]}"},
+		'.chosen-select-deselect'  : {allow_single_deselect:true},
+		'.chosen-select-no-single' : {disable_search_threshold:10},
+		'.chosen-select-no-results': {no_results_text:'Oops, nothing found!'},
+		'.chosen-select-width'     : {width:"95%"}
+	}
+	for (var selector in config) {
+		$(selector).chosen(config[selector]);
+	}
+					SCRIPT
+
+					form_options[:class] = "chosen-select"
+					form_options[:style] = "width: 100%"
+				end
+
 				@scripts << <<-SCRIPT
 	var selections = []; 
 	$("##{select_name} option:selected").each(function(i, selected){ 
@@ -604,12 +843,59 @@ function #{@actionName}(caller, data) {
 	});
 	object["#{name}"] = selections;
 				SCRIPT
+
 			else
 				@scripts << <<-SCRIPT
 	object["#{name}"] = $( "##{select_name} option:selected" ).text();
 				SCRIPT
 			end
 
+
+			div :class => "form-group" do
+				label dropdown_label, :class => "control-label"
+
+				div :class => "input-group", style: "width: 100%" do
+
+					method_missing :select, form_options do
+						choice_array.each do |choice|
+							option choice
+						end
+					end
+				end
+			end
+
+
+		end
+
+		def knob(name, options={})
+
+			knob_name = @page.create_anchor "knob"
+
+			@page.request_js "js/plugins/jsKnob/jquery.knob.js"
+			@page.write_script_once <<-SCRIPT
+	$(".dial").knob();
+			SCRIPT
+
+			knob_options = {}
+
+			knob_options[:id] = knob_name
+			knob_options[:type] = "text"
+			knob_options[:value] = options[:value] || "0"
+			knob_options[:class] = "dial"
+
+			options.each do |key,value|
+				knob_options["data-#{key}".to_sym] = value
+			end
+
+			knob_options[:"data-fgColor"] = "#1AB394"
+			knob_options[:"data-width"] = "85"
+			knob_options[:"data-height"] = "85"
+
+			input knob_options
+
+			@scripts << <<-SCRIPT
+	object["#{name}"] = $('##{knob_name}').val();
+			SCRIPT
 		end
 
 		def radio(name, choice_array, options={})
@@ -1028,7 +1314,7 @@ $(document).ready(function () {
 	end
 
 	class Page
-
+	
 		attr_accessor :scripts
 
 		def initialize(title, options)
@@ -1302,27 +1588,33 @@ $(document).ready(function () {
 		end
 	end
 
-	class NavPage < Page
+	class StructuredPage < Page
+
 		def initialize(title, options)
+			@rows = []
 			super
-			@menu = Menu.new
 		end
 
-		def menu(&block)
-			@menu.instance_eval(&block)
+		def header(&block)
+			row(class: "wrapper border-bottom white-bg page-heading", &block)
 		end
 
-	end
+		def row(options={}, &block)
+			r = Row.new(self, @anchors, options)
+			r.instance_eval(&block)
+			@rows << r
+		end
 
+	end
 
-	class SideNavPage < NavPage
+	class NavPage < StructuredPage
 		def initialize(title, options)
-			@rows = []
 			super
+			@menu = Menu.new
 		end
 
-		def header(&block)
-			row(class: "wrapper border-bottom white-bg page-heading", &block)
+		def menu(&block)
+			@menu.instance_eval(&block)
 		end
 
 		def brand(text, link="/")
@@ -1330,10 +1622,11 @@ $(document).ready(function () {
 			@brand_link = link
 		end
 
-		def row(options={}, &block)
-			r = Row.new(self, @anchors, options)
-			r.instance_eval(&block)
-			@rows << r
+	end
+
+	class SideNavPage < NavPage
+		def initialize(title, options)
+			super
 		end
 
 		def generate(level)
@@ -1436,25 +1729,9 @@ $(document).ready(function () {
 
 	class TopNavPage < NavPage
 		def initialize(title, options)
-			@rows = []
 			super
 		end
 
-		def header(&block)
-			row(class: "wrapper border-bottom white-bg page-heading", &block)
-		end
-
-		def brand(text, link="/")
-			@brand = text
-			@brand_link = link
-		end
-
-		def row(options={}, &block)
-			r = Row.new(self, @anchors, options)
-			r.instance_eval(&block)
-			@rows << r
-		end
-
 		def generate(level)
 			rows = @rows.map { |row|
 				<<-ENDROW
@@ -1568,6 +1845,77 @@ $(document).ready(function () {
 		end
 	end
 
+	class NonNavPage < StructuredPage
+		def initialize(title, options)
+			super
+		end
+
+		def generate(level)
+			rows = @rows.map { |row|
+				<<-ENDROW
+	<div class="row #{row.extra_classes}">
+#{row.generate}
+	</div>
+				ENDROW
+			}.join
+
+			@body_class = "gray-bg"
+
+			@content = <<-CONTENT
+	<div id="wrapper">
+	        <div class="wrapper-content">
+	            <div class="container">
+#{rows}
+	            </div>
+			</div>
+		</div>
+			CONTENT
+			super
+		end
+	end
+
+	class RawPage < Page
+		def initialize(title, options)
+			@element = Elements.new(self, {})
+			super
+		end
+
+		def element=(value)
+			@element = value
+		end
+
+
+		def generate(back_folders, options={})
+			@element.generate
+		end
+
+	end
+
+	class EmptyPage < Page
+		def initialize(title, options)
+			@element = Elements.new(self, {})
+			super
+		end
+
+		def element=(value)
+			@element = value
+		end
+
+		def generate(level)
+			@body_class = "gray-bg"
+			@content = <<-CONTENT
+	<div id="wrapper">
+	        <div class="wrapper-content">
+	            <div class="container">
+#{@element.generate}
+	            </div>
+			</div>
+		</div>
+			CONTENT
+			super
+		end
+	end
+
 
 	class CenterPage < Page
 		def initialize(title, options)
@@ -1645,6 +1993,50 @@ $(document).ready(function () {
 			@pages[path] = p
 		end
 
+		def nonnav_page(path, title=nil, &block)
+
+			if title == nil
+				title = path
+				path = ""
+			end
+
+			p = NonNavPage.new(title, @options)
+			p.instance_eval(&block) if block
+			@pages[path] = p
+		end
+		
+
+		def empty_page(path, title=nil, &block)
+
+			if title == nil
+				title = path
+				path = ""
+			end
+
+			p = EmptyPage.new(title, @options)
+
+			elem = Elements.new(p, {})
+			elem.instance_eval(&block) if block
+
+			p.element=elem
+
+			@pages[path] = p
+		end
+
+		def raw_page(path="", &block)
+
+			# raw pages dont even have a title
+
+			p = RawPage.new("", @options)
+
+			elem = Elements.new(p, {})
+			elem.instance_eval(&block) if block
+
+			p.element=elem
+
+			@pages[path] = p
+		end
+
 		def include(file)
 			dir = File.dirname(@file)
 			filename = File.join([dir, file])

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Site generator with a simple DSL
@@ -74,9 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -696,17 +696,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Website generator