Changeset 238

Timestamp:

05/18/07 19:45:40 (2 years ago)

Author:

e.@brainspl.at

Message:

merb now accepts xml posts and parses them into params

Files:

• trunk/Rakefile (modified) (2 diffs)
• trunk/lib/merb.rb (modified) (1 diff)
• trunk/lib/merb/core_ext/merb_hash.rb (modified) (1 diff)
• trunk/lib/merb/merb_controller.rb (modified) (1 diff)
• trunk/lib/merb/merb_upload_handler.rb (modified) (1 diff)

trunk/Rakefile

@@ -16 +16 @@
-
-NAME = "merb"
-1
+2
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-
@@ -68 +68 @@
-  s.add_dependency('json')
-  s.add_dependency('mime-types')
+  s.add_dependency('xml-simple')
-  s.add_dependency('archive-tar-minitar') 
-  s.required_ruby_version = '>= 1.8.4'

trunk/lib/merb.rb

@@ -16 +16 @@
-
-module Merb
-1
+2
-  class Server
-    class << self

trunk/lib/merb/core_ext/merb_hash.rb

@@ -1 +1 @@
-class Hash
+
+  class << self
+    def from_xml(xml)
+      # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
+      undasherize_keys(typecast_xml_value(XmlSimple.xml_in(xml,
+        'forcearray'   => false,
+        'forcecontent' => true,
+        'keeproot'     => true,
+        'contentkey'   => '__content__')
+      ))            
+    end
+
+    private
+      def typecast_xml_value(value)
+        case value.class.to_s
+          when "Hash"
+            if value.has_key?("__content__")
+              content = translate_xml_entities(value["__content__"])
+              case value["type"]
+                when "integer"  then content.to_i
+                when "boolean"  then content.strip == "true"
+                when "datetime" then ::Time.parse(content).utc
+                when "date"     then ::Date.parse(content)
+                else                 content
+              end
+            else
+              (value.blank? || value['type'] || value['nil'] == 'true') ? nil : value.inject({}) do |h,(k,v)|
+                h[k] = typecast_xml_value(v)
+                h
+              end
+            end
+          when "Array"
+            value.map! { |i| typecast_xml_value(i) }
+            case value.length
+              when 0 then nil
+              when 1 then value.first
+              else value
+            end
+          when "String"
+            value
+          else
+            raise "can't typecast #{value.inspect}"
+        end
+      end
+    
+      def translate_xml_entities(value)
+        value.gsub(/&lt;/,   "<").
+              gsub(/&gt;/,   ">").
+              gsub(/&quot;/, '"').
+              gsub(/&apos;/, "'").
+              gsub(/&amp;/,  "&")
+      end
+    
+      def undasherize_keys(params)
+          case params.class.to_s
+            when "Hash"
+              params.inject({}) do |h,(k,v)|
+                h[k.to_s.tr("-", "_")] = undasherize_keys(v)
+                h
+              end
+            when "Array"
+              params.map { |v| undasherize_keys(v) }
+            else
+              params
+            end
+     end
+  end
+  
+    
-  def with_indifferent_access
-    MerbHash.new(self)

trunk/lib/merb/merb_controller.rb

@@ -52 +52 @@
-          json = MerbHash.new(json) if json.is_a? Hash
-          querystring.update(json)
+        elsif ['application/xml'].include?(@env[Mongrel::Const::UPCASE_CONTENT_TYPE])
+          querystring.update(Hash.from_xml(request.read))
-        else
-          querystring.update(query_parse(request.read))

trunk/lib/merb/merb_upload_handler.rb

@@ -43 +43 @@
-
-  def request_begins(params)
+    puts "request begins: clen: #{params[Mongrel::Const::CONTENT_LENGTH]}"
-    upload_notify(:add, params, params[Mongrel::Const::CONTENT_LENGTH].to_i)
-  end