flurin-html_mockup 0.2.0 → 0.3.0

data/examples/config.ru

@@ -0,0 +1,16 @@
+require 'pathname'
+
+begin
+  require File.dirname(__FILE__) + "/../vendor/html_mockup/lib/html_mockup/server"
+rescue LoadError => e
+  require 'rubygems'
+  require 'html_mockup/server'
+end
+
+root_path = Pathname.new(File.dirname(__FILE__)) + "html"
+partial_path = (root_path + "../partials/").realpath
+
+mockup = HtmlMockup::Server.new(root_path,partial_path)
+
+run mockup.application
+

data/examples/script/server

@@ -1,14 +1,20 @@
 #!/usr/bin/env ruby
 
+require 'pathname'
+
 begin
-  require File.dirname(__FILE__) + "/../vendor/html_mockup/lib/html_mockup/cli"
+  require File.dirname(__FILE__) + "/../vendor/html_mockup/lib/html_mockup/server"
 rescue LoadError => e
   require 'rubygems'
-  require 'html_mockup/cli'
+  require 'html_mockup/server'
 end
 
+root_path = Pathname.new(File.dirname(__FILE__)) + "../html"
+partial_path = (root_path + "../partials/").realpath
+
+mockup = HtmlMockup::Server.new(root_path,partial_path)
+
+# Add some of your own middleware here.
+# mockup.use Rack::CommonLogger
 
-a = ARGV.dup
-a.unshift(File.dirname(__FILE__) + "/../html")
-a.unshift("serve")
-HtmlMockup::Cli.start(a)
+mockup.run

data/lib/html_mockup/cli.rb

@@ -15,29 +15,19 @@ module HtmlMockup
                    :partial_path => :optional, # Defaults to [directory]/../partials
                    :validate => :boolean # Automatically validate all HTML responses @ the w3c
     def serve(path=".")
-      @path,@partial_path = template_paths(path,options["partial_path"])      
-      require 'rack'
-      require File.dirname(__FILE__) + "/rack/html_mockup"
-      require File.dirname(__FILE__) + "/rack/html_validator"      
-      chain = ::Rack::Builder.new do
-        use ::Rack::ShowExceptions
-        use ::Rack::Lint
-      end
-      chain.use Rack::HtmlValidator if options["validate"]
-      chain.run Rack::HtmlMockup.new(@path, @partial_path)
-      
-      begin
-        server = ::Rack::Handler::Mongrel
-      rescue LoadError => e
-        server = ::Rack::Handler::WEBrick
-      end
+      require File.dirname(__FILE__) + '/server'
+            
+      @path,@partial_path = template_paths(path,options["partial_path"])
       
       server_options = {}
       server_options[:Port] = options["port"] || "9000"
-      
-      puts "Running #{server.inspect} on port #{server_options[:Port]}"
+
+      server = Server.new(@path,@partial_path,options,server_options)
+          
+      puts "Running HtmlMockup with #{server.handler.inspect} on port #{server_options[:Port]}"
       puts "  Taking partials from #{@partial_path} (#{HtmlMockup::Template.partial_files(@partial_path).size} found)"
-      server.run chain.to_app, server_options
+      
+      server.run
     end
     
     desc "validate [directory/file]", "Validates the file or all HTML in directory"
@@ -88,7 +78,8 @@ module HtmlMockup
         
         mkdir(path + "script")
         cp(example_path + "script/server",path + "script/server")
-        (path + "script/server").chmod(744)
+        cp(example_path + "config.ru",path + "config.ru")        
+        (path + "script/server").chmod(0755)
       end
     end
     

data/lib/html_mockup/server.rb

@@ -0,0 +1,69 @@
+require 'rack'
+require File.dirname(__FILE__) + "/template"
+require File.dirname(__FILE__) + "/w3c_validator"
+require File.dirname(__FILE__) + "/rack/html_mockup"
+require File.dirname(__FILE__) + "/rack/html_validator"      
+
+module HtmlMockup
+  class Server
+    attr_accessor :options,:server_options, :root, :partial_path
+    
+    def initialize(root,partial_path,options={},server_options={})
+      @stack = ::Rack::Builder.new 
+
+      @middleware = []
+      @root = root
+      @partial_path = partial_path
+      @options,@server_options = options,server_options
+    end
+    
+    # Use the specified Rack middleware
+    def use(middleware, *args, &block)
+      @middleware << [middleware, args, block]
+    end
+    
+    def handler
+      @handler ||= detect_rack_handler      
+    end
+    
+    def run
+      self.handler.run self.application, @server_options do |server|
+        trap(:INT) do
+          ## Use thins' hard #stop! if available, otherwise just #stop
+          server.respond_to?(:stop!) ? server.stop! : server.stop
+          puts "Bby HtmlMockup"
+        end
+      end
+    end
+    
+    def application
+      return @app if @app
+      @stack.use ::Rack::ShowExceptions
+      @stack.use ::Rack::Lint
+      
+      @middleware.each { |c,a,b| builder.use(c, *a, &b) }
+      
+      @stack.use Rack::HtmlValidator if self.options["validate"]
+      @stack.run Rack::HtmlMockup.new(self.root, self.partial_path)
+      
+      @app = @stack.to_app
+    end
+
+    
+    protected
+    
+    # Sinatra's detect_rack_handler
+    def detect_rack_handler
+      servers = %w[thin mongrel webrick]
+      servers.each do |server_name|
+        begin
+          return ::Rack::Handler.get(server_name.capitalize)
+        rescue LoadError
+        rescue NameError
+        end
+      end
+      raise "Server handler (#{servers.join(',')}) not found."
+    end    
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flurin-html_mockup
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Flurin Egger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: mockup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - bin/mockup
+- examples/config.ru
 - examples/html/green.gif
 - examples/html/index.html
 - examples/partials/test.part.rhtml
@@ -49,6 +50,7 @@ files:
 - lib/html_mockup/cli.rb
 - lib/html_mockup/rack/html_mockup.rb
 - lib/html_mockup/rack/html_validator.rb
+- lib/html_mockup/server.rb
 - lib/html_mockup/template.rb
 - lib/html_mockup/w3c_validator.rb
 - README.rdoc