widow 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ef838be5110f77688f4f4cb226ac2635d7daba
-  data.tar.gz: 64948953b16fe1a60bcf135089a480e4becbe836
+  metadata.gz: 20d7246686fc97b87af58bfc06e60321bd923037
+  data.tar.gz: 62ff7b3c5921f3696faeb9e35a34a6c5fa2ef171
 SHA512:
-  metadata.gz: f7e929dcb1861b2c5389f5aea8e11a7d9d99ee9a8fce67d98826d6264b8d4a438411005e346318c80e1f6b3c54ee289de0bd282b7457596dbe5cdcfa1e222836
-  data.tar.gz: bea70a334096a54e2334aeea16c98731aa18a7b2d341425672cf91e8be22c215ac856f7609bf38663ab145003f2292ad2716bd839b585a726b1466542064444b
+  metadata.gz: a99ca1e7844279c441093f964b4c7f4b11a86359fe5d58828b7fcd3d5e62f68a449dd2f0d255d0ea9c3a6477cd68fcc8fb35283689436e6dc6127fb9627be136
+  data.tar.gz: 19fd974e4a248a8746d6354ae0f50043afb9710dd73e07d3013b1e9c325dd0e5b642c45c508dbe1d9c4830d8170e62d5b286b9352e2712208f33c49d6369651a

data/bin/widow

@@ -3,21 +3,27 @@ require 'thor'
 require 'widow'
 
 class Spiderling < Thor
+	class_option :debug, type: :boolean, desc: "enables debug logging"
+
 	desc "cut", "Compile files from current directory into current directory. Copies files that cannot be processed by tilt"
 	method_option :from, type: :string, desc: "Defaults to current directory"
 	method_option :to, type: :string, desc: "Defaults to current directory"
-	def cut 
-		Widow.new.cut options
+	def cut
+		Widow.perform :cut, symbolise(options)
 	end
 
-	
-	
 	desc "spin", "Start a webserver on localhost and serve files from the destination forlder, compiling them as necessary"
 	method_option :from, type: :string, desc: "Defaults to current directory"
 	method_option :to, type: :string, desc: "Defaults to current directory"
 	method_option :port, type: :numeric, desc: "Defaults to 8888"
+	method_option :serve_source, type: :boolean, desc: "Serves source files if they are asked for directly, even if they are ignored, off by default"
 	def spin
-		Widow.new.spin options
+		Widow.perform :spin, symbolise(options)
+	end
+
+	private
+	def symbolise options
+		return options.map { |k, v| [k.to_sym, v] }.to_h
 	end
 end
 

data/lib/widow.rb

@@ -1,160 +1,211 @@
-require 'optparse'
-require 'tilt'
-require 'find'
-require 'pathname'
-require 'fileutils'
-require 'rack'
-
-class Widow
-	class CompileError < Exception
-		def initialize filename, exception
-			super "#{filename} failed to compile:\n#{exception.message}\n\t#{exception.backtrace.join "\n\t"}"
-		end
+require 'optparse'
+require 'tilt'
+require 'find'
+require 'pathname'
+require 'fileutils'
+require 'rack'
+require 'logger'
+
+class Widow
+	@@mime_map = [
+		['js', 'application/javascript'],
+		['css', 'text/css'],
+		['html', 'text/html']
+	]
+
+	class CompileError < Exception
+		def initialize tilt, exception
+			super "#{tilt.file} with template #{tilt} failed to compile:\n#{exception.message}\n\t#{exception.backtrace.join "\n\t"}"
+		end
 	end
-	
+
+	def self.perform method, options
+		widow = Widow.new(options)
+		widow.public_send(method, options)
+		widow.kill
+	end
+
+	def initialize options = {}
+		log_level = options.delete(:debug) ? :debug : :info
+		@logger = Logger.new(STDOUT, level: log_level)
+		@logger.info "log level #{log_level}"
+	end
+
 	def cut options = {}
-		options = {from: Pathname.pwd, to: Pathname.pwd}.merge options
-		from = Pathname.new(options[:from])
-		to = Pathname.new(options[:to])
-		exclude = Exclude.new from
-
-		Find.find from do |path|
-			path = Pathname.new path
-			next if path == from
-			if exclude.ingnored? path
-				log info: "#{path} ignored"
-				next
-			end
-			begin
-				make from, path.relative_path_from(from), to
-			rescue CompileError
-			end
-		end
-		return
-	end
-
-	def spin options = {}
-		options = {from: Pathname.pwd, to: Pathname.pwd, port: 8888}.merge options
-		from = Pathname.new(options[:from])
-		to = Pathname.new(options[:to])
-		exclude = Exclude.new from
-
-		allowed_templates = Tilt.lazy_map.map do |ext, _|
-			begin
-				Tilt[ext]
-				next ext
-			rescue LoadError
-				next
-			end
-		end.compact
-
-		Rack::Handler.default.run(
-			Proc.new do |env|
-				name = Pathname.new env["PATH_INFO"][1..-1]
-				log info: "#{name} requested"
-				file = bin + name
-				original = src + name
-				unless original.exist?
-					matching_templates = allowed_templates.select do |ext|
-						next Tilt[ext].metadata[:mime_type] == case name.extname[1..-1]
-						when 'js' then 'application/javascript'
-						when 'css' then 'text/css'
-						when 'html' then 'text/html'
-						end
-					end
-					original = Pathname.glob(src + "#{name.basename name.extname}.{#{matching_templates.join ?,}}").first
-				end
-				next [404, {'Content-Type' => 'text/html'}, ["File not found!"]] if exclude.ingnored?(original) || original.nil? || !original.exist?
-
-				begin
-					make src, original.relative_path_from(src), bin if !file.exist? || file.mtime < original.mtime
-					next [200, {'Content-Type' => 'text/html'}, [file.file? ? file.read : '']]
-				rescue CompileError => e
-					next [502, {'Content-Type' => 'text/html'}, [e.message]]
-				end
-			end,
-			Port: options[:port]
-		)
-		return
-	end
-
-	private
-	class Exclude
-		def initialize root_dir
-			@patterns = Pathname.glob("#{root_dir}/**/.widowignore").map do |file|
-				next [file, File.readlines(file)]
-			end.to_h.map do |file, lines|
-				lines.map do |line|
-					/^#{file.dirname}\/#{line}/ unless line =~ /^\s*$/
-				end.compact
-			end.flatten(1) << /.*\/\.widowignore$/
-		end
-
-		def ingnored? file
-			return @patterns.any? do |pattern|
-				file.to_s =~ pattern
-			end
-		end
-	end
-	
-	# proxies or renders a file based on it's properties and tilt capacity
-	# throws a CompileError when the file fails to compile
-	def make root, file, to
-		unless Tilt.registered? file.extname[1..-1].to_s
-			proxy root, file, to
-			return
-		end
-
-		begin
-			render root, file, to
-		rescue LoadError
-			log warning: "#{file} has a Tilt template that cannot be loaded" 
-			proxy root, file, to
-		rescue CompileError => e
-			log error: e
-			raise e
-		end
-	end
-
-	# creates a carbon copy of a file elsewhere
-	def proxy root, file, to
-		to.mkpath unless to.exist?
-		obj = to + file
-		src = root + file
-		return if src == obj
-		if src.directory?
-			obj.mkpath unless obj.exist?
-		elsif src.file?
-			FileUtils.cp src, obj
-		end
-		log info: "\t#{src} => #{src}"
-	end
-
-	# Takes a file and tries to render it through tilt to the destination directory
-	# Throws load error when tilt template is not resolvable
-	# Throws a BuildError when on an internal error
-	def render root, file, to
-		tilt = Tilt.new root + file
-		type = case tilt.metadata[:mime_type]
-		when 'application/javascript' then 'js'
-		when 'text/css' then 'css'
-		else 'html'
-		end
-
-		begin
-			dest = to + "#{file.basename file.extname}.#{type}"
-			File.write dest, tilt.render
-			log info: "\t#{tilt.file} => #{dest}"
-		rescue LoadError => e
-			raise e
-		rescue Exception => e
-			raise CompileError.new root + file, e
-		end
-	end
-	
-	def log line
-		line.each do |level , string|
-			puts "#{level}: #{string}"
-		end
-	end
-end
+		options = {from: Pathname.pwd, to: Pathname.pwd}.merge options
+		from = Pathname.new(options[:from])
+		to = Pathname.new(options[:to])
+		@logger.info "cut from #{from} to #{to}"
+		exclude = Exclude.new from, @logger
+
+		Find.find from do |path|
+			path = Pathname.new path
+			next if path == from
+			if exclude.ignored? path
+				@logger.info "#{path} ignored"
+				next
+			end
+			begin
+				make from, path.relative_path_from(from), to
+			rescue CompileError
+			end
+		end
+		return
+	end
+
+	def spin options = {}
+		options = {from: Pathname.pwd, to: Pathname.pwd, port: 8888, serve_source: false}.merge options
+		from = Pathname.new(options[:from])
+		to = Pathname.new(options[:to])
+		@logger.info "spin from #{from} to #{to}"
+		@logger.info "port #{options[:port]}"
+		@logger.info "serve_source = #{options[:serve_source]}"
+		exclude = Exclude.new from, @logger
+
+		mime_to_ext = Hash.new { |hash, key| hash[key] = [] }
+		Tilt.lazy_map.map do |ext, _|
+			begin
+				tilt = Tilt[ext]
+				@logger.info "loaded template #{tilt} for extention #{ext}"
+				next [tilt.metadata[:mime_type] || tilt.default_mime_type, ext]
+			rescue LoadError
+				next
+			end
+		end.compact.each do | mime_type, ext |
+			mime_to_ext[mime_type] << ext
+		end
+
+		Rack::Handler.default.run(
+			Proc.new do |env|
+				@logger.debug "#{env["PATH_INFO"]} requested"
+
+				file = Pathname.new env["PATH_INFO"][1..-1]
+				file += 'index.html' if (from + file).directory?
+				search = from + file.dirname + "#{file.basename file.extname}.{#{(mime_to_ext[mime_type file] + [file.extname[1..-1]]).join ?,}}"
+				@logger.debug "searching for \'#{search}\'"
+				original = Pathname.glob(search).first
+				file = to + file
+
+				if (exclude.ignored?(original) && !(options[:serve_source] && original.basename == file.basename))
+					@logger.info "#{file} ignored"
+					next file_not_found
+				elsif (original.nil? || !original.exist?)
+					@logger.debug "source not found"
+					next file_not_found
+				end
+				@logger.debug "#{original} found"
+
+				begin
+					if !file.exist? || file.mtime < original.mtime
+						if original.basename == file.basename
+							proxy from, original.relative_path_from(from), to
+						else
+							make from, original.relative_path_from(from), to
+						end
+					end
+					next [200, {'Content-Type' => mime_type(file)}, [file.file? ? file.read : '']]
+				rescue CompileError => e
+					next [502, {'Content-Type' => 'text/html'}, [e.message]]
+				end
+			end,
+			Port: options[:port]
+		)
+		return
+	end
+
+	# Called to clean up
+	def kill
+		@logger.close
+		return
+	end
+
+	private
+	class Exclude
+		def initialize root_dir, logger
+			@patterns = Pathname.glob("#{root_dir}/**/.widowignore").map do |file|
+				next [file, File.readlines(file)]
+			end.to_h.map do |file, lines|
+				lines.map do |line|
+					/^#{file.dirname}\/#{line.sub /\s*$/, ''}/ unless line =~ /^\s*$/
+				end.compact
+			end.flatten(1) << /.*\/\.widowignore$/
+			logger.info "ignoring:\n#{to_s}"
+		end
+
+		def ignored? file
+			return @patterns.any? do |pattern|
+				file.to_s =~ pattern
+			end
+		end
+
+		def ignored_patterns
+			return @patterns.map &:to_s
+		end
+
+		def to_s
+			return ignored_patterns.join "\n"
+		end
+	end
+
+	# proxies or renders a file based on it's properties and tilt capacity
+	# throws a CompileError when the file fails to compile
+	def make root, file, to
+		unless Tilt.registered? file.extname[1..-1].to_s
+			proxy root, file, to
+			return
+		end
+
+		begin
+			render root, file, to
+		rescue LoadError
+			@logger.warn "#{file} has a Tilt template that cannot be loaded"
+			proxy root, file, to
+		rescue CompileError => e
+			@logger.error e.to_s
+			raise e
+		end
+	end
+
+	# creates a carbon copy of a file elsewhere
+	def proxy root, file, to
+		src = root + file
+		return if src.directory?
+
+		obj = to + file
+		obj.dirname.mkpath unless obj.dirname.exist?
+
+		FileUtils.cp src, obj
+		@logger.info "\t#{src} => #{obj}"
+	end
+
+	# Takes a file and tries to render it through tilt to the destination directory
+	# Throws load error when tilt template is not resolvable
+	# Throws a BuildError when on an internal error
+	def render root, file, to
+		tilt = Tilt.new root + file
+
+		begin
+			output = tilt.render
+		rescue Exception => e
+			raise CompileError.new tilt, e
+		end
+
+		dest = to + "#{file.basename file.extname}.#{default_ext tilt.metadata[:mime_type]}"
+		dest.dirname.mkpath unless dest.dirname.exist?
+		File.write(dest, output)
+		@logger.info "\t#{tilt.file} => #{dest}"
+	end
+
+	def default_ext mime_type
+		return (@@mime_map.find{ |e, t| t == mime_type } || ['html', nil])[0]
+	end
+
+	def mime_type filename
+		name = Pathname.new(filename).extname[1..-1]
+		return (@@mime_map.find{ |e, t| e == name } || [nil, 'text/plain'])[1]
+	end
+
+	def file_not_found
+		return [404, {'Content-Type' => 'text/html'}, ["File not found!"]]
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: widow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Victorovich Matveev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Spins web superlanguages as you write!