watobo 0.9.19 → 0.9.20

data/lib/watobo/utils/print_debug.rb

@@ -1,35 +1,23 @@
-# .
+#.
 # print_debug.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # @private 
-module Watobo#:nodoc: all
-  def self.print_debug(*m)
-    fl = m.shift
-    puts "#"
-    puts "# #{fl} #"
-    if m.length > 0
-      m.each do |l|
-        puts l
-      end
-      puts "# " + "-"*fl.length + " #"
-    end
-  end
+module Watobo#:nodoc: all
+  def self.print_debug(*m)
+    fl = m.shift
+    puts "#"
+    puts "# #{fl} #"
+    if m.length > 0
+      m.each do |l|
+        puts l
+      end
+      puts "# " + "-"*fl.length + " #"
+    end
+  end
 end

data/lib/watobo/utils/response_builder.rb

@@ -1,113 +1,101 @@
-# .
+#.
 # response_builder.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
-# @private 
-module Watobo#:nodoc: all
-  module Utils
-      def self.string2response( text, opts = {} )
-        options = { :update_content_length => false }
-        options.update opts
-        begin
-          hb_sep = "\r\n\r\n"
-          eoh = text.index(hb_sep)
-          if eoh.nil?
-            hb_sep = "\n\n"
-            eoh = text.index(hb_sep)
-          end
-          unless eoh.nil?
-          raw_header = text[0..eoh-1]
-          raw_body = text[eoh+hb_sep.length..-1]
-          puts ">> RawBody: #{raw_body}"
-          else
-            raw_header = text
-            raw_body = nil
-          end
-
-          response = raw_header.split("\n")
-          response.map!{|r| "#{r.strip}\r\n" }
-         # Watobo::Response.create response
-          unless raw_body.nil?
-          response << "\r\n"
-          response << raw_body unless raw_body.strip.empty?
-          end
-          #return response
-          return Watobo::Response.new(response)
-
-        rescue => bang
-          puts bang
-          puts bang.backtrace
-        end
-        return nil
-    end
-  end
-end
-
-if $0 == __FILE__
-  inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
-  $: << inc_path
-
-  require 'watobo'
-  
-text =<<'EOF'
-HTTP/1.1 200 OK
-Content-Type: text/html
-Vary: Accept-Encoding
-Expires: Thu, 19 Jul 2012 06:57:20 GMT
-Cache-Control: max-age=0, no-cache, no-store
-Pragma: no-cache
-Date: Thu, 19 Jul 2012 06:57:20 GMT
-Content-Length: 203
-Connection: close
-
-<html></html>
-EOF
-
-text2 ="HTTP/1.1 200 OK\r\n" +
-"Content-Type: text/html\r\n" +
-"Vary: Accept-Encoding\r\n" +
-"Expires: Thu, 19 Jul 2012 06:57:20 GMT\r\n" +
-"Cache-Control: max-age=0, no-cache, no-store\r\n" +
-"Pragma: no-cache\r\n" +
-"Date: Thu, 19 Jul 2012 06:57:20 GMT\r\n" +
-"Content-Length: 203\r\n" +
-"Connection: close\r\n\r\n" +
-"<html></html>\r\n"
-
-unless ARGV[0].nil?
-if File.exist? ARGV[0]
-  text = File.open(ARGV[0],"rb").read
-end
-end
-r = Watobo::Utils.string2response text
-puts r.class
-puts r.status
-puts r.content_type
-puts r
-puts
-puts "="
-puts 
-r = Watobo::Utils.string2response text2
-puts r.class
-puts r.status
-puts r.content_type
-puts r
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+# @private 
+module Watobo#:nodoc: all
+  module Utils
+      def self.string2response( text, opts = {} )
+        options = { :update_content_length => false }
+        options.update opts
+        begin
+          hb_sep = "\r\n\r\n"
+          eoh = text.index(hb_sep)
+          if eoh.nil?
+            hb_sep = "\n\n"
+            eoh = text.index(hb_sep)
+          end
+          unless eoh.nil?
+          raw_header = text[0..eoh-1]
+          raw_body = text[eoh+hb_sep.length..-1]
+          puts ">> RawBody: #{raw_body}"
+          else
+            raw_header = text
+            raw_body = nil
+          end
+
+          response = raw_header.split("\n")
+          response.map!{|r| "#{r.strip}\r\n" }
+         # Watobo::Response.create response
+          unless raw_body.nil?
+          response << "\r\n"
+          response << raw_body unless raw_body.strip.empty?
+          end
+          #return response
+          return Watobo::Response.new(response)
+
+        rescue => bang
+          puts bang
+          puts bang.backtrace
+        end
+        return nil
+    end
+  end
+end
+
+if $0 == __FILE__
+  inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+  $: << inc_path
+
+  require 'watobo'
+  
+text =<<'EOF'
+HTTP/1.1 200 OK
+Content-Type: text/html
+Vary: Accept-Encoding
+Expires: Thu, 19 Jul 2012 06:57:20 GMT
+Cache-Control: max-age=0, no-cache, no-store
+Pragma: no-cache
+Date: Thu, 19 Jul 2012 06:57:20 GMT
+Content-Length: 203
+Connection: close
+
+<html></html>
+EOF
+
+text2 ="HTTP/1.1 200 OK\r\n" +
+"Content-Type: text/html\r\n" +
+"Vary: Accept-Encoding\r\n" +
+"Expires: Thu, 19 Jul 2012 06:57:20 GMT\r\n" +
+"Cache-Control: max-age=0, no-cache, no-store\r\n" +
+"Pragma: no-cache\r\n" +
+"Date: Thu, 19 Jul 2012 06:57:20 GMT\r\n" +
+"Content-Length: 203\r\n" +
+"Connection: close\r\n\r\n" +
+"<html></html>\r\n"
+
+unless ARGV[0].nil?
+if File.exist? ARGV[0]
+  text = File.open(ARGV[0],"rb").read
+end
+end
+r = Watobo::Utils.string2response text
+puts r.class
+puts r.status
+puts r.content_type
+puts r
+puts
+puts "="
+puts 
+r = Watobo::Utils.string2response text2
+puts r.class
+puts r.status
+puts r.content_type
+puts r
+
 end

data/lib/watobo/utils/response_hash.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # response_hash.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 require 'digest/md5'
 
 # @private 
@@ -145,6 +133,7 @@ module Watobo#:nodoc: all
           Watobo::Response.create response
           end
           response.removeHeader("Date")
+          response.removeHeader("Set-Cookie")
         return response, Digest::MD5.hexdigest(response.join)
         end
       rescue => bang

data/lib/watobo/utils/secure_eval.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # secure_eval.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # @private 
 module Watobo#:nodoc: all
   module Utils
@@ -27,8 +15,8 @@ module Watobo#:nodoc: all
       result = nil
       t = Thread.new(exp) { |e|
         e.untaint
-     #   $SAFE = 3
-        $SAFE = 4 # does not work here
+        $SAFE = 3
+     #   $SAFE = 4 # no longer supported since ruby 2.1.x
         begin
           
          result = eval(e)

data/lib/watobo/utils/strings.rb

@@ -1,33 +1,21 @@
-# .
+#.
 # strings.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # @private 
-module Watobo#:nodoc: all
-  module Utils
-    def self.camelcase(string)
-      string.strip.gsub(/[^[a-zA-Z\-_]]/,"").gsub( "-" , "_").split("_").map{ |s| s.downcase.capitalize }.join
-    end
-    
-    def self.snakecase(string)
-      string.gsub(/([A-Z])([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-","_").downcase
-    end
-  end
+module Watobo#:nodoc: all
+  module Utils
+    def self.camelcase(string)
+      string.strip.gsub(/[^[a-zA-Z\-_]]/,"").gsub( "-" , "_").split("_").map{ |s| s.downcase.capitalize }.join
+    end
+    
+    def self.snakecase(string)
+      string.gsub(/([A-Z])([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-","_").downcase
+    end
+  end
 end

data/lib/watobo/utils/text2request.rb

@@ -1,29 +1,21 @@
-# .
+#.
 # text2request.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # @private 
 module Watobo#:nodoc: all
   module Utils
     def Utils.text2request(text)
         result = []
+        return result if text.strip.empty?
+        # UTF-8 CleanUp
+        text = text.unpack("C*").pack("C*")
+        
         if text =~ /\n\n/
           dummy = text.split(/\n\n/)
           header = dummy.shift.split(/\n/)