razor 0.5.1 → 0.5.2

data/bin/razor

@@ -1,7 +1,5 @@
 #! /usr/bin/env ruby
 
-$:.unshift './lib'
-
 require 'razor/runner'
 
-Razor::Runner.new
+run(ARGV)

data/lib/razor.rb

@@ -8,10 +8,6 @@ module Razor
 	
 	Renderer.try_load
 	
-	class << self
-		attr :get
-	end
-
 	def self.create(name)
 		Dir.mkdir name
 	end
@@ -20,6 +16,7 @@ module Razor
 		if options[:url_base]
 			args << options[:url_base]
 		end
+		@src = args[0]
 		site = Site.new(*args)
 		FileUtils.rm_r(dest) rescue nil
 		site.generate
@@ -27,6 +24,7 @@ module Razor
 	
 	def self.server(port, src)
 		require 'rack'
+		@src = src
 		port = (port and port.to_i or 3300)
 		on_request = lambda do |env|
 			page = http_request src, env['PATH_INFO']
@@ -51,6 +49,10 @@ module Razor
 		}
 	end
 	
+	def self.load(path)
+		super File.join(@src, path)
+	end
+	
 	def self.http_request(src, url)
 		url = url[1..-1].sub(/\/+/, '/')
 		site = Site.new(src, '')

data/lib/razor/generable.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-require 'razor/template'
+require 'razor/view'
 
 module Razor
 
@@ -65,7 +65,7 @@ module Razor
 				if File.directory? File.join(src,filename)
 					Directory.new(self, filename)
 				elsif filename =~ /^[^~].*\.rb$/
-					TemplateFile.new(self, filename)
+					ViewFile.new(self, filename)
 				else
 					RegularFile.new(self, filename)
 				end
@@ -95,12 +95,15 @@ module Razor
 
 		attr_reader :src, :dest, :url
 		def initialize(src, dest, url_base='/')
-			Template.reset_instances!
+			View.reset_instances!
 			@src, @dest, @url = src, dest, url_base
-			layouts = File.join(src, '_layout/')
-			Template.path = layouts
-			Template.url_base = url
-			Dir.chdir(layouts) { load './layouts.rb' }
+			View.layouts_path = File.join(src, '_layouts/')
+			View.url_base = url
+			 Razor.load '_init.rb' rescue nil
+		rescue LoadError
+			$!.message =~ /^no such file to load -- (.+)$/
+			puts "Can't load #{$1} file"
+		ensure
 			super(nil, nil)
 		end
 		
@@ -119,20 +122,20 @@ module Razor
 		end
 	end
 	
-	class TemplateFile < GenerableFile
+	class ViewFile < GenerableFile
 		
 		def initialize(parent, src_name)
 			super(parent, src_name)
-			@template = Template.eval(self)
+			@view = View.eval(self)
 		end
 		
 		def dest_name
-			ext = @template.class.get_extension
+			ext = @view.class.get_extension
 			src_name.sub(/rb$/, ext)
 		end
 		
 		def contents
-			@template.render
+			@view.render
 		end
 			
 	end

data/lib/razor/rake/ftp_push.rb

@@ -23,7 +23,7 @@ module Razor
 					@hostname = hostname
 					@dir = ''
 					@port = nil
-					@url_base = ''
+					@url_base = '/'
 					yield self if block_given?
 					define_task
 				end
@@ -62,4 +62,4 @@ module Razor
 		
 	end
 	
-end
+end

data/lib/razor/rake/git_generate.rb

@@ -36,14 +36,13 @@ module Razor
 					@name = name
 					@template_branch = 'master'
 					@site_branch = 'site'
-					@url_base = ''
+					@url_base = '/'
 					yield self if block_given?
 					define_task
 				end
 				
 				def define_task
 					task(@name, [:message]) { |t, args|
-						hl = HighLine.new
 						ensure_on_branch template_branch
 						ensure_branch_is_clean # needed ?
 						# .gitinore workaround
@@ -97,7 +96,6 @@ module Razor
 
 				def ensure_branch_is_clean
 					clean = (`git status` =~ /nothing to commit \(working directory clean\)\n$/ )
-					p clean
 					clean and return
 					raise CleanBranchError
 				end
@@ -114,4 +112,4 @@ module Razor
 		
 	end
 	
-end
+end

data/lib/razor/runner.rb

@@ -1,83 +1,46 @@
-require 'optparse'
+require 'gli'
 
 require 'razor'
 
-module Razor
-
-	class Runner
-
-		def initialize
-			@options = {}
-	
-			@options_parser = OptionParser.new { |opt|
-	
-				opt.banner = "Usage: razor COMMAND"
-	
-				opt.separator ""
-				opt.separator "Commands :"
-				opt.separator "  generate [OPTIONS] [SOURCE DESTINATION]  : Generates the web directory from source."
-				opt.separator "  server [OPTIONS] [SOURCE] : Runs a webrick server which renders page on the fly."
-				opt.separator ""
-				opt.separator "Options : "
-	
-				opt.on("-u URL-BASE", "--url-base URL-BASE", "Set the local server port") do |url_base|
-					@options[:url_base] = url_base
-				end
-	
-				opt.on("-p PORT", "--port PORT", "Set the local server port") do |port|
-					@options[:port] = port
-				end
-	
-				opt.on_tail("-v", "--version", "Show Version") do
-					@options[:version] = true
-				end
-	
-				opt.on_tail("-h", "--help", "Show this message") do
-					@options[:help] = true
-				end
-	
-				opt.separator ""
-	
-			}
-			@options_parser.parse!
-
-			unless ARGV.empty?
-				args = ARGV.clone
-				ARGV.replace []
-				if respond_to? args[0]
-					send *args
-				else
-					puts "Unknown Command #{args[0]}"
-					puts @options_parser
-				end
-			else
-	  			if @options[:version]
-		  			puts Razor::Version
-		  		else
-	  				puts @options_parser
-		  		end
-			end
-		end
-	
-		def _check_arguments(bool)
-			return if bool
-			puts 'Arguments Error'
-			puts @options_parser
-			exit
-		end
-
-		def generate(*args)
-			_check_arguments args.size < 3
-			args = ['.', '_site'] if args.empty?
-			args << File.join(args[0], '_site') if args.size==1
-			Razor.generate(@options, *args)
-		end
-	
-		def server(url=nil)
-			url = '.' if url.nil?
-			Razor.server(@options[:port], url)
-		end
-	
-	end
-
+include GLI
+		
+version Razor::Version
+	
+desc 'Explains what is being done.'
+switch [:v, :verbose]
+		
+desc 'Generates website from source to destination. If destination is not given, site is generated in [source]/_site, current directory is the default source.'
+arg_name '[source [destination]]'
+command [:generate] do |c|
+		
+	c.desc 'Sets website url-base.'
+	c.arg_name 'URL'
+	c.flag [:u, 'url-base']
+					
+	c.action { |gopts, opts, args|
+		args = ['.', '_site'] if args.empty?
+		args << File.join(args[0], '_site') if args.size==1
+		Razor.generate(opts, *args)
+	}
+	
+end
+			
+desc 'Runs a WEBrick server which renders site on the fly.'
+arg_name '[source]'
+command [:server] do |c|
+		
+	c.desc 'Sets server port.'
+	c.arg_name 'PORT'
+	c.flag [:p, 'port']
+			
+	c.action { |gopts, opts, args|
+		src = args[0] || '.'
+		Razor.server(opts[:port], src)
+	}
+				
+end
+		
+desc 'Print razor version'
+command [:v, :version] do |c|
+	c.action { |gopts, opts, args| puts Razor::Version }
 end

data/lib/razor/{template.rb → view.rb}

@@ -3,7 +3,7 @@ require 'razor/renderer'
 
 module Razor
 
-	class Template
+	class View
 		
 		class << self
 			
@@ -27,10 +27,10 @@ module Razor
 				@subclasses.each(&:reset_instances!)
 			end
 			
-			def eval(templatefile)
+			def eval(viewfile)
 				@@last_evaluated = nil
-				@@last_templatefile = templatefile
-				Kernel.eval(File.read(templatefile.src), TOPLEVEL_BINDING)
+				@@last_viewfile = viewfile
+				Kernel.eval(File.read(viewfile.src), TOPLEVEL_BINDING)
 				return @@last_evaluated
 			end
 			
@@ -38,8 +38,8 @@ module Razor
 				@extension = ext
 			end
 			
-			def path=(path)
-				@@path = path
+			def layouts_path=(path)
+				@@layouts_path = path
 			end
 			
 			def url_base
@@ -97,7 +97,7 @@ module Razor
 			end
 			
 			def render(context)
-				renderer = Renderer.get(@@path, @playout)
+				renderer = Renderer.get(@@layouts_path, @playout)
 				if superclass.respond_to? :render
 					if renderer.valid?
 						context.push('yield' => renderer.layout_render(context))
@@ -123,7 +123,7 @@ module Razor
 		attr_accessor :contents
 		
 		def initialize(*args, &block)
-			@templatefile = @@last_templatefile
+			@viewfile = @@last_viewfile
 			@contents = lambda { '' }
 			self.class.fields.each { |iv|
 				instance_variable_set(*iv)
@@ -134,7 +134,7 @@ module Razor
 		end
 		
 		def url
-			@templatefile.url
+			@viewfile.url
 		end
 		
 		def url_base
@@ -147,7 +147,7 @@ module Razor
 		end
 		
 		def yield
-			Renderer.get(@templatefile.parent.src, @contents).render(self)
+			Renderer.get(@viewfile.parent.src, @contents).render(self)
 		end
 		
 		def render
@@ -159,33 +159,33 @@ module Razor
 			def self.field(name)
 				class_eval(<<-END)
 					def #{name}(val)
-						@tpl.#{name} = val
+						@view.#{name} = val
 					end
 				END
 			end
 			
-			def initialize(tpl, &block)
-				@tpl = tpl
+			def initialize(view, &block)
+				@view = view
 				instance_exec &block
 			end
 			
 			def field(name, value)
-				@tpl.field(name, value)
+				@view.field(name, value)
 			end
 			
 			def contents(str=nil, &block)
-				@tpl.contents = str ? lambda { str } : block
+				@view.contents = str ? lambda { str } : block
 			end
 			
-			def template_eval(&block)
-				@tpl.instance_eval(&block)
+			def view_eval(&block)
+				@view.instance_eval(&block)
 			end
 	
 		}
 		
 	end
 	
-	class Page < Template
+	class Page < View
 		
 		extension 'html'
 		
@@ -193,7 +193,7 @@ module Razor
 		
 	end
 	
-	class StyleSheet < Template
+	class StyleSheet < View
 		
 		extension 'css'
 		
@@ -201,7 +201,7 @@ module Razor
 		
 	end
 	
-	class Script < Template
+	class Script < View
 		
 		extension 'js'
 		

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Razor
-	Version = '0.5.1'
+	Version = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-11 00:00:00.000000000 +01:00
+date: 2011-03-14 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &21799560 !ruby/object:Gem::Requirement
+  requirement: &7949420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21799560
+  version_requirements: *7949420
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &21799040 !ruby/object:Gem::Requirement
+  requirement: &7948800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21799040
+  version_requirements: *7948800
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &21798560 !ruby/object:Gem::Requirement
+  requirement: &7948220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21798560
+  version_requirements: *7948220
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: &7947640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *7947640
 description: ! '''Razor is a static website generator. Describe layouts and pages
   in ruby. Write them with html and Mustache.
 
@@ -64,14 +75,14 @@ files:
 - lib/razor/generable.rb
 - lib/razor/runner.rb
 - lib/razor/renderer.rb
-- lib/razor/template.rb
+- lib/razor/view.rb
 - lib/razor/rake/ftp.rb
 - lib/razor/rake/ftp_push.rb
 - lib/razor/rake/git_generate.rb
 - lib/version.rb
 - bin/razor
 has_rdoc: true
-homepage: https://aumgn.fr/razor
+homepage: http://aumgn.fr/razor
 licenses:
 - MIT License. See LICENSE file.
 post_install_message: