watobo 0.9.19 → 0.9.20

data/lib/watobo/http/data/data.rb

@@ -1,68 +1,60 @@
-# .
+#.
 # data.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 HTTPData
-    class Base
-      def to_s
-        s = @root.body.nil? ? "" : @root.body
-      end
-
-      def initialize(root)
-        @root = root
-      end
-    end
-
-    class WWW_Form < Base
-      def set(parm)
-        if has_parm?(parm.name)
-        @root.replace_post_parm(parm.name, parm.value)
-        else
-        @root.add_post_parm(parm.name, parm.value)
-        end
-      end
+#.
+# 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
 
-      def has_parm?(parm_name)
-        @root.post_parm_names do |pn|
-          return true if pn == parm_name
-        end
-        false
-      end
-
-      def parameters(&block)
-        parms = []
+# @private 
+module Watobo#:nodoc: all
+  module HTTPData
+    class Base
+      def to_s
+        s = @root.body.nil? ? "" : @root.body
+      end
+
+      def initialize(root)
+        @root = root
+      end
+    end
+
+    class WWW_Form < Base
+      def set(parm)
+        if has_parm?(parm.name)
+        @root.replace_post_parm(parm.name, parm.value)
+        else
+        @root.add_post_parm(parm.name, parm.value)
+        end
+      end
+
+      def has_parm?(parm_name)
+        @root.post_parm_names do |pn|
+          return true if pn == parm_name
+        end
+        false
+      end
+
+      def parameters(&block)
+        parms = []
         @root.post_parms.each do |p|
-          name, val = p.split("=")
-          parms << Watobo::WWWFormParameter.new( :name => name, :value => val )
-        end
-        parms
-      end
-
-      def initialize(root)
-        super root
-
-      end
-    end
-
-  end
-
+          nvsi = p.index("=")
+          unless nvsi.nil?
+            name = nvsi > 0 ? p[0..nvsi-1] : ""
+            val = nvsi < (p.length-1) ? p[nvsi+1..-1] : ""
+            parms << Watobo::WWWFormParameter.new( :name => name, :value => val )
+          end
+        end
+        parms
+      end
+
+      def initialize(root)
+        super root
+
+      end
+    end
+
+  end
+
 end

data/lib/watobo/http/data/json.rb

@@ -0,0 +1,51 @@
+#.
+# json.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 HTTPData
+   
+    class JSONData < Base
+      
+      def to_s
+        s = @root.body.nil? ? "" : @root.body
+      end
+      
+      def set(parm)
+         parms = JSON.parse(@root.body.to_s)
+         parms[parm.name] = parm.value
+         @root.set_body parms.to_json
+      end
+
+      def has_parm?(parm_name)
+        parms = JSON.parse(@root.body.to_s)
+        return true if parms.has_key? parm_name
+        false
+      end
+
+      def parameters(&block)
+        parms = []
+        json_str = @root.body.to_s
+        
+        JSON.parse(json_str).each do |k,v|
+          val = v.is_a?(String) ? v : v.to_s
+          parms << Watobo::JSONParameter.new( :name => k, :value => val )
+        end
+        parms
+      end
+
+      def initialize(root)
+        super root
+
+      end
+    end
+
+  end
+
+end

data/lib/watobo/http/url/url.rb

@@ -1,64 +1,52 @@
-# .
+#.
 # url.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 HTTP
-    class Url
-      def to_s
-        s = @root.url_string
-      end
-      
-            
-      def set(parm)
-        if has_parm?(parm.name)
-        @root.replace_get_parm(parm.name, parm.value)
-        else
-        @root.add_get_parm(parm.name, parm.value)
-        end
-      end
-
-      def has_parm?(parm_name)
-        @root.get_parm_names do |pn|
-          return true if pn == parm_name
-        end
-        false
-      end
+#.
+# 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
 
-      def parameters(&block)
-        parms = []
+# @private 
+module Watobo#:nodoc: all
+  module HTTP
+    class Url
+      def to_s
+        s = @root.url_string
+      end
+      
+            
+      def set(parm)
+        if has_parm?(parm.name)
+        @root.replace_get_parm(parm.name, parm.value)
+        else
+        @root.add_get_parm(parm.name, parm.value)
+        end
+      end
+
+      def has_parm?(parm_name)
+        @root.get_parm_names do |pn|
+          return true if pn == parm_name
+        end
+        false
+      end
+
+      def parameters(&block)
+        parms = []
         @root.get_parms.each do |p|
           p.strip!
-          i = p.index("=")
+          i = p.index("=")
           name = p[0..i-1]
-          val = i < p.length ? p[i+1..-1] : ""
-          parms << Watobo::UrlParameter.new( :name => name, :value => val )
-        end
-        parms
-      end
-
-      def initialize(root)
-         @root = root
-
-      end
-    end
-  end
+          val = i < p.length ? p[i+1..-1] : ""
+          parms << Watobo::UrlParameter.new( :name => name, :value => val )
+        end
+        parms
+      end
+
+      def initialize(root)
+         @root = root
+
+      end
+    end
+  end
 end

data/lib/watobo/http/xml/xml.rb

@@ -1,143 +1,131 @@
-# .
+#.
 # xml.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 HTTP
-    class Xml
-
-      module Mixin
-        def xml
-            @xml ||= Watobo::HTTP::Xml.new(self)
-        end
-      end
-
-      def to_s
-        s = @root.body.to_s
-      end
-
-      def set(parm)
-        return false unless parm.location == :xml
-       # puts "= set "
-       # puts parm.to_yaml
-        
-        doc = Nokogiri::XML(@root.body.strip)
-        namespaces = doc.collect_namespaces
-        parent = doc.xpath("//#{parm.parent}", namespaces).first
-        if parent.nil?
-          puts "* could not find parent node #{parm.parent}"
-          return false
-        end
-        
-        parm_name = parm.namespace.nil? ? "" : parm.namespace
-        parm_name << parm.name
-        # find node
-        node = parent.xpath("//#{parm_name}", namespaces).first
-        if node.nil?
-          puts "* node does not exist #{parm_name}"
-        end
-        
-        child = node.children.first
-        if child.nil?
-          child = Nokogiri::XML::Text.new(parm.value, node)
-          node.add_child child
-        else        
-          child.content = parm.value
-        end
-        
-        @root.set_body doc.to_s
-
-      end
-
-      def has_parm?(parm_name)
-        false
-      end
-
-      def parameters(&block)
-        params = []
-
-        return params unless @root.is_xml?
-        leaf_nodes do |n|
-          p = { :name => n.name }
-          val = n.children.size == 0 ? "" : n.children.first.to_s
-
-            p[:value] = val
-            parent_name = ""
-            unless n.parent.namespace.nil?
-              parent_name << n.parent.namespace.prefix
-              parent_name << ":"  
-            end
-            parent_name << n.parent.name
-            p[:parent] = "#{parent_name}"
-
-            unless n.namespace.nil?
-              p[:namespace] = n.namespace.prefix
-            end
-          param = XmlParameter.new(p)
-          yield param if block_given?
-          params << param
-        end
-
-        return params
-      end
-
-      def initialize(root)
-        @root = root
-
-      end
-
-      private
-
-      def leaf_nodes(&block)
-
-        nodes = []
-        begin
-          doc = Nokogiri::XML(@root.body.strip)
-          prefix = doc.children.first.namespace.prefix
-          # check if doc has a body element
-          start = doc
-          doc.traverse { |node|
-            if node.name =~ /^body$/i
-            start = node
-            end
-          }
-          start.traverse { |node|
-             if node.children.size == 0 and node.is_a? Nokogiri::XML::Element
-               yield node if block_given?
-               nodes << node
-             end
-            if node.children.size == 1
-              if node.children.first.is_a? Nokogiri::XML::Text
-                yield node if block_given?
-                nodes << node
-              end
-            end
-          }
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-        nodes
-      end
-
-    end
-  end
+#.
+# 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 HTTP
+    class Xml
+
+      module Mixin
+        def xml
+            @xml ||= Watobo::HTTP::Xml.new(self)
+        end
+      end
+
+      def to_s
+        s = @root.body.to_s
+      end
+
+      def set(parm)
+        return false unless parm.location == :xml
+       # puts "= set "
+       # puts parm.to_yaml
+        
+        doc = Nokogiri::XML(@root.body.strip)
+        namespaces = doc.collect_namespaces
+        parent = doc.xpath("//#{parm.parent}", namespaces).first
+        if parent.nil?
+          puts "* could not find parent node #{parm.parent}"
+          return false
+        end
+        
+        parm_name = parm.namespace.nil? ? "" : parm.namespace
+        parm_name << parm.name
+        # find node
+        node = parent.xpath("//#{parm_name}", namespaces).first
+        if node.nil?
+          puts "* node does not exist #{parm_name}"
+        end
+        
+        child = node.children.first
+        if child.nil?
+          child = Nokogiri::XML::Text.new(parm.value, node)
+          node.add_child child
+        else        
+          child.content = parm.value
+        end
+        
+        @root.set_body doc.to_s
+
+      end
+
+      def has_parm?(parm_name)
+        false
+      end
+
+      def parameters(&block)
+        params = []
+
+        return params unless @root.is_xml?
+        leaf_nodes do |n|
+          p = { :name => n.name }
+          val = n.children.size == 0 ? "" : n.children.first.to_s
+
+            p[:value] = val
+            parent_name = ""
+            unless n.parent.namespace.nil?
+              parent_name << n.parent.namespace.prefix
+              parent_name << ":"  
+            end
+            parent_name << n.parent.name
+            p[:parent] = "#{parent_name}"
+
+            unless n.namespace.nil?
+              p[:namespace] = n.namespace.prefix
+            end
+          param = XmlParameter.new(p)
+          yield param if block_given?
+          params << param
+        end
+
+        return params
+      end
+
+      def initialize(root)
+        @root = root
+
+      end
+
+      private
+
+      def leaf_nodes(&block)
+
+        nodes = []
+        begin
+          doc = Nokogiri::XML(@root.body.strip)
+          prefix = doc.children.first.namespace.prefix
+          # check if doc has a body element
+          start = doc
+          doc.traverse { |node|
+            if node.name =~ /^body$/i
+            start = node
+            end
+          }
+          start.traverse { |node|
+             if node.children.size == 0 and node.is_a? Nokogiri::XML::Element
+               yield node if block_given?
+               nodes << node
+             end
+            if node.children.size == 1
+              if node.children.first.is_a? Nokogiri::XML::Text
+                yield node if block_given?
+                nodes << node
+              end
+            end
+          }
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+        nodes
+      end
+
+    end
+  end
 end