edison 0.0.1 → 0.0.2

data/bin/edison

@@ -71,19 +71,19 @@ class Edison::ModelsLoader
 end
 
 class Edison::Renderer
-	attr_accessor :templates
-	def initialize(templates)
-		self.templates = templates
+	attr_accessor :views
+	def initialize(views)
+		self.views = views
 	end
-	def render(template_name, data)
-		template = self.templates[template_name]
-		if template.nil?
-			raise Exception, "Called for template #{template_name}, but _templates/#{template_name} does not exist"
+	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(template.body, data)
-		if template.layout
+		body = Mustache.render(view.body, data)
+		if view.layout
 			newdata = data.merge("yield" => body)
-			self.render(template.layout, newdata)
+			self.render(view.layout, newdata)
 		else
 			body
 		end
@@ -96,14 +96,14 @@ class Edison::Router
 		@urls = []
 		@static = []
 	end
-	def url(url, template=nil, data={}, &b)
-		if b and template and data
+	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, template, Hashie::Mash.new(data)]
+			@urls << [url, view, Hashie::Mash.new(data)]
 		end
 	end
 	def copy(url)
@@ -123,8 +123,8 @@ module Edison
 		loader = ModelsLoader.new
 		@models = loader.load(File.join(directory, "_models"))
 
-		templates = Hash[Dir[File.join(directory, "_templates", "*")].map do |fname|
-			puts "Loading template _templates/#{File.basename(fname)}..."
+		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]
@@ -142,14 +142,14 @@ module Edison
 			if %w{.html .md}.include?(File.extname(fname))
 				data = Hashie::Mash.new Edison::YAMLFrontMatter.read(fname)
 				url = name.sub(/\.md$/,'')
-				templates[url] = data
+				views[url] = data
 				@routes.url url, url, data
 			else
 				@routes.copy name
 			end
 		end
 
-		@renderer = Renderer.new(templates)
+		@renderer = Renderer.new(views)
 	end
 	def self.config(&b)
 		instance_eval &b
@@ -166,13 +166,13 @@ module Edison
 			FileUtils.mkdir_p File.dirname(dest)
 			FileUtils.copy src, dest
 		end
-		routes.urls.each do |(url, template_name, data)|
+		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(template_name, data)
+				f.write @renderer.render(view_name, data)
 			end
 		end
 	end
@@ -206,7 +206,7 @@ def build
 	directory = Dir.pwd
 	puts "Running in #{directory}..."
 	Edison.initialize!(directory)
-	load File.join(directory, "config.rb")
+	load File.join(directory, "_config.rb")
 	site = File.join(directory, "_site")
 	Edison.generate!
 	puts "Done!"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edison
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Maltese
@@ -98,7 +98,7 @@ extra_rdoc_files: []
 files: 
 - bin/edison
 - README.md
-homepage: http://github.com/michaelmaltese/jefe
+homepage: http://github.com/michaelmaltese/edison
 licenses: []
 
 post_install_message: