razor 0.4.0 → 0.4.1

data/lib/razor.rb

@@ -15,8 +15,11 @@ module Razor
 		Dir.mkdir name
 	end
 	
-	def self.generate(src, dest)
-		site = Site.new(src, dest)
+	def self.generate(options, *args)
+		if options[:url_base]
+			args << options[:url_base]
+		end
+		site = Site.new(*args)
 		FileUtils.rm_r(dest) rescue nil
 		site.generate
 	end

data/lib/razor/generable.rb

@@ -93,19 +93,17 @@ module Razor
 
 	class Site < Directory
 
-		attr_reader :src, :dest
-		def initialize(src, dest)
+		attr_reader :src, :dest, :url
+		def initialize(src, dest, url_base='/')
 			Template.reset_instances!
-			@src, @dest = src, dest
+			@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' }
 			super(nil, nil)
 		end
 		
-		def url
-			'/'
-		end
 	end
 
 	class RegularFile < GenerableFile

data/lib/razor/runner.rb

@@ -23,6 +23,10 @@ module Razor
 				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
@@ -69,7 +73,7 @@ module Razor
 			_check_arguments args.size < 3
 			args = ['.', '_site'] if args.empty?
 			args << File.join(args[0], '_site') if args.size==1
-			Razor.generate *args
+			Razor.generate(@options, *args)
 		end
 	
 		def server(url=nil)

data/lib/razor/template.rb

@@ -41,6 +41,14 @@ module Razor
 			def path=(path)
 				@@path = path
 			end
+			
+			def url_base
+				@@url_base
+			end
+		
+			def url_base=(url_base)
+				@@url_base = url_base
+			end
 		
 			def get_extension
 				if superclass.respond_to? :get_extension
@@ -129,6 +137,10 @@ module Razor
 			@templatefile.url
 		end
 		
+		def url_base
+			self.class.url_base
+		end
+		
 		def field(name, value)
 			(class<<self; self; end).class_eval { attr name }
 			instance_variable_set("@#{name}", value)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Razor
-	Version = '0.4.0'
+	Version = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &18858180 !ruby/object:Gem::Requirement
+  requirement: &8380120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *18858180
+  version_requirements: *8380120
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &18857660 !ruby/object:Gem::Requirement
+  requirement: &8379600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18857660
+  version_requirements: *8379600
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &18857180 !ruby/object:Gem::Requirement
+  requirement: &8379120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18857180
+  version_requirements: *8379120
 description: ! '''Razor is a static website generator. Describe layouts and pages
   in ruby. Write them with html and Mustache.