html_mockup 0.3.4 → 0.3.5

data/README.rdoc

@@ -9,10 +9,10 @@ HtmlMockup also provides tools for HTML validation.
 === Requirements
 HtmlMockup requires the following dependencies
 
-* Ruby 1.8.x (not tested in 1.9.x)
+* Ruby 1.8.x (or 1.9.x)
 * Rubygems
 * Thor (to use mockup binary)
-* Rack > 0.3 (to use mockup serve) 
+* Rack > 1.0 (to use mockup serve) 
 
 === Usage
 
@@ -78,4 +78,4 @@ Options:
 --filter:: What files should be validated, defaults to [^_]*.html
 
 === Copyright & license
-Copyright (c) 2009 Flurin Egger, DigitPaint, MIT Style License. (see MIT-LICENSE)
+Copyright (c) 2011 Flurin Egger, DigitPaint, MIT Style License. (see MIT-LICENSE)

data/lib/html_mockup/cli.rb

@@ -167,7 +167,7 @@ module HtmlMockup
         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 =~ /\/$/) || (path =~ /^[^.]+$/)
+      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]

data/lib/html_mockup/server.rb

@@ -50,7 +50,8 @@ module HtmlMockup
       return @app if @app
       @stack.use ::Rack::ShowExceptions
       @stack.use ::Rack::Lint
-      @stack.use ::Rack::ConditionalGet      
+      @stack.use ::Rack::ConditionalGet
+      @stack.use ::Rack::Head 
       
       @middleware.each { |c,a,b| @stack.use(c, *a, &b) }
       

data/lib/html_mockup/w3c_validator.rb

@@ -7,6 +7,8 @@ module HtmlMockup
   class W3CValidator
   
     ValidationUri = "http://validator.w3.org/check"
+    
+    class RequestError < StandardError; end
   
     attr_reader :valid,:response,:errors,:warnings,:status
   
@@ -66,17 +68,24 @@ module HtmlMockup
       out << "Content-Type: #{mime_type}"
       out.join("\r\n") + "\r\n\r\n" + content + "\r\n"
     end
-  
-  
-  
-  
+    
     # Makes request to remote service.
     def request(method, path, *arguments)
+      perform_request(method, path, arguments, 3)
+    end
+    
+    def perform_request(method, path, arguments, tries=3)
       result = nil
       result = http.send(method, path, *arguments)
       handle_response(result)
+    rescue RequestError => e
+      if tries > 0
+        perform_request(method, path, arguments, tries-1)
+      else
+        raise
+      end
     rescue Timeout::Error => e
-      raise 
+      raise       
     end
   
     # Handles response and error codes from remote service.
@@ -97,13 +106,13 @@ module HtmlMockup
         when 405
           raise "Method not allowed"
         when 409
-          raise "Rescource conflict"
+          raise RequestError.new("Rescource conflict")
         when 422
-          raise "Resource invalid"
+          raise RequestError.new("Resource invalid")
         when 401...500
           raise "Client error"
         when 500...600
-          raise "Server error"
+          raise RequestError.new("Server error")
         else
           raise "Unknown response: #{response.code.to_i}"
       end

metadata

@@ -1,46 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: html_mockup
-version: !ruby/object:Gem::Version 
-  version: 0.3.4
+version: !ruby/object:Gem::Version
+  version: 0.3.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Flurin Egger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-10 00:00:00 +02:00
-default_executable: mockup
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &70185227460540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.12.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rack
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *70185227460540
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70185227459700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-    version: 
+  type: :runtime
+  prerelease: false
+  version_requirements: *70185227459700
 description: 
 email: flurin@digitpaint.nl
-executables: 
+executables:
 - mockup
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - bin/mockup
 - examples/config.ru
 - examples/html/green.gif
@@ -54,33 +54,28 @@ files:
 - lib/html_mockup/template.rb
 - lib/html_mockup/w3c_validator.rb
 - README.rdoc
-has_rdoc: false
 homepage: http://github.com/flurin/html_mockup
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: HTML Mockup is a set of tools to create self-containing HTML mockups.
 test_files: []
-