weaver 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f29fdf1b626538dff95f90118555b633c51df40
-  data.tar.gz: 7b614f4d8a338910961288efaa5ebd9e005dbca3
+  metadata.gz: 4d8b80348cb5de93c99164db39391927fc07c02f
+  data.tar.gz: 4c3d9e71c8d1c7d6dc0f22e08b0a97c1f91313a8
 SHA512:
-  metadata.gz: c4abcab0eb5a2ed0d79b95960479bcfb62d109db1cc0d4d5b9a51a02b8b233721401d703c8291573b14d53bb8aa90ae2489dae171ef5d667f57c17471b96ae7e
-  data.tar.gz: 57d140836acb5cdb9c95d1ad785e6dda72649236be110b966ae923cfd052d08d45e174e400878570a3ecd96884a9cfa997d9d94dbec3277f18dd2da8a36a6806
+  metadata.gz: 5dd06ecd9491b151a2c1e49e9786262f3240bc3519f9c7da7e9305735c7c6d92d64c91abce67aac2aa559d4defc20aa138137c9e589a3e8f371c9d9a5d56330b
+  data.tar.gz: 502699eba012bbc3c80f208394396f395c1023b3177e8d5143d17358f5e8f64a69fdc3299582b37bf2ff7d10c92b2723d2b22af8b0209a3709edca732c0b5e2d

data/bin/weaver

@@ -1,6 +1,7 @@
 #!/usr/bin/exec ruby
 
 require 'weaver'
+require 'trollop'
 
 class Website < Sinatra::Base
 
@@ -55,16 +56,33 @@ class Website < Sinatra::Base
 				site.pages[path].generate(level)
 
 			else
+				puts "Not found: #{viewname} in #{viewFile}"
+				puts "Path is: #{path}"
 				status 404
 			end
 		else
+			puts "Not found: #{viewname} in #{viewFile}"
+				puts "Path is: #{path}"
 			status 404
 		end
 	end
 
 end
 
-def build!
+def build!(args)
+
+	opts = Trollop::options do
+		banner <<-EOS
+Generate website
+
+Usage:
+   weaver build [options]
+where [options] are:
+		EOS
+
+		opt :root, "The root URL to be used in links (e.g.) https://astrobunny.net", type: :string, default: "/"
+	end
+
 	puts "Building site..."
 
 	buildDir = "#{Dir.pwd}/build" 
@@ -78,7 +96,7 @@ def build!
 	files.each do |file|
 		baseDir = file.chomp('.weave').chomp('index').sub(/^source\//, "")
 
-		site = Weaver::Weave.new(file)
+		site = Weaver::Weave.new(file, opts)
 
 		site.pages.each do |localPath, page|
 			resultPath = File.join(baseDir, localPath)
@@ -100,8 +118,9 @@ def preview!
 	Website.run!
 end
 
-if ARGV[0] == "build"
-	build!
+command = ARGV.shift
+if command == "build"
+	build!(ARGV)
 else
 	preview!
 end

data/lib/weaver/version.rb

@@ -1,3 +1,3 @@
 module Weaver
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/weaver.rb

@@ -7,9 +7,10 @@ module Weaver
 
 	class Elements
 
-		def initialize(anchors)
+		def initialize(page, anchors)
 			@inner_content = []
 			@anchors = anchors
+			@page = page
 		end
 
 		def method_missing(name, *args, &block)
@@ -19,7 +20,7 @@ module Weaver
 				inner = args.shift
 			end
 			if block
-				elem = Elements.new(@anchors)
+				elem = Elements.new(@page, @anchors)
 				elem.instance_eval(&block)
 				inner = elem.generate
 			end
@@ -49,7 +50,7 @@ module Weaver
 		end
 
         def ibox(&block)
-        	panel = Panel.new(@anchors)
+        	panel = Panel.new(@page, @anchors)
         	panel.instance_eval(&block)
         	@inner_content << panel.generate
         end
@@ -75,7 +76,7 @@ module Weaver
 
         	end
 
-        	img class: "img-responsive #{options[:class]}", src: "/images/#{name}", style: style
+        	img class: "img-responsive #{options[:class]}", src: "#{@page.root}images/#{name}", style: style
         end
 
         def crossfade_image(image_normal, image_hover)
@@ -101,18 +102,40 @@ module Weaver
 			@inner_content << theText
 		end
 
-		def link(url, title=nil)
+		def link(url, title=nil, &block)
 			if !title
 				title = url
 			end
 
-			a href: url, target: "_blank" do
-				span do
-					text title
-					text " "
-					icon :external_link
+			if url.start_with? "/"
+				url.sub!(/^\//, @page.root)
+				if block
+					a href: url, &block
+				else
+					a title, href: url
+				end
+			else
+
+				if block
+					a href: url, target: "_blank" do
+						span do
+							span &block
+							icon :external_link
+						end
+					end
+				else
+					a href: url, target: "_blank" do
+						span do
+							text title
+							text " "
+							icon :external_link
+						end
+					end
 				end
 			end
+
+			
+
 		end
 
 		def accordion(&block)
@@ -138,7 +161,7 @@ module Weaver
 		end
 
 		def row(options={}, &block)
-			r = Row.new(@anchors, options)
+			r = Row.new(@page, @anchors, options)
 			r.instance_eval(&block)
 
 			@inner_content << <<-ENDROW
@@ -153,7 +176,7 @@ ENDROW
 			additional_style = ""
 
 			if options[:background]
-				additional_style += " background-image: url('/images/#{options[:background]}'); background-position: center center; background-size: cover;"
+				additional_style += " background-image: url('#{@page.root}images/#{options[:background]}'); background-position: center center; background-size: cover;"
 			end
 
 			if options[:height]
@@ -318,8 +341,8 @@ ENDROW
 	end
 
 	class Panel < Elements
-		def initialize(anchors)
-			super(anchors)
+		def initialize(page, anchors)
+			super
 			@title = nil
 			@footer = nil
 			@type = :ibox
@@ -327,6 +350,7 @@ ENDROW
 			@body = true
 			@extra = nil
 			@min_height = nil
+			@page = page
 		end
 
 		def generate
@@ -352,7 +376,7 @@ ENDROW
         	classNames = types[@type]
 			min_height = @min_height
 
-        	elem = Elements.new(@anchors)
+        	elem = Elements.new(@page, @anchors)
 
         	elem.instance_eval do
 				div class: classNames[:outer] do
@@ -397,7 +421,7 @@ ENDROW
 		def title(title=nil, &block)
 			@title = title
 			if block
-				elem = Elements.new(@anchors)
+				elem = Elements.new(@page, @anchors)
 				elem.instance_eval(&block)
 				@title = elem.generate
 			end
@@ -405,7 +429,7 @@ ENDROW
 
 		def extra(&block)
 			if block
-				elem = Elements.new(@anchors)
+				elem = Elements.new(@page, @anchors)
 				elem.instance_eval(&block)
 				@extra = elem.generate
 			end
@@ -414,14 +438,14 @@ ENDROW
 		def footer(footer=nil, &block)
 			@footer = footer
 			if block
-				elem = Elements.new(@anchors)
+				elem = Elements.new(@page, @anchors)
 				elem.instance_eval(&block)
 				@footer = elem.generate
 			end
 		end
 
 		def tabs(&block)
-			tabs = Tabs.new(@anchors)
+			tabs = Tabs.new(@page, @anchors)
 			tabs.instance_eval(&block)
 
 			@tabs = tabs
@@ -429,11 +453,12 @@ ENDROW
 	end
 
 	class Accordion
-		def initialize(anchors)
+		def initialize(page, anchors)
 			@anchors = anchors
 			@tabs = {}
 			@paneltype = :panel
 			@is_collapsed = false
+			@page = page
 
 			if !@anchors["accordia"]
 				@anchors["accordia"] = []
@@ -461,7 +486,7 @@ ENDROW
 
 			tabArray = @anchors["tabs"]
 
-			elem = Elements.new(@anchors)
+			elem = Elements.new(@page, @anchors)
 			elem.instance_eval(&block)
 
 			tabname = "tab#{tabArray.length}"
@@ -476,7 +501,7 @@ ENDROW
 		end
 
 		def generate
-			tabbar = Elements.new(@anchors)
+			tabbar = Elements.new(@page, @anchors)
 
 			tabs = @tabs
 			paneltype = @paneltype
@@ -528,9 +553,10 @@ ENDROW
 	end
 
 	class Tabs
-		def initialize(anchors)
+		def initialize(page, anchors)
 			@anchors = anchors
 			@tabs = {}
+			@page = page
 		end
 
 		def tab(title, &block)
@@ -541,7 +567,7 @@ ENDROW
 
 			tabArray = @anchors["tabs"]
 
-			elem = Elements.new(@anchors)
+			elem = Elements.new(@page, @anchors)
 			elem.instance_eval(&block)
 
 			tabname = "tab#{tabArray.length}"
@@ -556,7 +582,7 @@ ENDROW
 		end
 
 		def generate_body
-			tabbar = Elements.new(@anchors)
+			tabbar = Elements.new(@page, @anchors)
 			tabs = @tabs
 
 			tabbar.instance_eval do
@@ -578,7 +604,7 @@ ENDROW
 
 		def generate_tabs
 
-			tabbar = Elements.new(@anchors)
+			tabbar = Elements.new(@page, @anchors)
 			tabs = @tabs
 
 			tabbar.instance_eval do
@@ -610,11 +636,16 @@ ENDROW
 
 	class Page
 
-		def initialize(title)
+		def initialize(title, options)
 			@title = title
 			@content = ""
 			@body_class = nil
 			@anchors = {}
+			@options = options
+		end
+
+		def root
+			return @options[:root]
 		end
 
 		def generate(back_folders, options={})
@@ -682,11 +713,12 @@ ENDROW
 	class Row
 		attr_accessor :extra_classes
 
-		def initialize(anchors, options)
+		def initialize(page, anchors, options)
 			@columns = []
 			@free = 12
 			@extra_classes = options[:class] || ""
 			@anchors = anchors
+			@page = page
 		end
 
 		def twothirds(&block)
@@ -736,7 +768,7 @@ ENDROW
 
 		def col(occupies, options={}, &block)
 			raise "Not enough columns!" if @free < occupies
-			elem = Elements.new(@anchors)
+			elem = Elements.new(@page, @anchors)
 			elem.instance_eval(&block)
 
 			@columns << { occupy: occupies, elem: elem, options: options }
@@ -779,7 +811,7 @@ ENDROW
 	end
 
 	class NavPage < Page
-		def initialize(title)
+		def initialize(title, options)
 			super
 			@menu = Menu.new
 		end
@@ -792,7 +824,7 @@ ENDROW
 
 
 	class SideNavPage < NavPage
-		def initialize(title)
+		def initialize(title, options)
 			@rows = []
 			super
 		end
@@ -807,7 +839,7 @@ ENDROW
 		end
 
 		def row(options={}, &block)
-			r = Row.new(@anchors, options)
+			r = Row.new(self, @anchors, options)
 			r.instance_eval(&block)
 			@rows << r
 		end
@@ -823,8 +855,7 @@ ENDROW
 
 			menu = @menu
 
-
-			navigation = Elements.new(@anchors)
+			navigation = Elements.new(@page, @anchors)
 			navigation.instance_eval do
 
 				menu.items.each do |item|
@@ -848,9 +879,7 @@ ENDROW
             							if inneritem.has_key?(:menu)
             								raise "Second level menu not supported"
             							else
-                							a href:inneritem[:link] do
-                								text inneritem[:name]
-                							end
+                							link inneritem[:name], href:inneritem[:link]
             							end
             						end
             					end
@@ -914,7 +943,7 @@ ENDROW
 	end
 
 	class TopNavPage < NavPage
-		def initialize(title)
+		def initialize(title, options)
 			@rows = []
 			super
 		end
@@ -929,7 +958,7 @@ ENDROW
 		end
 
 		def row(options={}, &block)
-			r = Row.new(@anchors, options)
+			r = Row.new(self, @anchors, options)
 			r.instance_eval(&block)
 			@rows << r
 		end
@@ -948,7 +977,7 @@ ENDROW
 
 			menu = @menu
 
-			navigation = Elements.new(@anchors)
+			navigation = Elements.new(self, @anchors)
 			navigation.instance_eval do
 
 				menu.items.each do |item|
@@ -975,16 +1004,14 @@ ENDROW
                 							if inneritem.has_key?(:menu)
                 								raise "Second level menu not supported"
                 							else
-	                							a href:inneritem[:link] do
-	                								text inneritem[:name]
-	                							end
+	                							link inneritem[:name], href:inneritem[:link]
                 							end
                 						end
                 					end
                 				end
                     		end
 						elsif
-							a href: "#{item[:link]}" do
+							link "#{item[:link]}" do
 								span :class => "nav-label" do
 									icon item[:icon]
 									text item[:name]
@@ -1051,9 +1078,13 @@ ENDROW
 
 
 	class CenterPage < Page
-		def initialize(title, element)
-			@element = element
-			super(title)
+		def initialize(title, options)
+			@element = Elements.new(self, {})
+			super
+		end
+
+		def element=(value)
+			@element = value
 		end
 
 		def generate(level)
@@ -1071,28 +1102,36 @@ ENDROW
 
 	class Weave
 		attr_accessor :pages
-		def initialize(file)
+		def initialize(file, options={})
 			@pages = {}
 			@file = file
+			@options = options
+
+			@options[:root] = @options[:root] || "/"
+			@options[:root] = "#{@options[:root]}/" unless @options[:root].end_with? "/"
 			instance_eval(File.read(file), file)
 		end
 
 		def center_page(path, title, &block)
-			elem = Elements.new({})
+
+			p = CenterPage.new(title, @options)
+
+			elem = Elements.new(p, {})
 			elem.instance_eval(&block) if block
 
-			p = CenterPage.new(title, elem)
+			p.element=elem
+
 			@pages[path] = p
 		end
 
 		def sidenav_page(path, title, &block)
-			p = SideNavPage.new(title)
+			p = SideNavPage.new(title, @options)
 			p.instance_eval(&block) if block
 			@pages[path] = p
 		end
 
 		def topnav_page(path, title, &block)
-			p = TopNavPage.new(title)
+			p = TopNavPage.new(title, @options)
 			p.instance_eval(&block) if block
 			@pages[path] = p
 		end

data/weaver.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency "sinatra"
+  spec.add_dependency "trollop"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-11-04 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
@@ -62,9 +76,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -639,17 +653,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.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Website generator