razor 0.4.2 → 0.5

data/lib/razor.rb

@@ -1,12 +1,13 @@
 require 'version'
-require 'rubygems'
 require 'fileutils'
 
 require 'razor/generable'
-require 'highline'
+
 
 module Razor
 	
+	Renderer.try_load
+	
 	class << self
 		attr :get
 	end
@@ -26,10 +27,9 @@ module Razor
 	
 	def self.server(port, src)
 		require 'rack'
-		port = (port and port.to_i or 9000)
+		port = (port and port.to_i or 3300)
 		on_request = lambda do |env|
 			page = Razor.http_request src, env['PATH_INFO']
-			p page.dest_name rescue nil
 			if page
 				[
 					200,

data/lib/razor/rake/ftp.rb

@@ -0,0 +1,60 @@
+require 'net/ftp'
+
+class Net::FTP
+	
+	def directory?(name)
+		regexp = /#{name}$/
+		line = ls.find { |line| line =~ regexp }
+		line or false and line[0] == ?d
+	end
+	
+	def entries
+		nlst.reject { |e| e =~ /^(\.|\.\.)$/ }
+	end
+	
+	alias _chdir chdir
+	def chdir(dir)
+		wd = (dir =~ /^\.?$/)
+		if block_given?
+			current = pwd
+			wd or _chdir dir
+			begin
+				yield
+			ensure
+				wd or _chdir current
+			end
+		else
+			wd or _chdir dir
+		end
+	end
+	
+	def put_contents(dir)
+		Dir[dir+'/*'].each &method(:put_r)
+	end
+	
+	def put_r(file)
+		filename = File.basename file
+		if File.directory? file
+			mkdir filename
+			chdir(filename) { put_contents file }
+		else
+			put file, filename
+		end
+	end
+	
+	def rm_contents(dir)
+		chdir(dir) {
+			entries.each &method(:rm_r)
+		}
+	end
+	
+	def rm_r(file)
+		if directory? file
+			rm_contents file
+			rmdir file
+		else
+			delete file
+		end
+	end
+	
+end

data/lib/razor/rake/ftp_push.rb

@@ -0,0 +1,65 @@
+require 'rake'
+require 'rake/tasklib'
+require 'highline'
+require 'tmpdir'
+
+require 'razor'
+require 'razor/rake/ftp'
+
+module Razor
+	
+	module Rake
+		
+		module FTP
+			
+			class Push < ::Rake::TaskLib
+				
+				attr_accessor :port
+				attr_accessor :dir
+				attr_accessor :url_base
+				
+				def initialize(hostname, name='ftp:push')
+					@name = name
+					@hostname = hostname
+					@dir = ''
+					@port = nil
+					@url_base = ''
+					yield self if block_given?
+					define_task
+				end
+				
+				def define_task
+					task(@name) {
+						hl = HighLine.new
+						host = [@hostname]
+						host << @port if @port
+						ftp = Net::FTP.new(*host)
+						begin
+							username = hl.ask("FTP Username : ")
+							psswd = hl.ask("Password : ", String) { |q| q.echo = false }
+							ftp.login(username, psswd)
+							ftp.chdir @dir
+							ftp.rm_contents '.'
+							Dir.mktmpdir { |tmp|
+								Razor.generate(generate_options, '.', tmp)
+								ftp.put_contents tmp
+							}
+						ensure
+							ftp.close
+						end
+					}
+				end
+				
+				def generate_options
+					{
+						:url_base => @url_base
+					}
+				end
+				
+			end
+			
+		end
+		
+	end
+	
+end

data/lib/razor/renderer.rb

@@ -1,10 +1,7 @@
-require 'bluecloth'
-require 'sass'
-
 module Razor
 	
 	class Renderer
-
+		
 		class Getter
 			
 			class << self
@@ -46,7 +43,13 @@ module Razor
 			
 			def from_file(filename)
 				filepath = File.join(@path, filename)
-				str = (File.read(filepath, :mode=>'rb') rescue nil)
+				#str = (File.read(filepath, :mode=>'rb') rescue nil)
+				begin
+					str = File.open(filepath, 'rb') { |f| f.read }
+				rescue
+					puts $!
+					str = nil
+				end
 				ext = File.extname filename
 				renderer = self.class.extensions[ext]
 				renderer ||= Renderer
@@ -61,6 +64,19 @@ module Razor
 				Getter.new(path, proc).renderer
 			end
 			
+			def try_load
+				constants.each { |constname|
+					const = const_get constname
+					const.is_a? Class or next
+					const.ancestors.include? Renderer or next
+					const.respond_to? :load or next
+					begin
+						const.load
+					rescue LoadError
+					end
+				}
+			end
+			
 			def name_ext(n)
 				name(n)
 				extension(n)
@@ -82,7 +98,7 @@ module Razor
 		end
 		
 		def layout_render(context)
-			@string.nil? and return context['yield']
+			valid? or return context['yield']
 			render(context)
 		end
 		
@@ -91,28 +107,61 @@ module Razor
 		end
 		
 		def render(context)
-			@string.nil? and return ''
+			valid? or return ''
 			Mustache.render(@string, context)
 		end
 		
-	end
-	
-	class BlueRenderer < Renderer
-				
-		name_ext 'markdown'
-		
-		def render(context)
-			BlueCloth.new(super(context)).to_html
+		class BlueRenderer < Renderer
+					
+			def self.load
+				require 'bluecloth'
+				name_ext 'markdown'
+				name_ext 'md'
+			end
+			
+			def render(context)
+				BlueCloth.new(super(context)).to_html
+			end
+			
 		end
 		
-	end
-	
-	class ScssRenderer < Renderer
+		class RedRenderer < Renderer
+					
+			def self.load
+				require 'RedCloth'
+				name_ext 'textile'
+			end
+			
+			def render(context)
+				RedCloth.new(super(context)).to_html
+			end
+			
+		end
 		
-		name_ext 'scss'
+		class SassRenderer < Renderer
+			
+			def self.load
+				require 'sass'
+				name_ext 'sass'
+			end
+			
+			def render(context)
+				Sass::Engine.new(super(context), :syntax=>:sass ).render
+			end
+			
+		end
 		
-		def render(context)
-			Sass::Engine.new(super(context), :syntax=>:scss ).render
+		class ScssRenderer < Renderer
+			
+			def self.load
+				require 'sass'
+				name_ext 'scss'
+			end
+			
+			def render(context)
+				Sass::Engine.new(super(context), :syntax=>:scss ).render
+			end
+			
 		end
 		
 	end

data/lib/razor/runner.rb

@@ -1,12 +1,9 @@
 require 'optparse'
-require 'highline'
 
 require 'razor'
 
 module Razor
 
-	HL = HighLine.new
-
 	class Runner
 
 		def initialize
@@ -50,22 +47,22 @@ module Razor
 				if respond_to? args[0]
 					send *args
 				else
-					HL.say "Unknown Command #{args[0]}"
-					HL.say @options_parser.to_s
+					puts "Unknown Command #{args[0]}"
+					puts @options_parser
 				end
 			else
 	  			if @options[:version]
-		  			HL.say Razor::Version
+		  			puts Razor::Version
 		  		else
-	  				HL.say @options_parser.to_s
+	  				puts @options_parser
 		  		end
 			end
 		end
 	
 		def _check_arguments(bool)
 			return if bool
-			HL.say 'Arguments Error'
-			HL.say @options_parser.to_s
+			puts 'Arguments Error'
+			puts @options_parser
 			exit
 		end
 

data/lib/razor/template.rb

@@ -201,4 +201,12 @@ module Razor
 		
 	end
 	
+	class Script < Template
+		
+		extension 'js'
+		
+		layout { from_file 'script.js' }
+		
+	end
+	
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Razor
-	Version = '0.4.2'
+	Version = '0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-09 00:00:00.000000000 +01:00
+date: 2011-03-10 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &20183860 !ruby/object:Gem::Requirement
+  requirement: &24114740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20183860
+  version_requirements: *24114740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20183340 !ruby/object:Gem::Requirement
+  requirement: &24114220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20183340
+  version_requirements: *24114220
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &24113740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24113740
 description: ! '''Razor is a static website generator. Describe layouts and pages
   in ruby. Write them with html and Mustache.
 
@@ -54,6 +65,8 @@ files:
 - lib/razor/runner.rb
 - lib/razor/renderer.rb
 - lib/razor/template.rb
+- lib/razor/rake/ftp.rb
+- lib/razor/rake/ftp_push.rb
 - lib/version.rb
 - bin/razor
 has_rdoc: true