flurin-html_mockup 0.1.1 → 0.1.2

data/lib/html_mockup/cli.rb

@@ -36,6 +36,7 @@ module HtmlMockup
       server_options[:Port] = options["port"] || "9000"
       
       puts "Running #{server.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
     end
     
@@ -116,7 +117,7 @@ module HtmlMockup
     
     def template_paths(path,partial_path=nil)
       path = Pathname.new(path)
-      partial_path = partial_path && Pathname.new(partial_path) || (path + "../partials/").cleanpath      
+      partial_path = partial_path && Pathname.new(partial_path) || (path + "../partials/").realpath
       [path,partial_path]
     end
     

data/lib/html_mockup/rack/html_mockup.rb

@@ -31,12 +31,21 @@ module HtmlMockup
 
         if template_path = search_files.find{|p| File.exist?(p)}
           env["rack.errors"].puts "Rendering template #{template_path.inspect} (#{path.inspect})"
-          templ = ::HtmlMockup::Template.open(template_path, :partial_path => @partial_path)
-          resp = ::Rack::Response.new do |res|
-            res.status = 200
-            res.write templ.render
+          begin
+            templ = ::HtmlMockup::Template.open(template_path, :partial_path => @partial_path)
+            resp = ::Rack::Response.new do |res|
+              res.status = 200
+              res.write templ.render
+            end
+            resp.finish
+          rescue StandardError => e
+            env["rack.errors"].puts "  #{e.message}"
+            resp = ::Rack::Response.new do |res|
+              res.status = 500
+              res.write "An error occurred"
+            end
+            resp.finish
           end
-          resp.finish
         else
           env["rack.errors"].puts "Invoking file handler for #{path.inspect}"
           @file_server.call(env)

data/lib/html_mockup/template.rb

@@ -4,6 +4,9 @@ require 'erb'
 require 'cgi'
 
 module HtmlMockup
+  
+  class MissingPartial < StandardError; end
+  
   class Template
   
     class << self
@@ -24,7 +27,7 @@ module HtmlMockup
       end
       
       def partial_files(path)
-        filter = "*.part.?html"
+        filter = "*.part.{?h,h}tml"
         files = []
         Dir.chdir(Pathname.new(path)) do 
           files = Dir.glob(filter)        
@@ -104,8 +107,10 @@ module HtmlMockup
       [tag,params,scanned]
     end
   
-    def render_partial(tag,params)  
-      return nil unless self.available_partials[tag]
+    def render_partial(tag,params)      
+      unless self.available_partials[tag]
+        raise MissingPartial.new("Could not find partial '#{tag}' in partial path '#{@options[:partial_path]}'")
+      end
       template = ERB.new(self.available_partials[tag])
       context = TemplateContext.new(params)
       "\n" + template.result(context.get_binding).rstrip + "\n<!-- [STOP:#{tag}] -->"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flurin-html_mockup
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Flurin Egger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-14 00:00:00 -07:00
+date: 2009-04-20 00:00:00 -07:00
 default_executable: mockup
 dependencies: 
 - !ruby/object:Gem::Dependency