roger 0.12.5 → 0.13.0

data/test/unit/generators_test.rb

@@ -30,7 +30,7 @@ module CustomGens
 end
 
 module Roger
-  class GeneratorTest < Test::Unit::TestCase
+  class GeneratorTest < ::Test::Unit::TestCase
     def setup
       @cli = Cli::Base.new
     end

data/test/unit/release/cleaner_test.rb

@@ -2,7 +2,7 @@ require "./lib/roger/release.rb"
 require "./lib/roger/release/cleaner.rb"
 require "test/unit"
 
-class CleanerTest < Test::Unit::TestCase
+class CleanerTest < ::Test::Unit::TestCase
 
   def setup
     @base = File.dirname(__FILE__) + "/../../project"

data/test/unit/release/processors_test.rb

@@ -1,7 +1,7 @@
 require "./lib/roger/release.rb"
 require "test/unit"
 
-class ProcessorsTest < Test::Unit::TestCase
+class ProcessorsTest < ::Test::Unit::TestCase
   def setup
     Roger::Release::Processors.map.clear
   end

data/test/unit/release_test.rb

@@ -3,7 +3,7 @@ require "./lib/roger/release.rb"
 require "test/unit"
 
 module Roger
-  class ReleaseTest < Test::Unit::TestCase
+  class ReleaseTest < ::Test::Unit::TestCase
 
     def test_get_callable
       p = lambda{}

data/test/unit/resolver_test.rb

@@ -3,7 +3,7 @@ require "./lib/roger/resolver.rb"
 require "test/unit"
 
 module Roger
-  class ResolverTest < Test::Unit::TestCase
+  class ResolverTest < ::Test::Unit::TestCase
     def setup
       @base = Pathname.new(File.dirname(__FILE__) + "/../project/html")
       @resolver = Roger::Resolver.new(@base)
@@ -58,7 +58,7 @@ module Roger
 
   end
 
-  class ResolverMultipleTest < Test::Unit::TestCase
+  class ResolverMultipleTest < ::Test::Unit::TestCase
     def setup
       @base = Pathname.new(File.dirname(__FILE__) + "/../project")
       @resolver = Roger::Resolver.new([@base + "html", @base + "partials"])

data/test/unit/template_test.rb

@@ -4,7 +4,7 @@ require "./lib/roger/template.rb"
 require "test/unit"
 
 module Roger
-  class TemplateTest < Test::Unit::TestCase
+  class TemplateTest < ::Test::Unit::TestCase
     def setup
       @base = Pathname.new(File.dirname(__FILE__) + "/../project")
       @config = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,16 @@ files:
 - lib/roger/cli/generate.rb
 - lib/roger/cli/release.rb
 - lib/roger/cli/serve.rb
+- lib/roger/cli/test.rb
 - lib/roger/extractor.rb
 - lib/roger/generators.rb
 - lib/roger/generators/generator.rb
 - lib/roger/generators/new.rb
 - lib/roger/generators/templates/generator.tt
+- lib/roger/helpers/get_callable.rb
+- lib/roger/helpers/logging.rb
 - lib/roger/mockupfile.rb
 - lib/roger/project.rb
-- lib/roger/rack/html_validator.rb
 - lib/roger/rack/roger.rb
 - lib/roger/rack/sleep.rb
 - lib/roger/release.rb
@@ -182,7 +184,7 @@ files:
 - lib/roger/resolver.rb
 - lib/roger/server.rb
 - lib/roger/template.rb
-- lib/roger/w3c_validator.rb
+- lib/roger/test.rb
 - roger.gemspec
 - test/Mockupfile-syntax.rb
 - test/project/.rvmrc
@@ -205,6 +207,11 @@ files:
 - test/project/layouts/test.html.erb
 - test/project/layouts/yield.html.erb
 - test/project/lib/generators/test.rb
+- test/project/lib/tests/fail/fail.rb
+- test/project/lib/tests/noop/lib/cli.rb
+- test/project/lib/tests/noop/lib/test.rb
+- test/project/lib/tests/noop/noop.rb
+- test/project/lib/tests/succeed/succeed.rb
 - test/project/partials/formats/erb.html.erb
 - test/project/partials/partials-test.html.erb
 - test/project/partials/test/erb.html.erb
@@ -214,7 +221,8 @@ files:
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
-- test/unit/cli_test.rb
+- test/unit/cli/cli_base_test.rb
+- test/unit/cli/cli_test_test.rb
 - test/unit/generators_test.rb
 - test/unit/release/cleaner_test.rb
 - test/unit/release/finalizers/git_branch_test.rb
@@ -269,6 +277,11 @@ test_files:
 - test/project/layouts/test.html.erb
 - test/project/layouts/yield.html.erb
 - test/project/lib/generators/test.rb
+- test/project/lib/tests/fail/fail.rb
+- test/project/lib/tests/noop/lib/cli.rb
+- test/project/lib/tests/noop/lib/test.rb
+- test/project/lib/tests/noop/noop.rb
+- test/project/lib/tests/succeed/succeed.rb
 - test/project/partials/formats/erb.html.erb
 - test/project/partials/partials-test.html.erb
 - test/project/partials/test/erb.html.erb
@@ -278,7 +291,8 @@ test_files:
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
-- test/unit/cli_test.rb
+- test/unit/cli/cli_base_test.rb
+- test/unit/cli/cli_test_test.rb
 - test/unit/generators_test.rb
 - test/unit/release/cleaner_test.rb
 - test/unit/release/finalizers/git_branch_test.rb

data/lib/roger/rack/html_validator.rb

@@ -1,26 +0,0 @@
-require 'rack/request'
-require 'rack/response'
-
-module Roger
-  module Rack
-    class HtmlValidator
-      def initialize(app)
-        @app = app
-      end
-      
-      def call(env)
-        resp = @app.call(env)
-        if resp[1]["Content-Type"].to_s.include?("html")
-          str = ""
-          resp[2].each{|c| str << c}
-          validator = W3CValidator.new(str)
-          validator.validate!
-          if !validator.valid
-            env["rack.errors"].puts "Validation failed on #{env["PATH_INFO"]}: (errors: #{validator.errors}, warnings: #{validator.warnings})"
-          end
-        end
-        resp
-      end    
-    end
-  end
-end

data/lib/roger/w3c_validator.rb

@@ -1,129 +0,0 @@
-require 'cgi'
-require 'net/http'
-require 'uri'
-require 'yaml'
-
-module Roger
-  class W3CValidator
-  
-    ValidationUri = "http://validator.w3.org/check"
-    
-    class RequestError < StandardError; end
-  
-    attr_reader :valid,:response,:errors,:warnings,:status
-  
-    class << self
-      def validation_uri
-        @uri ||= URI.parse(ValidationUri)
-      end
-    end 
-  
-    def initialize(html)
-      @html = html
-    end
-  
-    def validate!
-      @status = @warnings = @errors = @response = @valid = nil
-      options = {"output" => "json"}
-      query,headers = build_post_query(options)
-      response =  self.request(:post,self.class.validation_uri.path,query,headers)
-      @status,@warnings,@errors = response["x-w3c-validator-status"],response["x-w3c-validator-warnings"].to_i,response["x-w3c-validator-errors"].to_i
-    
-      if @status == "Valid" && @warnings == 0 && @errors == 0
-        return @valid = true
-      else
-        begin
-          @response = YAML.load(response.body)
-        rescue 
-        end
-        return (@valid = (@errros == 0))
-      end
-    
-    end
-  
-    protected
-  
-    def build_post_query(options)
-      boundary = "validate-this-content-please"
-      headers = {"Content-type" => "multipart/form-data, boundary=" + boundary + " "}
-    
-      parts = []
-      options.each do |k,v|
-        parts << post_param(k,v)
-      end
-      parts << file_param("uploaded_file","index.html",@html,"text/html")
-    
-      q = parts.map{|p| "--#{boundary}\r\n#{p}"}.join("") + "--#{boundary}--"
-      [q,headers]
-    end
-  
-    def post_param(k,v)
-      "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"\r\n\r\n#{v}\r\n"
-    end
-  
-    def file_param(k,filename,content,mime_type)
-      out = []
-      out << "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"; filename=\"#{filename}\""
-      out << "Content-Transfer-Encoding: binary"
-      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       
-    end
-  
-    # Handles response and error codes from remote service.
-    def handle_response(response)
-      case response.code.to_i
-        when 301,302
-          raise "Redirect"
-        when 200...400
-          response
-        when 400
-          raise "Bad Request"
-        when 401
-          raise "Unauthorized Access"
-        when 403
-          raise "Forbidden Access"
-        when 404
-          raise "Rescoure not found"
-        when 405
-          raise "Method not allowed"
-        when 409
-          raise RequestError.new("Rescource conflict")
-        when 422
-          raise RequestError.new("Resource invalid")
-        when 401...500
-          raise "Client error"
-        when 500...600
-          raise RequestError.new("Server error")
-        else
-          raise "Unknown response: #{response.code.to_i}"
-      end
-    end
-        
-    def http
-      site = self.class.validation_uri
-      http = Net::HTTP.new(site.host, site.port)
-  #    http.use_ssl = site.is_a?(URI::HTTPS)
-  #    http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
-      http
-    end      
-  end
-end

data/test/unit/cli_test.rb

@@ -1,12 +0,0 @@
-require "./lib/roger/cli.rb"
-require "test/unit"
-
-module Roger
-  class CliTest < Test::Unit::TestCase
-
-    def test_register_generators
-      assert_includes Cli::Base.subcommands, "generate"
-    end
-
-  end
-end