mascut 0.0.6 → 0.0.7

data/HISTORY.rdoc

@@ -1,3 +1,6 @@
+= 0.0.7
+* bug fix
+
 = 0.0.6
 * auto haml, sass translate support
 

data/Rakefile

@@ -24,12 +24,12 @@ end
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
+  spec.libs << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+  spec.libs << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/mascut/mascut.rb

@@ -14,8 +14,14 @@ module Mascut
         status, headers, body = @app.call(env)
         if status == 200 and headers['Content-Type'] =~ /^text\/html/
           body = [ File.read(body.path) ] if body.is_a?(Rack::File)
-          body.map! {|html| mascutize(html) }
-          headers['Content-Length'] = body.to_a.inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
+          if body.kind_of?(Rack::Response)
+            # this code is not well considered
+            body.body = mascutize(body.body)
+            headers['Content-Length'] = body.length.to_s
+          else
+            body.map! {|html| mascutize(html) }
+            headers['Content-Length'] = body.to_a.inject(0) {|len, part| len + Rack::Utils.bytesize(part) }.to_s
+          end
         end
 
         [ status, headers, body ]
@@ -28,7 +34,7 @@ module Mascut
       catch :reload do
         loop do 
           @files.each {|file| throw(:reload, 'reload') if File.exist?(file) and now < File.mtime(file) }
-          sleep (@opts[:interval] || 1.0)
+          sleep(@opts[:interval] || 1.0)
         end
       end
       

data/spec/mascut/hamlth_spec.rb

@@ -2,22 +2,22 @@ require File.join(File.dirname(__FILE__), %w[ .. spec_helper ])
 
 shared_examples_for 'hamlize PATH_INFO' do
   before do
-    stub(File).exist?(path) { true }
+    stub(File).exist?(file) { true }
   end
   
   it 'should hamlize PATH_INFO' do
-    mock(middleware).hamlize(path) { 'haml' }
+    mock(middleware).hamlize(file) { 'haml' }
     subject
   end
 end
 
 shared_examples_for 'sassize PATH_INFO' do
   before do
-    stub(File).exist?(path) { true }
+    stub(File).exist?(file) { true }
   end
   
   it 'should hamlize PATH_INFO' do
-    mock(middleware).sassize(path) { 'sass' }
+    mock(middleware).sassize(file) { 'sass' }
     subject
   end
 end
@@ -26,11 +26,12 @@ describe Mascut::Hamlth, '#call' do
   let(:app) { mock }
   let(:middleware) { Mascut::Hamlth.new(app) }
   let(:env) { { 'PATH_INFO' => path } }
+  let(:file) { path[1..-1] }
   
   subject { middleware.call(env) }
   
   context 'for *.html' do
-    let(:path) { 'hoge.html' }
+    let(:path) { '/hoge.html' }
 
     context 'when *.html exists' do
       it_should_behave_like 'hamlize PATH_INFO'
@@ -38,7 +39,7 @@ describe Mascut::Hamlth, '#call' do
 
     context 'when *.haml exists' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
         stub(File).exist?('hoge.haml') { true }
       end
 
@@ -50,7 +51,7 @@ describe Mascut::Hamlth, '#call' do
 
     context 'neighter exists' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
         stub(File).exist?('hoge.haml') { false }
       end
 
@@ -62,7 +63,8 @@ describe Mascut::Hamlth, '#call' do
   end
 
   context 'for *.haml' do
-    let(:path) { 'hoge.haml' }
+    let(:path) { '/hoge.haml' }
+    let(:file) { path[1..-1] }
 
     context 'when *.haml exists' do
       it_should_behave_like 'hamlize PATH_INFO'
@@ -70,7 +72,7 @@ describe Mascut::Hamlth, '#call' do
 
     context '*.haml does not exist' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
       end
 
       it 'should move on to next app' do
@@ -81,7 +83,8 @@ describe Mascut::Hamlth, '#call' do
   end
 
   context 'for *.css' do
-    let(:path) { 'hoge.css' }
+    let(:path) { '/hoge.css' }
+    let(:file) { path[1..-1] }
     
     context 'when *.css exists' do
       it_should_behave_like 'sassize PATH_INFO'
@@ -89,7 +92,7 @@ describe Mascut::Hamlth, '#call' do
 
     context 'when *.sass exists' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
         stub(File).exist?('hoge.sass') { true }
       end
 
@@ -101,7 +104,7 @@ describe Mascut::Hamlth, '#call' do
 
     context 'neighter exists' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
         stub(File).exist?('hoge.sass') { false }
       end
 
@@ -113,7 +116,8 @@ describe Mascut::Hamlth, '#call' do
   end
 
   context 'for *.sass' do
-    let(:path) { 'hoge.sass' }
+    let(:path) { '/hoge.sass' }
+    let(:file) { path[1..-1] }
 
     context 'when *.sass exists' do
       it_should_behave_like 'sassize PATH_INFO'
@@ -121,7 +125,7 @@ describe Mascut::Hamlth, '#call' do
 
     context '*.sass does not exist' do
       before do
-        stub(File).exist?(path) { false }
+        stub(File).exist?(file) { false }
       end
 
       it 'should move on to next app' do

data/spec/mascut/mascut_spec.rb

@@ -62,7 +62,7 @@ describe Mascut::Mascut, '#call' do
       end
 
       it 'should add updated content length' do
-        stub(middleware).mascutize(html) { '12characters' }
+        stub(middleware).mascutize { '12characters' }
         subject[1].should include('Content-Length' => 12.to_s )
       end
 
@@ -71,6 +71,10 @@ describe Mascut::Mascut, '#call' do
         subject[2].should == [ 'mascutized' ]
       end
     end
+
+    context 'if app returns a kind of Rack::Response' do
+      it 'should have specs'
+    end
     
     [ [ 201, { 'Content-Type' => 'text/html' }, [ 'html' ] ],
       [ 200, { 'Content-Type' => 'text/css'  }, [ 'css'  ] ],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - okitan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +09:00
+date: 2010-05-28 00:00:00 +09:00
 default_executable: mascut
 dependencies: 
 - !ruby/object:Gem::Dependency