watobo 0.9.21 → 0.9.23

data/lib/watobo/core/sid_cache.rb

@@ -1,109 +1,100 @@
-#.
-# sid_cache.rb
-#.
-# 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
-  class SIDCache
-    @caches = {}
-    @caches_lock = Mutex.new
-    
-    @pattern_lock = Mutex.new
-    
-    attr :sids
-    
-    
-    def self.patterns
-      Watobo::Conf::SidCache.patterns
-    end
-    
-    def clear
-      @sids = {}
-    end
-    
-    def initialize()      
-      @cache_lock = Mutex.new
-      @sids = {}
-    end
-    
-    def self.acquire(session)
-      @caches_lock.synchronize do
-        unless @caches.has_key? session
-          @caches[session] = SIDCache.new()
-        end
-      end
-      @caches[session]
-    end
-    
-     def update_sids(site, response)
-          begin
-            #site = request.site
-            @cache_lock.synchronize do
-              response.each do |line|
-                # puts line
-                self.class.patterns.each do |pat|
-                  if line =~ /#{pat}/i then
-                    sid_key = Regexp.quote($1.upcase)
-                    sid_value = $2
-                    
-                    puts "#{self} GOT NEW SID (#{sid_key}): #{sid_value}"
-                    @sids[site] ||= Hash.new 
-                    @sids[site][sid_key] = sid_value
-                  end
-                end
-
-              end
-            end
-          rescue => bang
-            puts bang
-            puts bang.backtrace if $DEBUG
-
-          end
-      end
-
-    
-    def update_request(request)
-        @cache_lock.synchronize do
-          if @sids.has_key?(request.site)
-            valid_sids = @sids[request.site] 
-            puts "* found sid for site: #{request.site}" if $DEBUG
-            request.map!{ |line|
-              res = line
-              self.class.patterns.each do |pat|
-                begin
-                  if line =~ /#{pat}/i then
-                    next if $~.length < 3
-                    sid_key = Regexp.quote($1.upcase)
-                    old_value = $2
-
-                    if valid_sids.has_key?(sid_key) then
-                      if not old_value =~ /#{@sids[request.site][sid_key]}/ then # sid value has changed and needs update
-                        Watobo.print_debug("#{self} update session", "#{old_value} - #{@sids[request.site][sid_key]}") if $DEBUG
-                        
-                        unless old_value.empty?
-                        res = line.gsub!(/#{Regexp.quote(old_value)}/, valid_sids[sid_key])
-                        end
-                        if not res then puts "!!!could not update sid (#{sid_key})"; end
-
-                      end
-                    end
-                  end
-                rescue => bang
-                  puts bang
-                  puts bang.backtrace if $DEBUG
-                  # puts @cache.to_yaml
-                end
-              end
-              res
-            }
-          end
-        end
-      end
-    
-  end
+module Watobo#:nodoc: all
+  class SIDCache
+    @caches = {}
+    @caches_lock = Mutex.new
+    
+    @pattern_lock = Mutex.new
+    
+    attr :sids
+    
+    
+    def self.patterns
+      Watobo::Conf::SidCache.patterns
+    end
+    
+    def clear
+      @sids = {}
+    end
+    
+    def initialize()      
+      @cache_lock = Mutex.new
+      @sids = {}
+    end
+    
+    def self.acquire(session)
+      @caches_lock.synchronize do
+        unless @caches.has_key? session
+          @caches[session] = SIDCache.new()
+        end
+      end
+      @caches[session]
+    end
+    
+     def update_sids(site, response)
+          begin
+            #site = request.site
+            @cache_lock.synchronize do
+              response.each do |line|
+                # puts line
+                self.class.patterns.each do |pat|
+                  if line =~ /#{pat}/i then
+                    sid_key = Regexp.quote($1.upcase)
+                    sid_value = $2
+                    
+                    puts "#{self} GOT NEW SID (#{sid_key}): #{sid_value}"
+                    @sids[site] ||= Hash.new 
+                    @sids[site][sid_key] = sid_value
+                  end
+                end
+
+              end
+            end
+          rescue => bang
+            puts bang
+            puts bang.backtrace if $DEBUG
+
+          end
+      end
+
+    
+    def update_request(request)
+        @cache_lock.synchronize do
+          if @sids.has_key?(request.site)
+            valid_sids = @sids[request.site] 
+            puts "* found sid for site: #{request.site}" if $DEBUG
+            request.map!{ |line|
+              res = line
+              self.class.patterns.each do |pat|
+                begin
+                  if line =~ /#{pat}/i then
+                    next if $~.length < 3
+                    sid_key = Regexp.quote($1.upcase)
+                    old_value = $2
+
+                    if valid_sids.has_key?(sid_key) then
+                      if not old_value =~ /#{@sids[request.site][sid_key]}/ then # sid value has changed and needs update
+                        Watobo.print_debug("#{self} update session", "#{old_value} - #{@sids[request.site][sid_key]}") if $DEBUG
+                        
+                        unless old_value.empty?
+                        res = line.gsub!(/#{Regexp.quote(old_value)}/, valid_sids[sid_key])
+                        end
+                        if not res then puts "!!!could not update sid (#{sid_key})"; end
+
+                      end
+                    end
+                  end
+                rescue => bang
+                  puts bang
+                  puts bang.backtrace if $DEBUG
+                  # puts @cache.to_yaml
+                end
+              end
+              res
+            }
+          end
+        end
+      end
+    
+  end
 end

data/lib/watobo/core/subscriber.rb

@@ -1,36 +1,27 @@
-#.
-# subscriber.rb
-#.
-# 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 Subscriber
-    def subscribe(event, &callback)
-      @event_dispatcher_listeners ||= Hash.new
-      (@event_dispatcher_listeners[event] ||= []) << callback
-    end
-
-    def clearEvents(event)
-      @event_dispatcher_listeners ||= Hash.new
-      @event_dispatcher_listeners[event] ||= []
-      @event_dispatcher_listeners[event].clear
-    end
-
-    def notify(event, *args)
-      @event_dispatcher_listeners ||= Hash.new
-      if @event_dispatcher_listeners[event]
-       # puts "NOTIFY: #{self}(:#{event}) [#{@event_dispatcher_listeners[event].length}]" if $DEBUG
-        @event_dispatcher_listeners[event].each do |m|
-          m.call(*args) if m.respond_to? :call
-        end
-      end
-    end
-
-  end
+module Watobo#:nodoc: all
+
+  module Subscriber
+    def subscribe(event, &callback)
+      @event_dispatcher_listeners ||= Hash.new
+      (@event_dispatcher_listeners[event] ||= []) << callback
+    end
+
+    def clearEvents(event)
+      @event_dispatcher_listeners ||= Hash.new
+      @event_dispatcher_listeners[event] ||= []
+      @event_dispatcher_listeners[event].clear
+    end
+
+    def notify(event, *args)
+      @event_dispatcher_listeners ||= Hash.new
+      if @event_dispatcher_listeners[event]
+       # puts "NOTIFY: #{self}(:#{event}) [#{@event_dispatcher_listeners[event].length}]" if $DEBUG
+        @event_dispatcher_listeners[event].each do |m|
+          m.call(*args) if m.respond_to? :call
+        end
+      end
+    end
+
+  end
 end

data/lib/watobo/defaults.rb

@@ -1,31 +1,22 @@
-#.
-# defaults.rb
-#.
-# 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.load_defaults
-    config_path = File.expand_path(File.join(File.dirname(__FILE__),"..","..", "config"))
-    #   puts "* loading defaults from #{config_path}"
-    Dir.glob("#{config_path}/*.yml").each do |cf|
-      dummy = File.basename(cf).gsub!(/.yml/,'')
-      #cc = dummy.strip.gsub(/[^[a-zA-Z\-_]]/,"").gsub( "-" , "_").split("_").map{ |s| s.downcase.capitalize }.join
-      cc = Watobo::Utils.camelcase dummy
-      begin
-        settings = YAML.load_file(cf)
-        Watobo::Conf.add(cc,  settings )
-      rescue => bang
-        puts "[#{self}] Could not load config #{cf}"
-      end
-    end
-  end
-
-end
-
-#puts "=== loading defaults ==="
-Watobo.load_defaults
+module Watobo#:nodoc: all
+  def self.load_defaults
+    config_path = File.expand_path(File.join(File.dirname(__FILE__),"..","..", "config"))
+    #   puts "* loading defaults from #{config_path}"
+    Dir.glob("#{config_path}/*.yml").each do |cf|
+      dummy = File.basename(cf).gsub!(/.yml/,'')
+      #cc = dummy.strip.gsub(/[^[a-zA-Z\-_]]/,"").gsub( "-" , "_").split("_").map{ |s| s.downcase.capitalize }.join
+      cc = Watobo::Utils.camelcase dummy
+      begin
+        settings = YAML.load_file(cf)
+        Watobo::Conf.add(cc,  settings )
+      rescue => bang
+        puts "[#{self}] Could not load config #{cf}"
+      end
+    end
+  end
+
+end
+
+#puts "=== loading defaults ==="
+Watobo.load_defaults

data/lib/watobo/external/diff/lcs.rb

@@ -1,12 +1,3 @@
-#.
-# lcs.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/array.rb

@@ -1,12 +1,3 @@
-#.
-# array.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/block.rb

@@ -1,12 +1,3 @@
-#.
-# block.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/callbacks.rb

@@ -1,12 +1,3 @@
-#.
-# callbacks.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/change.rb

@@ -1,12 +1,3 @@
-#.
-# change.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/hunk.rb

@@ -1,12 +1,3 @@
-#.
-# hunk.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/external/diff/lcs/ldiff.rb

@@ -1,12 +1,3 @@
-#.
-# ldiff.rb
-#.
-# 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
-
 #!/usr/bin/env ruby
 
 require 'optparse'

data/lib/watobo/external/diff/lcs/string.rb

@@ -1,12 +1,3 @@
-#.
-# string.rb
-#.
-# 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
-
 #! /usr/env/bin ruby
 #--
 # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>

data/lib/watobo/externals.rb

@@ -1,16 +1,7 @@
-#.
-# externals.rb
-#.
-# 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 'watobo/external/diff/lcs'
+require 'watobo/external/diff/lcs/hunk'
+require 'watobo/external/diff/lcs/callbacks'
+require 'watobo/external/diff/lcs/block'
+require 'watobo/external/diff/lcs/change'
 
-require 'watobo/external/diff/lcs'
-require 'watobo/external/diff/lcs/hunk'
-require 'watobo/external/diff/lcs/callbacks'
-require 'watobo/external/diff/lcs/block'
-require 'watobo/external/diff/lcs/change'
-
-#require 'watobo/external/ntlm/ntlm'
+#require 'watobo/external/ntlm/ntlm'