zassets 0.2.6 → 0.2.7

data/lib/zassets/server.rb

@@ -39,11 +39,18 @@ module ZAssets
         end
 
         map '/' do
+          static_files = Rack::File.new config[:public_path]
+
           if config[:public_file]
-            file = File.new(File.join(config[:public_path], config[:public_file]))
-            run MemoryFile.new file
+            run Rack::Cascade.new([
+              static_files,
+              MemoryFile.new(File.new(File.join(
+                config[:public_path],
+                config[:public_file]
+              )))
+            ])
           else
-            run Rack::File.new config[:public_path]
+            run static_files
           end
         end
       end

data/lib/zassets/version.rb

@@ -1,3 +1,3 @@
 module ZAssets
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/spec/zassets/server_spec.rb

@@ -56,14 +56,14 @@ module ZAssets
         let(:response)  { app.get path }
 
         it 'logs queries' do
-          expect(app.get('/').errors).to match(/GET \/.+404.+/)
+          expect(response.errors).to match(/GET \/.+404.+/)
         end
 
         it 'shows exceptions' do
           allow_any_instance_of(SprocketsEnv).to receive(:call) { raise RuntimeError }
           response = app.get(config[:base_url])
           expect(response).to be_server_error
-          expect(response).to match /RuntimeError/
+          expect(response.body).to match /RuntimeError/
         end
 
         context 'assets mount point' do
@@ -101,6 +101,13 @@ module ZAssets
                 expect(response.body).to eq "hello HTML!\n"
               end
             end
+
+            it 'serves static file' do
+              within_fixture_path do
+                response = app.get('/hello.txt')
+                expect(response.body).to eq "hello!\n"
+              end
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zassets
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -253,7 +253,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: zassets-0.2.6
+summary: zassets-0.2.7
 test_files:
 - spec/fixtures/assets/app.js
 - spec/fixtures/config/zassets.yaml