waitress-core 0.2.4 → 0.3.0

data/lib/waitress/evalbind.rb

@@ -1,9 +1,9 @@
-module Waitress
-  class EvalBindings
-
-    def context
-      binding()
-    end
-
-  end
-end
+module Waitress
+  class EvalBindings
+
+    def context
+      binding()
+    end
+
+  end
+end

data/lib/waitress/handlers/dirhandler.rb

@@ -1,39 +1,39 @@
-module Waitress
-
-  # The DirHandler class is an instance of +Waitress::Handler+ that is responsible
-  # for loading files from the filesystem and serving them if they exist in the VHost's
-  # root. It automatically handles mimetypes, evaluation and almost everything about
-  # the serving process for files in the FileSystem.
-  class DirHandler < Handler
-
-    attr_accessor :priority
-    attr_accessor :directory
-
-    # Get the instance of DirHandler that will load Waitress' resources
-    # such as the default 404 and index pages, as well as CSS and JS
-    def self.resources_handler
-      @@resources_handler ||= Waitress::DirHandler.new(Waitress::Chef.resources_http, -1000)
-      @@resources_handler
-    end
-
-    # Create a new DirHandler, with the given FileSystem directory as a root
-    # and priority.
-    def initialize directory, priority=50
-      @directory = File.absolute_path(directory)
-      @priority = priority
-    end
-
-    def respond? request, vhost
-      path = File.expand_path File.join("#{directory}", request.path)
-      res = Waitress::Chef.find_file(path)[:result]
-      path.include?(directory) && (res == :ok)
-    end
-
-    def serve request, response, client, vhost
-      path = File.expand_path File.join("#{directory}", request.path)
-      file = Waitress::Chef.find_file(path)[:file]
-      Waitress::Chef.serve_file request, response, client, vhost, file
-    end
-
-  end
-end
+module Waitress
+
+  # The DirHandler class is an instance of +Waitress::Handler+ that is responsible
+  # for loading files from the filesystem and serving them if they exist in the VHost's
+  # root. It automatically handles mimetypes, evaluation and almost everything about
+  # the serving process for files in the FileSystem.
+  class DirHandler < Handler
+
+    attr_accessor :priority
+    attr_accessor :directory
+
+    # Get the instance of DirHandler that will load Waitress' resources
+    # such as the default 404 and index pages, as well as CSS and JS
+    def self.resources_handler
+      @@resources_handler ||= Waitress::DirHandler.new(Waitress::Chef.resources_http, -1000)
+      @@resources_handler
+    end
+
+    # Create a new DirHandler, with the given FileSystem directory as a root
+    # and priority.
+    def initialize directory, priority=50
+      @directory = File.absolute_path(directory)
+      @priority = priority
+    end
+
+    def respond? request, vhost
+      path = File.expand_path File.join("#{directory}", request.path)
+      res = Waitress::Chef.find_file(path)[:result]
+      path.include?(directory) && (res == :ok)
+    end
+
+    def serve request, response, client, vhost
+      path = File.expand_path File.join("#{directory}", request.path)
+      file = Waitress::Chef.find_file(path)[:file]
+      Waitress::Chef.serve_file request, response, client, vhost, file
+    end
+
+  end
+end

data/lib/waitress/handlers/handler.rb

@@ -1,57 +1,57 @@
-module Waitress
-
-  # The Handler class is responsible for handling incoming HTTP requests for a
-  # given URL Path. This default class works by matching a regular expression to
-  # the request path, however subclasses may choose to use their own matching
-  # methods (see +Waitress::DirHandler+).
-  #
-  # Each Handler acts off of a priority system, where if multiple handlers
-  # can respond to the request, the one with the highest priority will be chosen.
-  class Handler
-
-    attr_accessor :priority
-
-    # Create a new Regex-Based Handler
-    # Params:
-    # +regex+:: The regex pattern to match against the request path
-    # +priority+:: Priority of the handler. Default: 50
-    # +action+:: The block to call when a match is reached. Should take args
-    # request, response, client and vhost.
-    def initialize regex=nil, priority=50, &action
-      @regex = regex
-      @action = action
-      @priority = priority
-    end
-
-    # Returns true if this handler is valid for the given request
-    def respond? request, vhost
-      (request.path =~ @regex) != nil
-    end
-
-    # Don't touch this -- this adds Kernel bindings
-    def serve! request, response, client, vhost
-      kernel_prepare
-      serve request, response, client, vhost
-    end
-
-    # If we can respond to the request, this method is called to
-    # serve a response based on this handler. Do your response logic here.
-    # Params:
-    # +request+:: The +Waitress::Request+ object
-    # +response+:: The +Waitress::Response+ object
-    # +client+:: The client socket
-    # +vhost+:: The Virtual Host responsible for the connection
-    def serve request, response, client, vhost
-      @action.call(request, response, client, vhost) unless @action.nil?
-    end
-
-  end
-
-  # The ErrorHandler has the lowest priority, as it shouldn't be triggered
-  # unless there is an error (i.e. 404, 500)
-  class ErrorHandler < Handler
-    def initialize
-      @priority = -65536
-    end
-  end
-end
+module Waitress
+
+  # The Handler class is responsible for handling incoming HTTP requests for a
+  # given URL Path. This default class works by matching a regular expression to
+  # the request path, however subclasses may choose to use their own matching
+  # methods (see +Waitress::DirHandler+).
+  #
+  # Each Handler acts off of a priority system, where if multiple handlers
+  # can respond to the request, the one with the highest priority will be chosen.
+  class Handler
+
+    attr_accessor :priority
+
+    # Create a new Regex-Based Handler
+    # Params:
+    # +regex+:: The regex pattern to match against the request path
+    # +priority+:: Priority of the handler. Default: 50
+    # +action+:: The block to call when a match is reached. Should take args
+    # request, response, client and vhost.
+    def initialize regex=nil, priority=50, &action
+      @regex = regex
+      @action = action
+      @priority = priority
+    end
+
+    # Returns true if this handler is valid for the given request
+    def respond? request, vhost
+      (request.path =~ @regex) != nil
+    end
+
+    # Don't touch this -- this adds Kernel bindings
+    def serve! request, response, client, vhost
+      kernel_prepare
+      serve request, response, client, vhost
+    end
+
+    # If we can respond to the request, this method is called to
+    # serve a response based on this handler. Do your response logic here.
+    # Params:
+    # +request+:: The +Waitress::Request+ object
+    # +response+:: The +Waitress::Response+ object
+    # +client+:: The client socket
+    # +vhost+:: The Virtual Host responsible for the connection
+    def serve request, response, client, vhost
+      @action.call(request, response, client, vhost) unless @action.nil?
+    end
+
+  end
+
+  # The ErrorHandler has the lowest priority, as it shouldn't be triggered
+  # unless there is an error (i.e. 404, 500)
+  class ErrorHandler < Handler
+    def initialize
+      @priority = -65536
+    end
+  end
+end

data/lib/waitress/handlers/handler404.rb

@@ -1,25 +1,25 @@
-module Waitress
-  
-  # The 404 Handler is a simple "Catch-All" handler which will be triggered if
-  # a valid handler is not found for the page, and will show an error page
-  # telling the user the page cannot be found
-  class Handler404 < ErrorHandler
-
-    def serve request, response, client, vhost
-      response.status 404
-      e404page = vhost.get_404
-      if !e404page.nil? && (Waitress::Chef.find_file(e404page)[:result]==:ok)
-        Waitress::Chef.serve_file request, response, client, vhost, e404page
-      else
-        if vhost.resources?
-          h = File.join Waitress::Chef.resources_http, "404.html"
-          Waitress::Chef.serve_file request, response, client, vhost, h
-        else
-          response.mime ".html"
-          response.body "<h1> 404 - Not Found </h1> <p> The page you have requested is not here </p>"
-        end
-      end
-    end
-
-  end
-end
+module Waitress
+  
+  # The 404 Handler is a simple "Catch-All" handler which will be triggered if
+  # a valid handler is not found for the page, and will show an error page
+  # telling the user the page cannot be found
+  class Handler404 < ErrorHandler
+
+    def serve request, response, client, vhost
+      response.status 404
+      e404page = vhost.get_404
+      if !e404page.nil? && (Waitress::Chef.find_file(e404page)[:result]==:ok)
+        Waitress::Chef.serve_file request, response, client, vhost, e404page
+      else
+        if vhost.resources?
+          h = File.join Waitress::Chef.resources_http, "404.html"
+          Waitress::Chef.serve_file request, response, client, vhost, h
+        else
+          response.mime ".html"
+          response.body "<h1> 404 - Not Found </h1> <p> The page you have requested is not here </p>"
+        end
+      end
+    end
+
+  end
+end

data/lib/waitress/handlers/libhandler.rb

@@ -1,58 +1,135 @@
-module Waitress
-
-  # The LibraryHandler is used to handle requests to the VHost regarding the
-  # libraries to be loaded by other Handlers and .wrb files. This will take any
-  # requests to /libraries (or whatever the user has set it to) to load libraries
-  class LibraryHandler < Handler
-
-    attr_accessor :priority
-
-    def initialize libraries, libdir, liburi, vhost
-      @priority = 150
-      @vhost = vhost
-      @libraries, @libdir, @liburi = libraries, File.expand_path(libdir), liburi
-      FileUtils.mkdir_p(@libdir) unless File.exist?(@libdir)
-
-      @libraries.each do |name, lib|
-        l = {}
-        d = dirType(lib[:bindtype])
-        matches = Dir["#{d}/**/*.#{lib[:bindtype].to_s}"].select { |x| (x =~ lib[:pattern]) != nil }
-        if matches.length > 0
-          l[:file] = matches[0]
-          l[:type] = lib[:bindtype]
-        else
-          l = nil
-        end
-        @libraries[name] = l
-      end
-
-      [:css, :js].each do |k|
-        d = dirType k
-        FileUtils.mkdir_p(d) unless File.exist?(d)
-
-        Dir["#{d}/**/*.#{k.to_s}"].each do |fl|
-          @libraries[File.basename(fl).to_sym] = { :file => fl, :type => k }
-        end
-      end
-    end
-
-    def dirType k
-      File.join(@libdir, k.to_s)
-    end
-
-    def respond? request, vhost
-      path = request.path
-      return false unless path.start_with?("/#{@liburi}/")
-      name = path.sub("/#{@liburi}/", "").to_sym
-      @libraries.include?(name)
-    end
-
-    def serve request, response, client, vhost
-      path = request.path
-      name = path.sub("/#{@liburi}/", "").to_sym
-      lib = @libraries[name]
-      Waitress::Chef.serve_file request, response, client, vhost, lib[:file]
-    end
-
-  end
-end
+module Waitress
+
+  # The LibraryHandler is used to handle requests to the VHost regarding the
+  # libraries to be loaded by other Handlers and .wrb files. This will take any
+  # requests to /libraries (or whatever the user has set it to) to load libraries
+  class LibraryHandler < Handler
+
+    require 'json'
+    require 'less'
+    require 'digest'
+
+    attr_accessor :priority
+
+    def initialize libraries, libdir, liburi, vhost
+      @priority = 150
+      @vhost = vhost
+      @libraries, @libdir, @liburi = libraries, File.expand_path(libdir), liburi
+      @cachedir = File.join(@libdir, ".libcache")
+      @lesscache = File.join(@cachedir, "less_compile")
+      FileUtils.mkdir_p(@libdir) unless File.exist?(@libdir)
+      parse_libraries
+      basic_libs
+      compiler_libs
+
+      setup_bower
+    end
+
+    def compile_less main_file, path
+      parser = Less::Parser.new :paths => [path].flatten, :filename => main_file
+      tree = parser.parse(File.read(main_file))
+
+      FileUtils.mkdir_p(@lesscache) unless File.exist?(@lesscache)
+      output = File.join(@lesscache, "#{Digest::MD5.hexdigest(main_file)}.min.css")
+      File.write(output, tree.to_css(:compress => true))
+
+      {:file => output, :type => :css}
+    end
+
+    def parse_libraries
+      @libraries.each do |name, lib|
+        l = {}
+        d = dirType(lib[:bindtype])
+        matches = Dir["#{d}/**/*.#{lib[:bindtype].to_s}"].select { |x| (x =~ lib[:pattern]) != nil }
+        if matches.length > 0
+          l[:file] = matches[0]
+          l[:type] = lib[:bindtype]
+        else
+          l = nil
+        end
+        @libraries[name] = l
+      end
+    end
+
+    def basic_libs
+      [:css, :js].each do |k|
+        d = dirType k
+        FileUtils.mkdir_p(d) unless File.exist?(d)
+
+        Dir["#{d}/**/*.#{k.to_s}"].each do |fl|
+          @libraries[File.basename(fl).to_sym] = { :file => fl, :type => k }
+        end
+      end
+    end
+
+    def compiler_libs
+      lessdir = dirType :less
+      FileUtils.mkdir_p(lessdir) unless File.exist?(lessdir)
+      entry = File.join(lessdir, "less.yml")
+      if File.exist? entry
+        conf = YAML.load(File.read(entry))
+        unless conf["libs"].nil?
+          conf["libs"].each do |libname, lib|
+            @libraries[libname.to_sym] = compile_less File.expand_path(lib, lessdir), lessdir
+          end
+        end
+
+        unless conf["watch"].nil? || (conf["watch"].length == 0)
+          map = conf["watch"].map { |x| File.expand_path(x, lessdir) }
+          Waitress::LESSWatcher.new(map) { |file| compile_less(file, lessdir) }
+        end
+      else
+        File.write(entry, File.join(Waitress::Chef.resources, "default_less.yml"))
+      end
+    end
+
+    def setup_bower
+      bowerdir = File.join(@libdir, "bower_components")
+      Dir["#{bowerdir}/**"].each do |component|
+        bowerfile = JSON.parse File.read(File.join(component, "bower.json"))
+        loadfiles = [bowerfile["main"]].flatten
+        loadfiles.each { |x| loadBower(x, bowerfile["name"], component, loadfiles.length > 1) }
+      end
+    end
+
+    def loadBower main, libname, home, append_type=false
+      ext = File.extname(main)
+      lib = {}
+
+      main = File.expand_path(main, home)
+
+      if ext == ".css"
+        lib[:file] = main
+        lib[:type] = :css
+      elsif ext == ".js"
+        lib[:file] = main
+        lib[:type] = :js
+      elsif ext == ".less"
+        lib = compile_less main, File.dirname(libname)
+      end
+
+      libname = libname + "_#{lib[:type].to_s}" if append_type
+      libname = libname.to_sym
+      @libraries[libname] = lib
+    end
+
+    def dirType k
+      File.join(@libdir, k.to_s)
+    end
+
+    def respond? request, vhost
+      path = request.path
+      return false unless path.start_with?("/#{@liburi}/")
+      name = path.sub("/#{@liburi}/", "").to_sym
+      @libraries.include?(name)
+    end
+
+    def serve request, response, client, vhost
+      path = request.path
+      name = path.sub("/#{@liburi}/", "").to_sym
+      lib = @libraries[name]
+      Waitress::Chef.serve_file request, response, client, vhost, lib[:file]
+    end
+
+  end
+end