work-bench 1.0.8 → 1.0.9

data/lib/work_bench/application.rb

@@ -35,7 +35,7 @@ module Workbench
 				use Sass::Plugin::Rack
 				use Rack::StaticCache, :urls => [ '/css', '/js', '/img', '/favicon.ico' ], :root => './public', :versioning => false
 
-				run Workbench::Server.new path
+				run Workbench::DynamicHandler.new path
 			}.to_app
 		end
 

data/lib/work_bench/dynamic_handler.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+module Workbench
+
+  # Класс для обработки запросов к нестатическим файлам
+	class DynamicHandler
+
+    # @param [String] path текущий каталог
+    def initialize path
+      @path = path
+    end
+
+    # Вызывается на каждый нестатический запрос
+		def call(env)
+			req = Rack::Request.new(env)
+      filename = File.join(@path, 'haml', resolve_file(req.path))
+      file_ext = File.extname(filename)
+			if File.exists?(filename) && '.haml' != file_ext
+				Rack::File.new(File.join(@path, 'haml')).call(env)
+			else
+				if File.exists? filename
+					[ 200, {'Content-Type' => 'text/html'}, [Workbench::HamlRenderer.render(filename)] ]
+				else
+					[ 404, {'Content-Type' => 'text/html'}, ['File not found: '+req.path] ]
+				end
+			end
+    end
+
+    private
+
+      # Переопределяет запрос
+      #
+      # @param [String] filename файл,который нужно переопределить
+      def resolve_file filename
+        filename = '/' == filename ? '/index.haml' : filename
+        file_ext = File.extname(filename)
+        if ['.html', '.htm', ''].include? file_ext
+          filename = File.join(File.dirname(filename), File.basename(filename, file_ext) + '.haml')
+        end unless File.exists? File.join(@path, 'haml', filename)
+        filename
+      end
+
+	end
+
+end

data/lib/work_bench/version.rb

@@ -1,3 +1,3 @@
 module Workbench
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/lib/work_bench.rb

@@ -3,7 +3,7 @@ require 'work_bench/dependencies'
 require 'work_bench/js_libs'
 require 'work_bench/application'
 require 'work_bench/cli'
-require 'work_bench/server'
+require 'work_bench/dynamic_handler'
 require 'work_bench/haml_renderer'
 require 'work_bench/haml_helpers'
 require 'work_bench/exporter'

data/spec/dynamic_handler_spec.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Workbench::DynamicHandler do
+
+  before do
+    root = File.dirname(__FILE__) + '/fixtures/project'
+    @server = Workbench::DynamicHandler.new root
+  end
+
+  it '/data.js => /data.js if exists' do
+    @server.instance_eval {
+      resolve_file('/data.js').should == '/data.js'
+    }
+  end
+
+  it '/index.html => /index.html if exists' do
+    @server.instance_eval {
+      resolve_file('/index.html').should == '/index.html'
+    }
+  end
+
+  it '/ => /index.haml' do
+    @server.instance_eval {
+      resolve_file('/').should == '/index.haml'
+    }
+  end
+
+  it '/index => /index.haml' do
+    @server.instance_eval {
+      resolve_file('/index').should == '/index.haml'
+    }
+  end
+
+  it '/test.html => /test.haml if file not exists' do
+    @server.instance_eval {
+      resolve_file('/test.html').should == '/test.haml'
+    }
+  end
+
+  it '/index.htm => /index.haml' do
+    @server.instance_eval {
+      resolve_file('/index.htm').should == '/index.haml'
+    }
+  end
+
+end

data/spec/fixtures/project/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gem 'work-bench', :path => File.join(File.dirname(__FILE__), '..', '..', '..')

data/spec/fixtures/project/haml/data.js1

@@ -0,0 +1 @@
+{}

data/spec/fixtures/project/haml/index.haml

@@ -0,0 +1,10 @@
+!!! Strict
+%html
+	%head
+		%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+		%title Example project
+		%script{:src => "/js/jquery.js", :type => "text/javascript"}
+		%script{:src => "/js/scripts.js", :type => "text/javascript"}
+		%link{:href => "/css/style.css", :media => "all", :rel => "stylesheet", :type => "text/css"}
+	%body
+		%h1 Hi there!

data/spec/fixtures/project/haml/index.html

@@ -0,0 +1 @@
+Hello!

data/spec/fixtures/project/public/css/style.css

@@ -0,0 +1,68 @@
+/* normalize.css 2011-07-06T20:20 UTC //github.com/jonathantneal/normalize.css */
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
+
+html { cursor: default; font-size: 100%; overflow-y: scroll; -webkit-tap-highlight-color: transparent; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; }
+
+body, form, input, button, select, textarea { font-size: 100%; margin: 0; }
+
+a, a:active, a:hover { outline: none; }
+
+a:focus { outline: thin dotted; }
+
+abbr { _border-bottom: expression(this.title ? '1px dotted':'none'); }
+
+abbr[title] { border-bottom: 1px dotted; }
+
+b, strong { font-weight: bold; }
+
+dfn { font-style: italic; }
+
+mark { background: #FF0; color: #000; }
+
+pre, code, kbd, samp { font-family: monospace,monospace; _font-family: 'courier new',monospace; font-size: 1em; }
+
+pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
+
+q { quotes: none; }
+
+q:before, q:after { content: ''; content: none; }
+
+small, sub, sup { font-size: 75%; }
+
+sub, sup { line-height: 0; position: relative; vertical-align: baseline; }
+
+sup { top: -0.5em; }
+
+sub { bottom: -0.25em; }
+
+nav ul { list-style: none; }
+
+audio[controls], canvas, video { display: inline-block; *display: inline; }
+
+audio { display: none; _display: expression(this.controls ? 'inline':'none'); *zoom: 1; }
+
+audio[controls] { display: inline-block; }
+
+img { border: 0; -ms-interpolation-mode: bicubic; }
+
+svg:not(:root) { overflow: hidden; }
+
+legend { *margin-left: -7px; }
+
+button, input, select, textarea { -webkit-appearance: none; border-radius: 0; vertical-align: baseline; *vertical-align: middle; }
+
+button, input { line-height: normal; _overflow: expression(this.type == 'button|reset|submit' ? 'visible':''); }
+
+button, input[type="button"], input[type="reset"], input[type="submit"] { overflow: visible; }
+
+input[type="checkbox"], input[type="radio"] { box-sizing: border-box; }
+
+input[type="search"] { -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
+
+input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
+
+button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
+
+textarea { overflow: auto; vertical-align: top; }
+
+table { border-collapse: collapse; border-spacing: 0; }