work-bench 1.0.6 → 1.0.7

data/README.md

@@ -1,6 +1,6 @@
 # Workbench
 
-Workbench is a quick and simple local web server for prototyping web applications and sites. It support HAML, SASS and Compass out of the box.
+Workbench is a quick and simple local web server for prototyping web applications and sites. It supports HAML, SASS and Compass out of the box.
 
 ## Install
 
@@ -8,11 +8,11 @@ The first step is to install the gem:
 
 	gem install work-bench
 
-Workbench come with command line utility `workbench`.
+Workbench comes with command line utility `workbench`.
 
 ## Create first project
 
-Next we need create project.
+Next we need to create project.
 
 	mkdir project
 	cd project
@@ -24,7 +24,7 @@ Inside project directory run:
 
 	workbench start
 
-Now type in the browser `http://localhost:4000`. And you will see the start page.
+Now type in browser `http://localhost:4000`. And you will see the start page.
 
 ## Export prototype
 
@@ -44,13 +44,13 @@ You can specify the JS libraries to be used in your project.
 
 	workbench init --js jquery json
 
-The list of libraries available:
+List of libraries available:
 
 	workbench js
 
 ## normalize.css
 
-You may add awesome [normalize.css](https://github.com/jonathantneal/normalize.css) to project. Just use `--normalize` or `--no-normalize` in options. This feature is **enabled** by default.
+You can add awesome [normalize.css](https://github.com/jonathantneal/normalize.css) to project. Just use `--normalize` or `--no-normalize` in options. This feature is **enabled** by default.
 
 	workbench init --normalize
 

data/Rakefile

@@ -1 +1,6 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/lib/work_bench/application.rb

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

data/lib/work_bench/haml_helpers.rb

@@ -7,7 +7,7 @@ module Haml
 			template = template + '.haml'
 			template_dir = File.dirname(template)
 			basename = File.basename(template)
-			Workbench::Renderer.new(File.join(dir, template_dir, "_#{basename}")).render
+      Workbench::HamlRenderer.render File.join(dir, template_dir, "_#{basename}")
 		end
 
 	end

data/lib/work_bench/haml_renderer.rb

@@ -0,0 +1,35 @@
+module Workbench
+
+  class HamlRenderer
+
+    @options = {
+      :escape_attrs => true,
+      :attr_wrapper => '"',
+      :format => :html4
+    }
+
+    class << self
+
+      # @return [Hash] the list of options
+      attr_accessor :options
+
+      # Parse HAML file with options
+      #
+      # @param [String] filename path to file
+      # @param [Hash] options options
+      # @return [String] parsed content
+      #
+      # @example
+      #   result = Workbench::HamlRenderer.render 'index.haml', { :attr_wrapper => "'", :escape_attrs => false }
+      #
+      def render filename, options = {}
+        options = @options.merge(options)
+        Haml::Engine.new(File.read(filename), options).render
+      end
+
+    end
+
+  end
+
+end
+

data/lib/work_bench/server.rb

@@ -2,10 +2,13 @@ module Workbench
 
 	class Server
 
+    def initialize path
+      @path = path
+    end
+
 		def call(env)
 			req = Rack::Request.new(env)
-			file = File.join($root, 'haml', '/' == req.path ? 'index.haml' : req.path)
-			$file = file
+			file = File.join(@path, 'haml', '/' == req.path ? 'index.haml' : req.path)
 			ext = File.extname(file)
 			if ext.empty?
 				file = file + '.haml'
@@ -15,7 +18,7 @@ module Workbench
 				Rack::File.new(File.join($root, 'haml')).call(env)
 			else
 				if File.exists? file
-					[ 200, {'Content-Type' => 'text/html'}, [Workbench::Renderer.new(file).render] ]
+					[ 200, {'Content-Type' => 'text/html'}, [Workbench::HamlRenderer.render(file)] ]
 				else
 					[ 404, {'Content-Type' => 'text/html'}, ['File not found: '+req.path] ]
 				end

data/lib/work_bench/version.rb

@@ -1,3 +1,3 @@
 module Workbench
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/work_bench.rb

@@ -4,7 +4,7 @@ require 'work_bench/js_libs'
 require 'work_bench/application'
 require 'work_bench/cli'
 require 'work_bench/server'
-require 'work_bench/renderer'
+require 'work_bench/haml_renderer'
 require 'work_bench/haml_helpers'
 require 'work_bench/exporter'
 

data/spec/fixtures/index.haml

@@ -0,0 +1 @@
+%h1{:style => "color: red", :title => "&"} Hello world!

data/spec/haml_renderer_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Workbench::HamlRenderer do
+
+  before do
+    @root = File.dirname(__FILE__) + '/fixtures'
+  end
+
+  it 'должен рендерить HAML файл' do
+    result = Workbench::HamlRenderer.render "#{@root}/index.haml"
+    result.should == "<h1 style=\"color: red\" title=\"&amp;\">Hello world!</h1>\n"
+  end
+
+  it 'должен рендерить HAML файл с указанными опциями' do
+    result = Workbench::HamlRenderer.render "#{@root}/index.haml", { :attr_wrapper => "'", :escape_attrs => false }
+    result.should == "<h1 style='color: red' title='&'>Hello world!</h1>\n"
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+
+require 'work_bench'
+require 'rspec'

data/work_bench.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
 	s.add_development_dependency "yard"
 	s.add_development_dependency "maruku"
+  s.add_development_dependency "rspec"
 
   s.add_dependency "rack"
 	s.add_dependency "rack-test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: work-bench
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70357638679500 !ruby/object:Gem::Requirement
+  requirement: &70227779148420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357638679500
+  version_requirements: *70227779148420
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70357638679040 !ruby/object:Gem::Requirement
+  requirement: &70227779147860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357638679040
+  version_requirements: *70227779147860
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70227779147420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70227779147420
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70357638678560 !ruby/object:Gem::Requirement
+  requirement: &70227779146960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638678560
+  version_requirements: *70227779146960
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70357638678140 !ruby/object:Gem::Requirement
+  requirement: &70227779146460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638678140
+  version_requirements: *70227779146460
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70357638677640 !ruby/object:Gem::Requirement
+  requirement: &70227779145940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638677640
+  version_requirements: *70227779145940
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70357638677140 !ruby/object:Gem::Requirement
+  requirement: &70227779145380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638677140
+  version_requirements: *70227779145380
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70357638676600 !ruby/object:Gem::Requirement
+  requirement: &70227779144700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638676600
+  version_requirements: *70227779144700
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70357638676080 !ruby/object:Gem::Requirement
+  requirement: &70227779142920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638676080
+  version_requirements: *70227779142920
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &70357638675420 !ruby/object:Gem::Requirement
+  requirement: &70227779142460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638675420
+  version_requirements: *70227779142460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70357638673580 !ruby/object:Gem::Requirement
+  requirement: &70227779141900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357638673580
+  version_requirements: *70227779141900
 description: A quick and simple local web server for prototyping web applications
   with HAML, SASS and Compass support.
 email: konstantin.savelyev@gmail.com
@@ -141,10 +152,13 @@ files:
 - lib/work_bench/dependencies.rb
 - lib/work_bench/exporter.rb
 - lib/work_bench/haml_helpers.rb
+- lib/work_bench/haml_renderer.rb
 - lib/work_bench/js_libs.rb
-- lib/work_bench/renderer.rb
 - lib/work_bench/server.rb
 - lib/work_bench/version.rb
+- spec/fixtures/index.haml
+- spec/haml_renderer_spec.rb
+- spec/spec_helper.rb
 - template/Gemfile
 - template/_normalize.scss
 - template/index.haml
@@ -176,5 +190,8 @@ signing_key:
 specification_version: 3
 summary: A quick and simple local web server for prototyping web applications with
   HAML, SASS and Compass support.
-test_files: []
+test_files:
+- spec/fixtures/index.haml
+- spec/haml_renderer_spec.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/lib/work_bench/renderer.rb

@@ -1,22 +0,0 @@
-module Workbench
-
-	class Renderer
-
-		def initialize file, options = {}
-			@file = file
-			@options = {
-				:escape_attrs => true,
-				:attr_wrapper => '"',
-				:format => :html4
-			}.merge(options)
-
-		end
-
-		def render
-			engine = Haml::Engine.new(File.read(@file), @options)
-			engine.render
-		end
-
-	end
-
-end