madride 1.0.2 → 1.0.3

data/bin/madride

@@ -19,7 +19,7 @@ options = { :host => '0.0.0.0', :port => 3000, :data => {} }
 #
 
 OptionParser.new("", 24, '  ') do |opts|
-  opts.banner = "Usage: madride [options] [PATH ...]"
+  opts.banner = "Usage: madride [options] PATH [PATH ...]"
 
   opts.separator ""
   opts.separator "Options:"

data/lib/madride/environment.rb

@@ -1,4 +1,5 @@
 require "sprockets"
+require "tilt/haml"
 
 
 require "madride/templates/slim"
@@ -11,6 +12,7 @@ module Madride
       super
 
       register_engine '.slim', SlimTemplate
+      register_engine '.haml', Tilt::HamlTemplate
 
       Madride.paths.each do |path|
         append_path path
@@ -24,5 +26,11 @@ module Madride
     def locals
       @context_class.locals
     end
+
+
+    def call env
+      env['PATH_INFO'] += '.html' if File.extname(unescape(env['PATH_INFO'].to_s)).empty?
+      super
+    end
   end
 end

data/lib/madride/version.rb

@@ -1,3 +1,3 @@
 module Madride
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/madride.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "sprockets", "~> 2.4"
   gem.add_dependency "rack", "~> 1.0"
   gem.add_dependency "slim", "~> 1.2"
+  gem.add_dependency "haml", "~> 3.1"
   gem.add_dependency "sass", "~> 3.1"
 
   gem.add_development_dependency "rake", "~> 0.9"

data/spec/fixtures/pages/about/index.html.slim

@@ -0,0 +1,6 @@
+html
+  head
+    title About
+
+  body
+    h1 About

data/spec/fixtures/pages/music.html.slim

@@ -0,0 +1,6 @@
+html
+  head
+    title Music
+
+  body
+    h1 Music

data/spec/server_spec.rb

@@ -35,5 +35,26 @@ module Madride
       get "/foobar.html"
       last_response.should_not be_ok
     end
+
+
+    it "should try serve index.html for directory if exists" do
+      get "/about"
+      last_response.should be_ok
+      last_response.body.should match(%r{<title>\s*About\s*</title>})
+    end
+
+
+    it "should try serve directory as <dir>.html if such file exists" do
+      get "/music"
+      last_response.should be_ok
+      last_response.body.should match(%r{<title>\s*Music\s*</title>})
+    end
+
+
+    it "should try serve /index.html for /" do
+      get "/"
+      last_response.should be_ok
+      last_response.body.should match(%r{<title>\s*Madride Demo\s*</title>})
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madride
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +172,9 @@ files:
 - spec/fixtures/assets/app.js
 - spec/fixtures/assets/madride.js
 - spec/fixtures/data.yml
+- spec/fixtures/pages/about/index.html.slim
 - spec/fixtures/pages/index.html.slim
+- spec/fixtures/pages/music.html.slim
 - spec/fixtures/pages/music/bands.html.slim
 - spec/server_spec.rb
 - spec/spec_helper.rb
@@ -172,18 +190,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 731189075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 731189075
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: madride-1.0.2
+summary: madride-1.0.3
 test_files:
 - spec/.gitkeep
 - spec/environment_spec.rb
@@ -191,7 +215,9 @@ test_files:
 - spec/fixtures/assets/app.js
 - spec/fixtures/assets/madride.js
 - spec/fixtures/data.yml
+- spec/fixtures/pages/about/index.html.slim
 - spec/fixtures/pages/index.html.slim
+- spec/fixtures/pages/music.html.slim
 - spec/fixtures/pages/music/bands.html.slim
 - spec/server_spec.rb
 - spec/spec_helper.rb