sbsm 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a8722212167245c5eeb0f815ce55ab4a8b5f26
-  data.tar.gz: cb34a3a4e5c55777f7117b11900843af53c37507
+  metadata.gz: d4c300971692a328081c6b56bd30d327fdb02252
+  data.tar.gz: dcd9b428233ca4fb56e372a76601c8e289a280ac
 SHA512:
-  metadata.gz: 08707c20af9d5773bba1402821749678c20faef1802cfdadc42afe9d4e88a1f9f5f9cf98d699b3bb2138e3426c914911191db4f91d49643c4758e8a1803a201f
-  data.tar.gz: 465218dd2bff67fe3a10d540ef978da1dce9d45c8e5f41b58ff0fb35a8c276948bcd5ce0b47743fb3c550010ca42cbca920599d8cb2d4360b85a2e9a6c9da55d
+  metadata.gz: 9100a0913b65ca6f7fc7b3a39cf9f6ecd026a2bc92e785dd4f5a462f20a6212bbcb78509b7391c2a1df67c55d3f6a0354282fd554ff34ceafa393a4e8a228958
+  data.tar.gz: b31394abfa5c3ff78f2cdbb640e5fbf7a92c4300dc07969397d5d6d09ffa8f855eefccb5da99d4745bbdea83e950a1bca0cd99270ea6e2bdee568dfce1a36a0e

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.3.0 / 08.08.2016
+* Add a support to avoid offline mode by CGI.new in test purpose
+
 === 1.2.9 / 20.07.2016
 * Remove ARGV violation
 

data/lib/sbsm/cgi.rb

@@ -27,6 +27,21 @@ require 'cgi'
 require 'drb/drb'
 
 class CGI
+  # Lets satisfy cgi-offline prompt, even if request does not have
+  # REQUEST_METHOD. (It must be mostly for test purpose).
+  # See http://ruby-doc.org/stdlib-2.3.1/libdoc/cgi/rdoc/CGI.html#method-c-new
+  def self.initialize_without_offline_prompt(*args)
+    cgi_input = true
+    unless ENV.has_key?('REQUEST_METHOD')
+      cgi_input = false
+      ENV['REQUEST_METHOD'] = 'GET'
+    end
+    cgi = CGI.new(*args)
+    unless cgi_input
+      ENV.delete('REQUEST_METHOD')
+    end
+    cgi
+  end
 	module TagMaker
     def nOE_element_def(element, append = nil)
       s = <<-END

data/lib/sbsm/request.rb

@@ -38,7 +38,7 @@ module SBSM
     include DRbUndumped
     attr_reader :cgi
     def initialize(drb_uri, html_version = "html4", cgiclass = CGI)
-      @cgi = cgiclass.new(html_version)
+      @cgi = CGI.initialize_without_offline_prompt('html4')
 			@drb_uri = drb_uri
 			@thread = nil
 			@request = Apache.request

data/lib/sbsm/session.rb

@@ -36,7 +36,7 @@ require 'delegate'
 module SBSM
   class	Session < SimpleDelegator
 		attr_reader :user, :active_thread, :app, :key, :cookie_input,
-			:unsafe_input, :valid_input, :request_path
+			:unsafe_input, :valid_input, :request_path, :cgi
 		include DRbUndumped
 		PERSISTENT_COOKIE_NAME = "sbsm-persistent-cookie"
 		DEFAULT_FLAVOR = 'sbsm'
@@ -50,7 +50,6 @@ module SBSM
 		CAP_MAX_THRESHOLD = 8
 		MAX_STATES = 4
 		SERVER_NAME = nil
-		@@cgi = CGI.new('html4')
     def Session.reset_stats
       @@stats = {}
     end
@@ -100,8 +99,7 @@ module SBSM
 			@unknown_user_class = @user.class
 			@variables = {}
       @mutex = Mutex.new
-		  #ARGV.push('') # satisfy cgi-offline prompt
-      #@cgi = CGI.new('html4')
+      @cgi = CGI.initialize_without_offline_prompt('html4')
 			super(app)
     end
     def age(now=Time.now)
@@ -132,9 +130,6 @@ module SBSM
 			@active_thread = nil
 			true
 		end
-    def cgi
-      @@cgi
-    end
     @@msie_ptrn = /MSIE/
     @@win_ptrn = /Win/i
 		def client_activex?
@@ -444,7 +439,7 @@ module SBSM
       self
     end
 		def to_html
-			@state.to_html(@@cgi)
+			@state.to_html(cgi)
     rescue DRb::DRbConnError
       raise
 		rescue StandardError => err

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.2.9'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack