html_mockup 0.5.1 → 0.5.2

data/lib/html_mockup/project.rb

@@ -20,13 +20,16 @@ module HtmlMockup
         :partial_path => @path + "partials"
       }.update(options)
       
-      html_path, partial_path = mockup_paths(options[:html_path], options[:partial_path])
+      paths = mockup_paths(options[:html_path], options[:partial_path])
+      self.html_path = paths[0]
+      self.partial_path = paths[1]
+      
       @mockupfile = Mockupfile.new(self)
       @mockupfile.load
     end
     
     def server
-      @server ||= Server.new(self.html_path, self.partial_path)
+      @server ||= Server.new(self)
     end
     
     def release

data/lib/html_mockup/release/processors/yuicompressor.rb

@@ -26,8 +26,8 @@ module HtmlMockup::Release::Processors
       
       # Add version numbers and minify the files
       release.get_files(options[:match], options[:skip]).each do |f|
-        type = f[/\.(.+)$/,1]  
-      
+        type = f[/\.([^.]+)\Z/,1]
+        
         data = File.read(f);
         File.open(f,"w") do |fh| 
           
@@ -42,8 +42,11 @@ module HtmlMockup::Release::Processors
             minified << css_compressor.compress(data)
           when "js"
             minified << js_compressor.compress(data)
+          else
+            release.log self, "Error minifying: encountered unknown type \"#{type}\""
+            minified << data
           end
-    
+
           fh.write minified.join("\n")
         end
       end

data/lib/html_mockup/server.rb

@@ -9,16 +9,15 @@ module HtmlMockup
     
     attr_reader :options
     
-    attr_accessor :html_path, :partial_path
-    
+    attr_reader :project
+      
     attr_accessor :port, :handler
     
-    def initialize(html_path, partial_path, options={})
-      @stack = ::Rack::Builder.new 
+    def initialize(project, options={})
+      @stack = initialize_rack_builder
+            
+      @project = project
 
-      @middleware = []
-      @html_path = html_path
-      @partial_path = partial_path
       @options = {
         :handler => nil, # Autodetect
         :port => 9000
@@ -29,26 +28,21 @@ module HtmlMockup
     end
         
     # Use the specified Rack middleware
-    def use(middleware, *args, &block)
-      @middleware << [middleware, args, block]
+    #
+    # @see ::Rack::Builder#use
+    def use(*args, &block)
+      @stack.use *args, &block
     end
     
-    def handler
-      if self.options[:handler]
-        begin
-          @handler = ::Rack::Handler.get(self.handler)
-        rescue LoadError
-        rescue NameError
-        end
-        if @handler.nil?
-          puts "Handler '#{self.options[:handler]}' not found, using fallback."
-        end        
-      end
-      @handler ||= detect_rack_handler
+    # Use the map handler to map endpoints to certain urls
+    #
+    # @see ::Rack::Builder#map    
+    def map(*args, &block)
+      @stack.map *args, &block
     end
-        
+            
     def run!
-      self.handler.run self.application, self.server_options do |server|
+      self.get_handler(self.handler).run self.application, self.server_options do |server|
         trap(:INT) do
           ## Use thins' hard #stop! if available, otherwise just #stop
           server.respond_to?(:stop!) ? server.stop! : server.stop
@@ -57,45 +51,60 @@ module HtmlMockup
       end
     end
     alias :run :run!
+        
+    protected
     
+    # Build the final application that get's run by the Rack Handler
     def application
       return @app if @app
-      @stack.use ::Rack::ShowExceptions
-      @stack.use ::Rack::Lint
-      @stack.use ::Rack::ConditionalGet
-      @stack.use ::Rack::Head 
-      
-      @middleware.each { |c,a,b| @stack.use(c, *a, &b) }
       
       @stack.use Rack::HtmlValidator if self.options["validate"]
-      @stack.run Rack::HtmlMockup.new(self.html_path, self.partial_path)
+      @stack.run Rack::HtmlMockup.new(self.project.html_path, self.project.partial_path)
       
-      @app = @stack.to_app
-    end
-
-    
-    protected
+      @app = @stack
+    end    
     
-    # Generate server options for handler
-    def server_options
-      {
-        :Port => self.port
-      }
+    # Initialize the Rack builder instance for this server
+    #
+    # @return ::Rack::Builder instance
+    def initialize_rack_builder
+      builder = ::Rack::Builder.new 
+      builder.use ::Rack::ShowExceptions
+      builder.use ::Rack::Lint
+      builder.use ::Rack::ConditionalGet
+      builder.use ::Rack::Head      
+      
+      builder 
     end
     
-    
-    # Sinatra's detect_rack_handler
-    def detect_rack_handler
-      servers = %w[mongrel thin webrick]
-      servers.each do |server_name|
+    # Get the actual handler for use in the server
+    # Will always return a handler, it will try to use the fallbacks
+    def get_handler(preferred_handler_name = nil)
+      servers = %w[puma mongrel thin webrick]
+      servers.unshift(preferred_handler_name) if preferred_handler_name
+      
+      handler = nil
+      while((server_name = servers.shift) && handler === nil) do 
         begin
-          return ::Rack::Handler.get(server_name)
+          handler = ::Rack::Handler.get(server_name)
         rescue LoadError
         rescue NameError
         end
       end
-      raise "Server handler (#{servers.join(',')}) not found."
-    end    
+            
+      if preferred_handler_name && server_name != preferred_handler_name
+        puts "Handler '#{preferred_handler_name}' not found, using fallback ('#{server_name}')."
+      end
+      handler
+    end
     
+    
+    # Generate server options for handler
+    def server_options
+      {
+        :Port => self.port
+      }
+    end
+
   end
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
 - Flurin Egger
+- Edwin van der Graaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70226277925520 !ruby/object:Gem::Requirement
+  requirement: &70150939878780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70226277925520
+  version_requirements: *70150939878780
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70226277924900 !ruby/object:Gem::Requirement
+  requirement: &70150939877560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +33,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70226277924900
+  version_requirements: *70150939877560
 description: 
 email: flurin@digitpaint.nl
 executables:
@@ -55,7 +56,6 @@ files:
 - lib/html_mockup/rack/html_validator.rb
 - lib/html_mockup/rack/sleep.rb
 - lib/html_mockup/release.rb
-- lib/html_mockup/release/extractor.rb
 - lib/html_mockup/release/finalizers.rb
 - lib/html_mockup/release/finalizers/dir.rb
 - lib/html_mockup/release/finalizers/zip.rb
@@ -70,7 +70,7 @@ files:
 - lib/html_mockup/template.rb
 - lib/html_mockup/w3c_validator.rb
 - README.rdoc
-homepage: http://github.com/flurin/html_mockup
+homepage: http://github.com/digitpaint/html_mockup
 licenses: []
 post_install_message: 
 rdoc_options:

data/lib/html_mockup/release/extractor.rb

@@ -1,25 +0,0 @@
-# Extracts the actual mockup into a directory and makes URLs
-# relative.
-class Release::Extractor
-  
-  
-  # Resolves an url to a true file on disk:
-  # 
-  # * it will add index.html if it's a directory
-  # * it will try to append .html or .htm if it's not a directory
-  def resolve_path(path)
-    path = Pathname.new(path) unless path.kind_of?(Pathname)
-    # Append index.html/index.htm/index.rhtml if it's a diretory
-    if path.directory?
-      search_files = %w{.html .htm}.map!{|p| path + "index#{p}" }
-    # If it ends with a slash or does not contain a . and it's not a directory
-    # try to add .html/.htm/.rhtml to see if that exists.
-    elsif (path.to_s =~ /\/$/) || (path.to_s =~ /^[^.]+$/)
-      search_files = [path.to_s + ".html", path.to_s + ".htm"].map!{|p| Pathname.new(p) }
-    else
-      search_files = [path]
-    end
-    search_files.find{|p| p.exist? }  
-  end
-  
-end