sbsm 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9709fd562058b81d1408b0bc88142076bddad4f5
-  data.tar.gz: 2976e9b526e9112093bd5aab2993abd5e385eec1
+  metadata.gz: 195e691643098516de7272f4711801f6bbfb012d
+  data.tar.gz: 6b57c1b95ac68366e1317d3ed0c4d1416d675b9f
 SHA512:
-  metadata.gz: ddcbee6256f6fe7d1c19512b7c03c4291988968c0730e8cf53717f2b59f5a2b004cc9abfe21ea124030d7f36c1522f4f399d9936b265db2e7fb50566cda7d29c
-  data.tar.gz: 1d5e713387d3a460bd6beccf6003836f438d7c65dbd2ea84ea4213e2c6b593ee3a1ea14b3825912e57c1ed4e97f03139f43e630562ecf7031ba3d51328d709d7
+  metadata.gz: aa5411f5e681b34778dd6b9e0f8af3c5b02b4ecb75e531e7d7c566bf12ebae590893d46cb229e8b2bca152f79f365cf577c5fcef05109b6149fbd797fd9ce47e
+  data.tar.gz: 7c5f4d61ec5221ab3ec5e99234977d62c71dc3b4d987bd8f97e4bb1dab798ce98d91e126d9db53d7764a3c3a45f84176e89b634f6825b9de4c1ceab28447ad87

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.2 / 15.11.2016
+* Requires the drb_uri-parameter when creating an app
+* Determine the MIME-Type of all returned files by their ending using gem mimemagic
+
 === 1.3.1 / 9.11.2016
 * Moved from mod_ruby to using webrick/rack interface
 * Incompatible changes to 1.3.0 are that all trans_handlers must be fixed, as the parameters are

data/lib/sbsm/app.rb

@@ -28,6 +28,8 @@ require 'cgi/session'
 require 'sbsm/cgi'
 require 'cgi/drbsession'
 require 'sbsm/drbserver'
+require 'mimemagic'
+
 module SBSM
   ###
   # App a base class for Webrick server
@@ -36,7 +38,7 @@ module SBSM
     PERSISTENT_COOKIE_NAME = "cookie-persistent-sbsm-1.3.1"
     SBSM.info "PERSISTENT_COOKIE_NAME #{PERSISTENT_COOKIE_NAME}"
 
-    attr_reader :sbsm, :my_self, :validator
+    attr_reader :sbsm, :my_self, :trans_handler, :validator, :drb_uri
 
     OPTIONS = [ :app, :config_file, :trans_handler, :validator, :persistence_layer, :server_uri, :session, :unknown_user ]
     COOKIE_ID = 'sbsm-persistent-cookie-id'
@@ -58,11 +60,12 @@ module SBSM
     # Look at steinwies.ch
     # * https://github.com/zdavatz/steinwies.ch (simple, mostly static files, one form, no persistence layer)
     #
-    def initialize(app:, validator:, trans_handler:, persistence_layer: nil)
+    def initialize(app:, validator:, trans_handler:, drb_uri:, persistence_layer: nil)
       @app = app
+      @drb_uri = drb_uri
       @trans_handler = trans_handler
       @validator = validator
-      SBSM.info "initialize @app is now #{@app.class} validator #{validator} th #{trans_handler} "
+      SBSM.info "initialize @app is now #{@app.class} validator #{validator} th #{trans_handler} drb_uri #{drb_uri}"
       super(persistence_layer)
     end
 
@@ -74,13 +77,12 @@ module SBSM
       else
         session_id = rand((2**(0.size * 8 -2) -1)*10240000000000).to_s(16)
       end
+
       file_name = File.expand_path(File.join('doc', request.path))
       if File.file?(file_name)
-        if /css/i.match(File.basename(file_name))
-          response.set_header('Content-Type', 'text/css')
-        else
-          response.set_header('Content-Type', 'text/plain')
-        end
+        mime_type = MimeMagic.by_extension(File.extname(file_name)).type
+        SBSM.info "file_name is #{file_name} checkin base #{File.basename(file_name)} MIME #{mime_type}"
+        response.set_header('Content-Type', mime_type)
         response.write(File.open(file_name, File::RDONLY){|file| file.read})
         return response
       end

data/lib/sbsm/logger.rb

@@ -25,8 +25,7 @@
 require 'chrono_logger'
 require 'sbsm/version'
 module SBSM
-  @@logger = ChronoLogger.new("/tmp/sbsm_#{VERSION}.log.%Y%m%d")
-  @@logger.level= :warn
+  @@logger = nil
   def self.logger=(logger)
     @@logger = logger
   end

data/lib/sbsm/session.rb

@@ -103,7 +103,7 @@ module SBSM
 			@variables = {}
       @mutex = Mutex.new
       @cgi = CGI.initialize_without_offline_prompt('html4')
-      SBSM.debug "session initialized #{self} key #{key} app #{app.class}  #{validator.class} with @cgi #{@cgi}"
+      SBSM.debug "session initialized #{self} key #{key} app #{app.class}  #{@validator.class} th #{@trans_handler.class} with @cgi #{@cgi}"
 			super(app)
     end
     def age(now=Time.now)

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/sbsm.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack'
   spec.add_dependency 'mail'
   spec.add_dependency 'hpricot'
+  spec.add_dependency 'mimemagic'
   spec.add_dependency 'chrono_logger'
 
   spec.add_development_dependency "bundler"

data/test/simple_sbsm.rb

@@ -201,7 +201,7 @@ module Demo
     def initialize
       @drb_uri = SERVER_URI
       SBSM.info "SimpleSBSM.new"
-      super(:app => self, :validator => Validator.new, :trans_handler => SBSM::TransHandler.instance)
+      super(:app => self, :validator => Validator.new, :trans_handler => SBSM::TransHandler.instance, :drb_uri => SERVER_URI)
     end
   end
 end

data/test/test_application.rb

@@ -38,10 +38,11 @@ class MyTest < MiniTest::Unit::TestCase
         last_response.set_cookie SBSM::App::PERSISTENT_COOKIE_NAME, :value => "second_cookie"
     end
     assert last_response.ok?
-    skip 'We must add here an input form or we cannot continue testing'
     assert_match FEEDBACK_HTML_CONTENT, last_response.body
     page = Nokogiri::HTML(last_response.body)
     x = page.css('div')
+    skip 'We must add here an input form or we cannot continue testing'
+
     assert  page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value
     state_id = page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value.to_i
     assert state_id > 0

data/test/test_logger.rb

@@ -27,6 +27,7 @@
 
 require 'minitest/autorun'
 require 'fileutils'
+require 'tempfile'
 require 'sbsm/logger'
 begin
   require 'pry'
@@ -34,43 +35,25 @@ rescue LoadError
 end
 class TestLogger < Minitest::Test
   def setup
-    @saved_loger = SBSM.logger.clone
-    @default_name = Time.now.strftime("/tmp/sbsm_#{SBSM::VERSION}.log.%Y%m%d")
-    FileUtils.rm_f(@default_name)
+    @saved_loger = SBSM.logger ? SBSM.logger : nil
+    @temp_file = Tempfile.new('foo')
+    @temp_file.write("TestLogger TempFile")
+    @temp_file.flush
+    @default_name = @temp_file.path
     # we reload the logger class as it initializes the logger to a default value
     load 'sbsm/logger.rb'
-    assert(File.exist?(@default_name))
   end
   def teardown
     SBSM.logger= @saved_loger
+    @temp_file.unlink
   end
 
-  def test_default_levels
+  def test_default_levels_with_no_loggin
     saved_length = File.size(@default_name)
     SBSM.debug("debug #{__LINE__}")
     assert_equal(saved_length, File.size(@default_name))
     SBSM.info("info #{__LINE__}")
     assert_equal(saved_length, File.size(@default_name))
-
-    SBSM.logger.level = :info
-    SBSM.info("info #{__LINE__}")
-    assert(saved_length < File.size(@default_name))
-    saved_length = File.size(@default_name)
-    SBSM.debug("debug #{__LINE__}")
-    saved_length = File.size(@default_name)
-
-    SBSM.logger.level = :debug
-    SBSM.info("info #{__LINE__}")
-    assert(saved_length < File.size(@default_name))
-    saved_length = File.size(@default_name)
-    SBSM.debug("debug #{__LINE__}")
-    assert(saved_length < File.size(@default_name))
-
-    saved_length = File.size(@default_name)
-    SBSM.logger.level = :warn
-    SBSM.info("info #{__LINE__}")
-    SBSM.debug("debug #{__LINE__}")
-    assert_equal(saved_length, File.size(@default_name))
   end
 
   def test_change_logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chrono_logger
   requirement: !ruby/object:Gem::Requirement