sbsm 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5121512c837227a27ac5adae0dc1f1264a20829
-  data.tar.gz: 9088b0ec0826c8013ef29ac9e17befea18de4d4d
+  metadata.gz: dba5e15c9cf2727c59c4b7cfe76f50130e3e0ed6
+  data.tar.gz: 6e20e7c5cc26fac33046dc1163c6499a095067ee
 SHA512:
-  metadata.gz: eda614acaf8ca9a2c2fb2678f613868dd7be9364db124182e6992bfb9d514b51f035eedb832147920d98f203740d7759775486147dd93d7062b1c9471a603b33
-  data.tar.gz: 492ff66f7b38b7f78eb66328056102706f0094b524724e515b84d6ddafdffa781b64d32e9eadb473eda03a852af055dc4151d78f59151ab95e1d18369627bc06
+  metadata.gz: 5ed488a5d66ba9297899f60d6b49f56030c063d72beefa81107e82386c51e82fc535701e1c198a80e35744732704240665813909aa9a0e949fba76d5e141b926
+  data.tar.gz: 23e5429ccfc47cd67d052eab84e7d945f3bf3ffe4538bd956445fed7a8db7de7277000d6d9292e120045de1fb236feea9a1f725679c5946488173b0e999d50a9

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.8 / 8.08.2017
+
+* Fix recognizing mime type for unusual extensions
+
 === 1.5.7 / 8.08.2017
 
 * Return nice 404 error for non existing files

data/lib/sbsm/app.rb

@@ -108,8 +108,8 @@ module SBSM
       end
 
       if File.file?(file_name)
-        if File.extname(file_name).length > 0
-          mime_type = MimeMagic.by_extension(File.extname(file_name)).type
+        if File.extname(file_name).length > 0 && (mime_info = MimeMagic.by_extension(File.extname(file_name)))
+          mime_type = mime_info.type
         else
           mime_type = MimeMagic.by_path(file_name)
         end

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.5.7'
+  VERSION = '1.5.8'
 end

data/test/test_application.rb

@@ -75,6 +75,48 @@ class AppVariantTest < Minitest::Test
     assert last_response.headers.keys.index('Content-Type')
     assert_equal('text/html', last_response.headers['Content-Type'])
   end
+  def test_request_file_with_no_mime_info
+    session_id_mock  = '1234'
+    invalid_path = '/window.js.map.dummy'
+    file_name = File.expand_path(File.join('doc', invalid_path))
+    FileUtils.makedirs(File.dirname(file_name))
+    File.open(file_name, 'w+') {|f| f.puts 'dummy'}
+
+    @app = flexmock('file_app', @app)
+    env = { 'HTTP_COOKIE' => "_session_id=#{session_id_mock}" }
+    session_store = SBSM::SessionStore.new(app: @app)
+    session_mock= flexmock('session', session_store[session_id_mock.to_s])
+    session_mock.should_receive(:get_passthru).and_return([invalid_path])
+    @app.should_receive(:session_store).and_return(session_store)
+
+    result = get invalid_path, {},  env
+
+    assert_equal(true, last_response.ok?)
+    assert last_response.headers.keys.index('Content-Type')
+    assert_equal('text/plain', last_response.headers['Content-Type'])
+    FileUtils.rm(file_name)
+  end
+  def test_request_file_with_mime_info
+    session_id_mock  = '1234'
+    invalid_path = '/window.png'
+    file_name = File.expand_path(File.join('doc', invalid_path))
+    FileUtils.makedirs(File.dirname(file_name))
+    File.open(file_name, 'w+') {|f| f.puts 'dummy'}
+
+    @app = flexmock('file_app', @app)
+    env = { 'HTTP_COOKIE' => "_session_id=#{session_id_mock}" }
+    session_store = SBSM::SessionStore.new(app: @app)
+    session_mock= flexmock('session', session_store[session_id_mock.to_s])
+    session_mock.should_receive(:get_passthru).and_return([invalid_path])
+    @app.should_receive(:session_store).and_return(session_store)
+
+    result = get invalid_path, {},  env
+
+    assert_equal(true, last_response.ok?)
+    assert last_response.headers.keys.index('Content-Type')
+    assert_equal('image/png', last_response.headers['Content-Type'])
+    FileUtils.rm(file_name)
+  end
 end
 
 class AppTestSimple < Minitest::Test
@@ -133,6 +175,7 @@ class AppTestSimple < Minitest::Test
     get '/sbsm.css'
     assert last_response.ok?
     assert_match css_content, last_response.body
+    FileUtils.rm(css_file)
   end
   def test_session_about_then_home
     skip ('TODO: We should test test_post_feedback')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz