edison 0.0.2 → 0.0.3

data/README.md

@@ -0,0 +1,59 @@
+# Edison
+
+Jekyll is nice, but doesn't give you much flexibility. Everything is a post! What if you want a static site with multiple types of objects?
+
+Enter Edison.
+
+```
+$ cat <<END > _config.rb
+Edison.config do
+    models.posts.each do |post|
+        Edison::Helpers.date_from_filename(post)
+        post.url = "posts/#{post._fname}"
+        routes.url File.join(post.url, "index.html"), "post", post
+    end
+
+    routes.url "index.html" do |data|
+        data.posts = models.posts
+    end
+end
+END
+
+$ mkdir -p _models/posts
+$ cat <<END > _models/posts/$(date +%Y-%m-%d)-my-first-post.md
+---
+title: My first post!
+---
+I'm blogging on [Edison](http://github.com/michaelmaltese/edison)!
+END
+
+$ mkdir _views
+$ cat <<END > _views/post.html
+<h1>{{ title }}</h1>
+<em>{{ date }}</em>
+{{{ body }}}
+END
+
+$ cat <<END > index.html
+<h1>An Edison Blog</h1>
+<ul>
+    {{# posts}}
+        <li><a href="{{ url }}">{{ title }}</a></li>
+    {{/ posts}}
+</ul>
+END
+
+$ edison serve
+Running in /Users/michaelmaltese/edison-example...
+Loading model posts/2013-03-17-my-first-post.md...
+Loading view _views/post.html...
+Copying static files...
+Creating /index.html...
+Creating /posts/2013-03-17-my-first-post/index.html...
+Done!
+[2013-03-17 17:36:47] INFO  WEBrick 1.3.1
+[2013-03-17 17:36:47] INFO  ruby 1.8.7 (2012-02-08) [universal-darwin11.0]
+[2013-03-17 17:36:48] INFO  WEBrick::HTTPServer#start: pid=28835 port=4000
+```
+
+Mustache, Markdown, and YAML keep you nice and clean.

data/bin/edison

@@ -1,206 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
+require 'commander/import'
+require 'edison'
 require 'listen'
-require 'kramdown'
-require 'hashie'
-require 'mustache'
 require 'pp'
 require 'webrick'
-require 'yaml'
-
-module Edison
-end
-
-module Edison::YAMLFrontMatter
-	def self.read(fname)
-		contents = File.read(fname).strip
-		if contents =~ /\A---/
-			_, yaml, body = contents.split("---", 3)
-			yaml = YAML.load(yaml)
-			body ||= ""
-			body.strip!
-			if yaml.include? "body"
-				raise Exception, "YAML Front Matter can't contain a 'body' key. Put it after the front matter."
-			end
-			{"body" => body}.merge(yaml)
-		else
-			{"body" => contents}
-		end
-	end
-end
-
-class Edison::ModelsLoader
-	def load(directory)
-		klasses = Dir[File.join(directory, "*")].map &File.method(:basename)
-		hash = Hashie::Mash.new
-		klasses.each do |klass|
-			objects = Dir[File.join(directory, klass, "*")]
-			objects.map! do |fname|
-				puts "Loading model #{File.join(klass, File.basename(fname))}..."
-
-				data = Hashie::Mash.new(case File.extname(fname)
-				when /(html)|(md)$/
-					Edison::YAMLFrontMatter.read(fname)
-				when /ya?ml$/
-					YAML.load_file(fname)
-				else
-					{}
-				end)
-
-				if data._ext
-					raise Exception, "Restricted key '_ext' appears in model!"
-				end
-				data._ext = File.extname(fname)
-
-				if data._ext == ".md"
-					data.body = Kramdown::Document.new(data.body).to_html
-				end
-
-				if data._fname
-					raise Exception, "Restricted key '_fname' appears in model!"
-				end
-				data._fname = File.basename(fname).sub(/#{File.extname(fname)}$/,'')
-
-				data
-			end
-			hash[klass] = objects
-		end
-		hash
-	end
-end
-
-class Edison::Renderer
-	attr_accessor :views
-	def initialize(views)
-		self.views = views
-	end
-	def render(view_name, data)
-		view = self.views[view_name]
-		if view.nil?
-			raise Exception, "Called for view #{view_name}, but _views/#{view_name} does not exist"
-		end
-		body = Mustache.render(view.body, data)
-		if view.layout
-			newdata = data.merge("yield" => body)
-			self.render(view.layout, newdata)
-		else
-			body
-		end
-	end
-end
-
-class Edison::Router
-	attr_reader :urls, :static
-	def initialize
-		@urls = []
-		@static = []
-	end
-	def url(url, view=nil, data={}, &b)
-		if b and view and data
-			raise Exception, "Please pass data or block, not both!"
-		end
-		if b
-			b.call(@urls.find { |(url, _, _)| url == url}[2])
-		else
-			@urls << [url, view, Hashie::Mash.new(data)]
-		end
-	end
-	def copy(url)
-		@static << url
-	end
-end
-
-module Edison
-	class <<self
-		attr_reader :models, :routes, :renderer
-	end
-	def self.initialize!(directory)
-		@directory = directory
-
-		@routes = Router.new
-
-		loader = ModelsLoader.new
-		@models = loader.load(File.join(directory, "_models"))
-
-		views = Hash[Dir[File.join(directory, "_views", "*")].map do |fname|
-			puts "Loading view _views/#{File.basename(fname)}..."
-			name = File.basename(fname).sub(/\.[^\.]+$/,'')
-			data = Hashie::Mash.new Edison::YAMLFrontMatter.read(fname)
-			[name, data]
-		end]
-
-		static = Dir[File.join(directory, "**/*")]
-		blacklist = ["Gemfile", "Gemfile.lock", "config.rb", "gen.rb", "serve.rb"]
-		static.reject! do |fname|
-			name = fname.sub(/^#{directory}\//,'')
-			dirname = File.dirname(fname)
-			blacklist.include?(name) or name =~ /^_/ or File.directory?(fname)
-		end
-		static.each do |fname|
-			name = fname.sub(/^#{directory}\//,'')
-			if %w{.html .md}.include?(File.extname(fname))
-				data = Hashie::Mash.new Edison::YAMLFrontMatter.read(fname)
-				url = name.sub(/\.md$/,'')
-				views[url] = data
-				@routes.url url, url, data
-			else
-				@routes.copy name
-			end
-		end
-
-		@renderer = Renderer.new(views)
-	end
-	def self.config(&b)
-		instance_eval &b
-	end
-	def self.generate!
-		site = File.join(@directory, "_site")
-
-		FileUtils.rm_rf(site)
-		Dir.mkdir(site)
-		puts "Copying static files..."
-		routes.static.each do |name|
-			src = File.join(@directory, name)
-			dest = File.join(site, name)
-			FileUtils.mkdir_p File.dirname(dest)
-			FileUtils.copy src, dest
-		end
-		routes.urls.each do |(url, view_name, data)|
-			puts "Creating /#{url}..."
-
-			fname = File.join(site, url)
-			FileUtils.mkdir_p(File.dirname(fname))
-			File.open(fname, "w") do |f|
-				f.write @renderer.render(view_name, data)
-			end
-		end
-	end
-end
-
-module Edison::Helpers
-	def self.date_from_filename(data)
-		if data.date
-			raise Exception, "Date will be inferred from filename, but found in data"
-		end
-
-		if File.basename(data._fname) =~ /^(\d{4}-\d{1,2}-\d{1,2})/
-			data.date = Date.parse($1)
-		else
-			raise Exception, "Expected filename to start with date (YYYY-M?M-D?D)"
-		end
-
-		data
-	end
-
-	def self.default_layout(data)
-		unless data.layout
-			data.layout = "default"
-		end
-
-		data
-	end
-end
 
 def build
 	directory = Dir.pwd
@@ -212,10 +16,10 @@ def build
 	puts "Done!"
 end
 
-require 'commander/import'
+puts "Edison #{Edison::VERSION} on Ruby #{RUBY_VERSION}"
 
 program :name, "Edison"
-program :version, "0.0.1"
+program :version, Edison::VERSION
 program :description, "Static website generator"
 
 default_command :help
@@ -251,12 +55,14 @@ command :serve do |c|
 				pp e
 			end
 		end
-		listener.start(false)
 
 		Signal.trap("INT") do
 			server.shutdown
 			listener.stop
+			exit
+			Kernel.abort
 		end
+		listener.start(false)
 		server.start
 	end
 end

data/lib/edison.rb

@@ -0,0 +1,222 @@
+require 'fileutils'
+require 'kramdown'
+require 'hashie'
+require 'mustache'
+require 'ostruct'
+require 'yaml'
+
+module Edison
+	VERSION = "0.0.3"
+end
+
+module Edison::YAMLFrontMatter
+	def self.read(fname)
+		contents = File.read(fname).strip
+		if contents =~ /\A---/
+			_, yaml, body = contents.split("---", 3)
+			yaml = YAML.load(yaml)
+			body ||= ""
+			body.strip!
+			if yaml.include? "body"
+				raise Exception, "YAML Front Matter can't contain a 'body' key. Put it after the front matter."
+			end
+			{"body" => body}.merge(yaml)
+		else
+			{"body" => contents}
+		end
+	end
+end
+
+class Edison::ModelsLoader
+	def load(directory)
+		klasses = Dir[File.join(directory, "*")].map &File.method(:basename)
+		hash = Hashie::Mash.new
+		klasses.each do |klass|
+			objects = Dir[File.join(directory, klass, "*")]
+			objects.map! do |fname|
+				puts "Loading model #{File.join(klass, File.basename(fname))}..."
+
+				data = Hashie::Mash.new(case File.extname(fname)
+				when /(html)|(md)$/
+					Edison::YAMLFrontMatter.read(fname)
+				when /ya?ml$/
+					YAML.load_file(fname)
+				else
+					{}
+				end)
+
+				if data._ext
+					raise Exception, "Restricted key '_ext' appears in model!"
+				end
+				data._ext = File.extname(fname)
+
+				if data._ext == ".md"
+					data.body = Kramdown::Document.new(data.body).to_html
+				end
+
+				if data._fname
+					raise Exception, "Restricted key '_fname' appears in model!"
+				end
+				data._fname = File.basename(fname).sub(/#{File.extname(fname)}$/,'')
+
+				data
+			end
+			hash[klass] = objects
+		end
+		hash
+	end
+end
+
+class Edison::Renderer
+	attr_accessor :views
+	def initialize(views)
+		self.views = views
+	end
+	def render(view_name, data)
+		view = self.views[view_name]
+		if view.nil?
+			raise Exception, "Called for view #{view_name}, but _views/#{view_name} does not exist"
+		end
+		body = Mustache.render(view.body, data)
+		if view.layout
+			newdata = data.merge("yield" => body)
+			self.render(view.layout, newdata)
+		else
+			body
+		end
+	end
+end
+
+class Edison::Router
+	attr_reader :urls, :static
+	def initialize
+		@urls = []
+		@static = []
+	end
+	def url(url, view=nil, data={}, &b)
+		if b and view and data
+			raise Exception, "Please pass data or block, not both!"
+		end
+		if b
+			data = @urls.find { |(u, _, _)| u == url}[2]
+			b.call(data)
+		else
+			@urls << [url, view, Hashie::Mash.new(data)]
+		end
+	end
+	def copy(url)
+		@static << url
+	end
+end
+
+class Edison::StaticFileHandler
+	def self.filter_blacklisted(directory, files)
+		blacklist = ["Gemfile", "Gemfile.lock", "config.rb", "Rakefile", "Procfile", "Makefile"]
+		files.reject do |fname|
+			name = fname.sub(/^#{directory}\//,'')
+			dirname = File.dirname(fname)
+			blacklist.include?(name) or name =~ /^_/ or File.directory?(fname)
+		end
+	end
+	def self.load(directory)
+		static = Dir[File.join(directory, "**/*")]
+		static = self.filter_blacklisted(directory, static)
+
+		possibly_dynamic = []
+		just_copy = []
+
+		static.each do |fname|
+			name = fname.sub(/^#{directory}\//,'')
+			if %w{.html .md}.include?(File.extname(fname))
+				data = Hashie::Mash.new Edison::YAMLFrontMatter.read(fname)
+				url = name.sub(/\.md$/,'')
+				possibly_dynamic << [url, data]
+			else
+				just_copy << name
+			end
+		end
+
+		OpenStruct.new(
+			:possibly_dynamic => possibly_dynamic,
+			:just_copy => just_copy
+		)
+	end
+end
+
+module Edison
+	class <<self
+		attr_reader :models, :routes, :renderer
+	end
+	def self.initialize!(directory)
+		@directory = directory
+
+		@routes = Router.new
+
+		loader = ModelsLoader.new
+		@models = loader.load(File.join(directory, "_models"))
+
+		@views = Hash[Dir[File.join(directory, "_views", "*")].map do |fname|
+			puts "Loading view _views/#{File.basename(fname)}..."
+			name = File.basename(fname).sub(/\.[^\.]+$/,'')
+			data = Hashie::Mash.new Edison::YAMLFrontMatter.read(fname)
+			[name, data]
+		end]
+
+		static = StaticFileHandler.load(directory)
+		static.possibly_dynamic.each do |(url, data)|
+			@routes.url url, url, data
+			@views[url] = data
+		end
+		static.just_copy.each &@routes.method(:copy)
+	end
+	def self.config(&b)
+		instance_eval &b
+	end
+	def self.generate!
+		renderer = Renderer.new(@views)
+		site = File.join(@directory, "_site")
+
+		FileUtils.rm_rf(site)
+		Dir.mkdir(site)
+		puts "Copying static files..."
+		routes.static.each do |name|
+			src = File.join(@directory, name)
+			dest = File.join(site, name)
+			FileUtils.mkdir_p File.dirname(dest)
+			FileUtils.copy src, dest
+		end
+		routes.urls.each do |(url, view_name, data)|
+			puts "Creating /#{url}..."
+
+			fname = File.join(site, url)
+			FileUtils.mkdir_p(File.dirname(fname))
+			File.open(fname, "w") do |f|
+				f.write renderer.render(view_name, data)
+			end
+		end
+	end
+end
+
+module Edison::Helpers
+	def self.date_from_filename(data)
+		if data.date
+			raise Exception, "Date will be inferred from filename, but found in data"
+		end
+
+		if File.basename(data._fname) =~ /^(\d{4}-\d{1,2}-\d{1,2})/
+			data.date = Date.parse($1)
+		else
+			raise Exception, "Expected filename to start with date (YYYY-M?M-D?D)"
+		end
+
+		data
+	end
+
+	def self.default_layout(data)
+		unless data.layout
+			data.layout = "default"
+		end
+
+		data
+	end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edison
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Maltese
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-17 00:00:00 Z
+date: 2013-03-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: commander
@@ -96,6 +96,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/edison.rb
 - bin/edison
 - README.md
 homepage: http://github.com/michaelmaltese/edison