francxk-httparty 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.4 2008-08-XX
+
+* 1 major enhancements:
+	* Modified the management of allowedFormat and mime type to detect the right format
+
 
 == 0.1.3 2008-08-22
 

data/httparty.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]

data/lib/httparty.rb

@@ -18,7 +18,17 @@ module HTTParty
     base.extend ClassMethods
   end
 
-  AllowedFormats = {:xml => 'text/xml', :json => 'application/json'}
+  # this is the format known by the module
+  AllowedFormats = [:xml, :json]
+
+  # for each mime types give the format found in AllowedFormat (that can be parsed)
+  MimeTypes      = {
+    'application/xml' => :xml,
+    'application/atom+xml' => :xml,
+    'application/rdf+xml' => :xml,
+    'text/xml' => :xml,
+    'application/json' => :json,
+    'text/json' => :json, }
 
   module ClassMethods    
     #
@@ -64,7 +74,7 @@ module HTTParty
     end
     
     def format(f)
-      raise UnsupportedFormat, "Must be one of: #{AllowedFormats.keys.join(', ')}" unless AllowedFormats.key?(f)
+      raise UnsupportedFormat, "Must be one of: #{AllowedFormats.join(', ')}" unless AllowedFormats.include?(f)
       @format = f
     end
     
@@ -126,7 +136,7 @@ module HTTParty
         request.basic_auth(basic_auth[:username], basic_auth[:password]) if basic_auth
         response       = http(uri).request(request)
 
-        @format      ||= format_from_mimetype(response['content-type'])
+        @format      ||= format_from_mimetype(response['content-type'].split(';',2)[0])
 
         case response
         when Net::HTTPSuccess
@@ -157,9 +167,9 @@ module HTTParty
       end
       
       # Uses the HTTP Content-Type header to determine the format of the response
-      # It compares the MIME type returned to the types stored in the AllowedFormats hash
+      # It compares the MIME type returned to the types stored in the MimeType hashto choose format (ie AloowedFormat)
       def format_from_mimetype(mimetype) #:nodoc:
-        AllowedFormats.each { |k, v| return k if mimetype.include?(v) }
+        MimeTypes[mimetype]
       end
   end
 end

data/lib/httparty/version.rb

@@ -2,7 +2,7 @@ module HTTParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francxk-httparty
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - John Nunemaker