html_mockup 0.5.2 → 0.6.0

data/README.rdoc

@@ -47,32 +47,33 @@ to access partials in subdirectories.
 
 === Mockup commandline
 
-==== mockup convert [directory/file]
+==== mockup serve [directory]
 
-Convert can be called with a single html file or a directory. If a directory is specified all .html files
-will be converted. 
+Serve can be used during development as a simple webserver (Puma, Mongrel, Thin, Webrick). It also supports on-the-fly HTML validation. 
 
-*Warning:* Convert will overwrite the file itself!
+The directory to serve must contain `[directory]/html` and `[directory]/partials` (unless you have specified `--partial_path` and `--html_path`)
 
 Options:
---partial_path:: the path where the partial files can be found (*.part.html), defaults to director/../partials
---filter:: The filter to use when finding templates within directory, defaults to *.html 
+--port:: The port the server should listen on. Defaults to 9000
+--partial_path:: the path where the partial files can be found (*.part.html), defaults to directory `[directory]/partials`
+--html_path:: the path where the html files can be found (*.html), defaults to directory `[directory]/html`
+--validate:: Flag to set wether or not we should validate all html files (defaults to false)
 
-==== mockup serve [directory/file]
+==== mockup release [directory]
 
-Serve can be used during development as a simple webserver (Webrick/Mongrel). It also supports
-on-the-fly HTML validation. 
+Makes a release of the current mockup project
 
-You can also call ./script/server just above the HTML directory.
+==== mockup new [directory]
 
-Options:
---port:: The port the server should listen on. Defaults to 9000
---partial_path:: the path where the partial files can be found (*.part.html), defaults to directory /../partials
---validate:: Flag to set wether or not we should validate all html files (defaults to false)
+Generate creates a directory structure in directory for use with new HTML mockups.
 
-==== mockup generate [directory]
+==== mockup extract [source_path] [target_path]
 
-Generate creates a directory structure in directory for use with new HTML mockups.
+Extract a fully relative html mockup into target_path. It will expand all absolute href's, src's and action's into relative links if they are absolute
+
+Options:
+--partial_path:: Defaults to [directory]/partials
+--filter:: What files should be converted defaults to **/*.html
 
 ==== mockup validate [directory/file]
 
@@ -83,4 +84,4 @@ Options:
 --filter:: What files should be validated, defaults to [^_]*.html
 
 === Copyright & license
-Copyright (c) 2011 Flurin Egger, DigitPaint, MIT Style License. (see MIT-LICENSE)
+Copyright (c) 2012 Flurin Egger, Edwin van der Graaf, DigitPaint, MIT Style License. (see MIT-LICENSE)

data/examples/default_template/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem "html_mockup"

data/examples/default_template/Mockupfile

@@ -0,0 +1 @@
+# Configure your mockup here

data/lib/html_mockup/cli.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'thor'
+require 'thor/group'
 
 require 'pathname'
 require 'fileutils'
@@ -7,6 +8,7 @@ include FileUtils
 
 require File.dirname(__FILE__) + "/template"
 require File.dirname(__FILE__) + "/project"
+require File.dirname(__FILE__) + "/generators"
 require File.dirname(__FILE__) + "/w3c_validator"
 
 module HtmlMockup
@@ -15,12 +17,22 @@ module HtmlMockup
     method_options :port => :string, # Defaults to 9000
                    :html_path => :string, # The document root, defaults to "[directory]/html"
                    :partial_path => :string, # Defaults to [directory]/partials
-                   :handler => :string # The handler to use (defaults to mongrel)
-    def serve(path=".")      
+                   :handler => :string, # The handler to use (defaults to mongrel)
+                   :validate => :boolean # Run validation?
+    def serve(path=".")
+      
+      server_options = {} 
+      options.each{|k,v| server_options[k.to_sym] = v }
+      server_options[:server] = {}
+      [:port, :handler, :validate].each do |k|
+        server_options[:server][k] = server_options.delete(k) if server_options.has_key?(k)
+      end
+      
       # Load the project, it should take care of all the paths
-      @project = initialize_project(path, options)
+      @project = initialize_project(path, server_options)
       
       server = @project.server
+      server.set_options(server_options[:server])
       
       puts "Running HtmlMockup with #{server.handler.inspect} on port #{server.port}"
       puts banner(@project) 
@@ -64,28 +76,10 @@ module HtmlMockup
       end      
     end
     
-    desc "generate [directory]","Create a new HTML mockup directory tree in directory"
-    def generate(path)
-      path = Pathname.new(path)
-      if path.directory?
-        puts "Directory #{path} already exists, please only use this to create new mockups"
-      else
-        example_path = Pathname.new(File.dirname(__FILE__) + "/../../examples")
-        path.mkpath
-        html_path = path + "html"
-        mkdir(html_path)
-        mkdir(html_path + "stylesheets")
-        mkdir(html_path + "images")
-        mkdir(html_path + "javascripts")
-        
-        mkdir(path + "partials")
-        
-        mkdir(path + "script")
-        cp(example_path + "script/server",path + "script/server")
-        cp(example_path + "config.ru",path + "config.ru")        
-        (path + "script/server").chmod(0755)
-      end
-    end
+    register HtmlMockup::Generators::New, "new", "new [directory]", ""
+    # Hack to register our options/description
+    tasks["new"].options = HtmlMockup::Generators::New.class_options
+    tasks["new"].description = HtmlMockup::Generators::New.desc
     
     desc "extract [source_path] [target_path]", "Extract a fully relative html mockup into target_path. It will expand all absolute href's, src's and action's into relative links if they are absolute"
     method_options :partial_path => :string, # Defaults to [directory]/partials
@@ -113,7 +107,7 @@ module HtmlMockup
         exit(1)
       end
       
-      Project.new(path)
+      Project.new(path, options)
     end
 
     def w3cvalidate(file)

data/lib/html_mockup/generators/new.rb

@@ -0,0 +1,66 @@
+require 'shellwords'
+
+class HtmlMockup::Generators::New < Thor::Group
+  
+  include Thor::Actions
+  
+  desc "Create a new HTML mockup based on an existing skeleton"
+  argument :path, :type => :string, :required => true, :desc => "Path to generate mockup into"
+  class_option :template, :type => :string, :aliases => ["-t"], :desc => "Template to use, can be a path or a git repository remote, uses built in minimal as default"
+  
+  attr_reader :source_paths
+  
+  def setup_variables    
+    self.destination_root = path
+    
+    @source_paths = []
+    
+    # Stuff to rm -rf later
+    @cleanup = []
+  end
+  
+  def validate_path_is_empty
+    if File.directory?(self.destination_root)
+      say "Directory #{self.destination_root} already exists, please only use this to create new mockups"
+      exit(1)
+    end
+  end
+  
+  def validate_template_path
+    if options[:template]
+      template = options[:template]
+    else
+      template = File.dirname(__FILE__) + "/../../../examples/default_template"
+    end
+    
+    if File.exist?(template)
+      say "Taking template from #{template}"
+      @source_paths << template
+    else
+      # Hack to create temp directory
+      t = Tempfile.new("htmlmockup-generate-new")
+      tmp_dir = Pathname.new(t.path)
+      t.close
+      t.unlink
+      
+      if run("git clone --depth=1 #{Shellwords.escape(template)} #{tmp_dir}")
+        say "Cloned template from #{template}"
+        run("rm -rf #{tmp_dir + ".git"}")
+        @source_paths << tmp_dir.to_s
+        @cleanup << tmp_dir.to_s
+      else
+        say "Template path #{template} doesn't seem to be a git remote or a local path"
+        exit(1)
+      end
+    end
+  rescue Exception => e
+    puts e
+    puts e.backtrace.join("\n")
+  end
+  
+  def create_mockup
+    directory(".", ".")
+  end
+  
+  
+end

data/lib/html_mockup/generators.rb

@@ -0,0 +1,6 @@
+module HtmlMockup
+  module Generators
+  end
+end
+
+require File.dirname(__FILE__) + "/generators/new"

data/lib/html_mockup/project.rb

@@ -15,12 +15,12 @@ module HtmlMockup
     def initialize(path, options={})
       @path = Pathname.new(path)
       
-      options = {
+      @options = {
         :html_path => @path + "html",
         :partial_path => @path + "partials"
       }.update(options)
       
-      paths = 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]
       
@@ -29,11 +29,13 @@ module HtmlMockup
     end
     
     def server
-      @server ||= Server.new(self)
+      options = @options[:server] || {}
+      @server ||= Server.new(self, options)
     end
     
     def release
-      @release ||= Release.new(self)
+      options = @options[:release] || {}      
+      @release ||= Release.new(self, options)
     end
     
     def html_path=(p)

data/lib/html_mockup/release/cleaner.rb

@@ -0,0 +1,18 @@
+module HtmlMockup
+  class Release::Cleaner
+    def initialize(pattern)
+      @pattern = pattern
+    end
+    def call(release, options = {})
+      # We switch to the build path and append the globbed files for safety, so even if you manage to sneak in a
+      # pattern like "/**/*" it won't do you any good as it will be reappended to the path
+      Dir.chdir(release.build_path.to_s) do
+        Dir.glob(@pattern).each do |file|
+          path = File.join(release.build_path.to_s, file)
+          release.log(self, "Cleaning up \"#{path}\" in build")
+          rm(path)
+        end
+      end
+    end
+  end
+end

data/lib/html_mockup/release/finalizers/dir.rb

@@ -6,11 +6,15 @@ require 'fileutils'
 #
 module HtmlMockup::Release::Finalizers
   class Dir < Base
+    def initialize(options = {})
+      @options = options
+    end
     
     # @option options :prefix Prefix to put before the version (default = "html")
     def call(release, options = {})
-      name = [(options[:prefix] || "html"), release.scm.version].join("-")
-      
+      @options.update(options)
+
+      name = [(@options[:prefix] || "html"), release.scm.version].join("-")      
       release.log(self, "Finalizing release to #{release.target_path + name}")
       
       if File.exist?(release.target_path + name)

data/lib/html_mockup/release/finalizers/zip.rb

@@ -1,4 +1,5 @@
 module HtmlMockup::Release::Finalizers
   class Zip < Base
+    #  :-(
   end
 end

data/lib/html_mockup/release/injector.rb

@@ -37,11 +37,12 @@ module HtmlMockup
     # @option options [Array] :into An array of file globs relative to the build_path
     def initialize(variables, options)      
       @variables = variables
-      @into = options[:into]
+      @options = options
     end
     
-    def call(release)
-      files = release.get_files(@into)
+    def call(release, options = {})
+      @options.update(options)
+      files = release.get_files(@options[:into])
       
       files.each do |f|
         c = File.read(f)

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

@@ -1,28 +1,33 @@
 require 'fileutils'
 module HtmlMockup::Release::Processors
   class Requirejs < Base
+    
+    def initialize(options = {})
+      @options = {
+        :build_files => {"javascripts/site.build.js" => "javascripts"},
+        :rjs => "r.js",
+        :node => "node"
+      }.update(options)
+    end
+    
 
     # @option options [Hash] :build_files An a hash of files to build (as key) and the target directory in the release to put it as value, each one will be built in a separate directory. (default is {"javascripts/site.build.js" => "javascripts"})
     # @option options [String] :node The system path for node (defaults to "node" in path)
     # @option options [String] :rjs The system path to the requirejs optimizer (r.js) (defaults to "../vendor/requirejs/r.js" (relative to source_path))
     def call(release, options={})
-      options = {
-        :build_files => {"javascripts/site.build.js" => "javascripts"},
-        :rjs => release.source_path + "../vendor/requirejs/r.js",
-        :node => "node"
-      }.update(options)
+      @options.update(options)
+      
+      puts @options.inspect
       
       begin
-        `#{options[:node]} -v`
+        `#{@options[:node]} -v`
       rescue Errno::ENOENT
         raise RuntimeError, "Could not find node in #{node.inspect}"
       end
       
-      if !File.exist?(options[:rjs])
-        raise RuntimeError, "Could not find r.js optimizer at #{options[:rjs].inspect}"
-      end
+      rjs_command = rjs_check()
       
-      options[:build_files].each do |build_file, target|
+      @options[:build_files].each do |build_file, target|
         build_file = release.build_path + build_file
         target = release.build_path + target
         release.log(self, "Optimizing #{build_file}")
@@ -34,7 +39,7 @@ module HtmlMockup::Release::Processors
         t.unlink
       
         # Run r.js optimizer
-        output = `#{options[:node]} #{options[:rjs]} -o #{build_file} dir=#{tmp_build_dir}`
+        output = `#{rjs_command} -o #{build_file} dir=#{tmp_build_dir}`
         
         # Check if r.js succeeded
         unless $?.success?
@@ -50,5 +55,47 @@ module HtmlMockup::Release::Processors
         FileUtils.mv(tmp_build_dir, target)
       end
     end
+    
+    
+    # Incase both a file and bin version are availble file version is taken
+    #
+    # @return rjs_command to invoke r.js optimizer with
+
+    def rjs_check(path = @options[:rjs])
+      rjs_command = rjs_file(path) || rjs_bin(path)
+      if !(rjs_command)
+        raise RuntimeError, "Could not find r.js optimizer in #{path.inspect} - try updating this by npm install -g requirejs"
+      end
+      rjs_command
+    end
+    
+    protected
+
+    # Checks if the param is the r.js lib from file system
+    # 
+    # @param [String] Path r.js lib may be kept to be invoked with node
+    # @return [String] the cli invokement string
+    def rjs_file(path)
+      if File.exist?(path)
+        "#{@options[:node]} #{path}"
+      else
+        false
+      end
+    end
+    
+    # Checks if r.js is installed as bin
+    #
+    # @param [String] Path to r.js bin
+    # @return [String] the cli invokement string
+    def rjs_bin(path)
+      begin
+        `#{path} -v`
+      rescue Errno::ENOENT
+        false
+      else
+        "#{path}"
+      end
+    end
+    
   end
 end

data/lib/html_mockup/release.rb

@@ -7,14 +7,52 @@ module HtmlMockup
     
     attr_reader :finalizers, :injections, :stack, :cleanups
     
-    def self.default_stack
-      []
-    end    
+    class << self
     
-    def self.default_finalizers
-      [[:dir, {}]]
-    end
+      def default_stack
+        []
+      end    
+    
+      def default_finalizers
+        [[self.get_callable(:dir, HtmlMockup::Release::Finalizers), {}]]
+      end
             
+      # Makes callable into a object that responds to call. 
+      #
+      # @param [#call, Symbol, Class] callable If callable already responds to #call will just return callable, a Symbol will be searched for in the scope parameter, a class will be instantiated (and checked if it will respond to #call)
+      # @param [Module] scope The scope in which to search callable in if it's a Symbol
+      def get_callable(callable, scope)
+        return callable if callable.respond_to?(:call)
+      
+        if callable.kind_of?(Symbol)
+          callable = camel_case(callable.to_s).to_sym
+          if scope.constants.include?(callable)
+            c = scope.const_get(callable)
+            callable = c if c.is_a?(Class)
+          end
+        end
+      
+        if callable.kind_of?(Class)
+          callable = callable.new
+        end
+      
+        if callable.respond_to?(:call)
+          callable
+        else
+          raise ArgumentError, "Could not resolve #{callable.inspect}. Callable must be an object that responds to #call or a symbol that resolve to such an object or a class with a #call instance method."
+        end
+      
+      end
+    
+      # Nothing genius adjusted from:
+      # http://stackoverflow.com/questions/9524457/converting-string-from-snake-case-to-camel-case-in-ruby
+      def camel_case(string)
+        return string if string !~ /_/ && string =~ /[A-Z]+.*/
+        string.split('_').map{|e| e.capitalize}.join
+      end
+      
+    end
+    
     # @option config [Symbol] :scm The SCM to use (default = :git)
     # @option config [String, Pathname] :target_path The path/directory to put the release into
     # @option config [String, Pathname]:build_path Temporary path used to build the release
@@ -30,10 +68,8 @@ module HtmlMockup
       
       @config = {}.update(defaults).update(config)
       @project = project
-      @finalizers = []
-      @injections = []
       @stack = []
-      @cleanups = []
+      @finalizers = []
     end
     
     # Accessor for target_path
@@ -78,7 +114,7 @@ module HtmlMockup
     #   release.inject({"VERSION" => release.version, "DATE" => release.date}, :into => %w{_doc/toc.html})
     #   release.inject({"CHANGELOG" => {:file => "", :filter => BlueCloth}}, :into => %w{_doc/changelog.html})  
     def inject(variables, options)
-      @injections << [variables, options]
+      @stack << Injector.new(variables, options)
     end
     
     # Use a certain pre-processor
@@ -86,7 +122,7 @@ module HtmlMockup
     # @examples
     #   release.use :sprockets, sprockets_config
     def use(processor, options = {})
-      @stack << [processor, options]
+      @stack << [self.class.get_callable(processor, HtmlMockup::Release::Processors), options]
     end
     
     # Write out the whole release into a directory, zip file or anything you can imagine
@@ -99,7 +135,7 @@ module HtmlMockup
     # @examples
     #   release.finalize :zip
     def finalize(finalizer, options = {})
-      @finalizers << [finalizer, options]
+      @finalize << [self.class.get_callable(finalizer, HtmlMockup::Release::Finalizers), options]
     end
     
     # Files to clean up in the build directory just before finalization happens
@@ -109,7 +145,7 @@ module HtmlMockup
     # @examples
     #   release.cleanup "**/.DS_Store"
     def cleanup(pattern)
-      @cleanups << pattern
+      @stack << Cleaner.new(pattern)
     end
     
     # Generates a banner if a block is given, or returns the currently set banner.
@@ -161,12 +197,6 @@ module HtmlMockup
       
       # Run stack
       run_stack!
-            
-      # Run injections
-      run_injections!
-      
-      # Run cleanups
-      run_cleanups!
       
       # Run finalizers
       run_finalizers!
@@ -212,36 +242,25 @@ module HtmlMockup
     
     def run_stack!
       @stack = self.class.default_stack.dup if @stack.empty?
-      @stack.each do |processor, options|
-        get_callable(processor, HtmlMockup::Release::Processors).call(self, options)
-      end
-    end
-        
-    def run_injections!
-      @injections.each do |injection|
-        Injector.new(injection[0], injection[1]).call(self)
+      
+      # call all objects in @stack
+      @stack.each do |task|
+        if (task.kind_of?(Array))
+          task[0].call(self, task[1])
+        else
+          task.call(self)
+        end
       end
     end
-    
+
     def run_finalizers!
       @finalizers = self.class.default_finalizers.dup if @finalizers.empty?
-      @finalizers.each do |finalizer, options|
-        get_callable(finalizer, HtmlMockup::Release::Finalizers).call(self, options)
-      end
-    end
-    
-    def run_cleanups!
-      # We switch to the build path and append the globbed files for safety, so even if you manage to sneak in a
-      # pattern like "/**/*" it won't do you any good as it will be reappended to the path
-      Dir.chdir(self.build_path.to_s) do
-        @cleanups.each do |pattern|
-          Dir.glob(pattern).each do |file|
-            path = File.join(self.build_path.to_s, file)
-            log(self, "Cleaning up \"#{path}\" in build")
-            rm(path)
-          end
-        end
+      
+      # call all objects in @finalizes
+      @finalizers.each do |finalizer|
+        finalizer[0].call(self, finalizer[1])
       end
+
     end
     
     def cleanup!
@@ -249,34 +268,6 @@ module HtmlMockup
       rm_rf(self.build_path)
     end
     
-    # Makes callable into a object that responds to call. 
-    #
-    # @param [#call, Symbol, Class] callable If callable already responds to #call will just return callable, a Symbol will be searched for in the scope parameter, a class will be instantiated (and checked if it will respond to #call)
-    # @param [Module] scope The scope in which to search callable in if it's a Symbol
-    def get_callable(callable, scope)
-      return callable if callable.respond_to?(:call)
-      
-      if callable.kind_of?(Symbol)
-        # TODO camelcase callable
-        callable = callable.to_s.capitalize.to_sym
-        if scope.constants.include?(callable)
-          c = scope.const_get(callable)
-          callable = c if c.is_a?(Class)
-        end
-      end
-      
-      if callable.kind_of?(Class)
-        callable = callable.new
-      end
-      
-      if callable.respond_to?(:call)
-        callable
-      else
-        raise ArgumentError, "Could not resolve #{callable.inspect}. Callable must be an object that responds to #call or a symbol that resolve to such an object or a class with a #call instance method."
-      end
-      
-    end
-    
     # @param [String] string The string to comment
     #
     # @option options [:html, :css, :js] :style The comment style to use (default=:js, which is the same as :css)
@@ -308,5 +299,6 @@ end
 require File.dirname(__FILE__) + "/extractor"
 require File.dirname(__FILE__) + "/release/scm"
 require File.dirname(__FILE__) + "/release/injector"
+require File.dirname(__FILE__) + "/release/cleaner"
 require File.dirname(__FILE__) + "/release/finalizers"
 require File.dirname(__FILE__) + "/release/processors"

data/lib/html_mockup/server.rb

@@ -17,14 +17,20 @@ module HtmlMockup
       @stack = initialize_rack_builder
             
       @project = project
-
+      
+      set_options(options)
+    end
+    
+    # Sets the options, this is a separate method as we want to override certain
+    # things set in the mockupfile from the commandline
+    def set_options(options)
       @options = {
         :handler => nil, # Autodetect
         :port => 9000
       }.update(options)
       
-      @port = @options[:port]
-      @handler = @options[:handler]
+      self.port = @options[:port]
+      self.handler = @options[:handler]      
     end
         
     # Use the specified Rack middleware
@@ -58,7 +64,7 @@ module HtmlMockup
     def application
       return @app if @app
       
-      @stack.use Rack::HtmlValidator if self.options["validate"]
+      @stack.use Rack::HtmlValidator if self.options[:validate]
       @stack.run Rack::HtmlMockup.new(self.project.html_path, self.project.partial_path)
       
       @app = @stack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_mockup
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70150939878780 !ruby/object:Gem::Requirement
+  requirement: &70177258865640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150939878780
+  version_requirements: *70177258865640
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70150939877560 !ruby/object:Gem::Requirement
+  requirement: &70177258864880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150939877560
+  version_requirements: *70177258864880
 description: 
 email: flurin@digitpaint.nl
 executables:
@@ -43,19 +43,20 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - bin/mockup
-- examples/config.ru
-- examples/html/green.gif
-- examples/html/index.html
-- examples/partials/test.part.rhtml
-- examples/script/server
+- examples/default_template/CHANGELOG
+- examples/default_template/Gemfile
+- examples/default_template/Mockupfile
 - lib/html_mockup/cli.rb
 - lib/html_mockup/extractor.rb
+- lib/html_mockup/generators.rb
+- lib/html_mockup/generators/new.rb
 - lib/html_mockup/mockupfile.rb
 - lib/html_mockup/project.rb
 - lib/html_mockup/rack/html_mockup.rb
 - lib/html_mockup/rack/html_validator.rb
 - lib/html_mockup/rack/sleep.rb
 - lib/html_mockup/release.rb
+- lib/html_mockup/release/cleaner.rb
 - lib/html_mockup/release/finalizers.rb
 - lib/html_mockup/release/finalizers/dir.rb
 - lib/html_mockup/release/finalizers/zip.rb

data/examples/config.ru

@@ -1,16 +0,0 @@
-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/html/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>untitled</title>
-	
-</head>
-
-<body>
-  <!-- [START:test?id=bla] -->
-  <!-- [STOP:test] -->  
-  
-  <img src="green.gif" alt="Green" />
-</body>
-</html>

data/examples/partials/test.part.rhtml

@@ -1,3 +0,0 @@
-<div id="<%= @id || "fault" %>">
-  Think?
-</div>

data/examples/script/server

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-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)
-
-# Add some of your own middleware here.
-# mockup.use Rack::CommonLogger
-
-mockup.run