rack-multipart_related 0.0.2 → 0.0.3

data/lib/rack/multipart_related/version.rb

@@ -1,29 +1,12 @@
 module Rack
   class MultipartRelated
-    path = ::File.expand_path('../../..', __FILE__)
-    v = nil
-    v = $1 if path =~ /\/rack-multipart_related-([\w\.\-]+)/
-    if v.nil?
-      $:.each do |path|
-        if path =~ /\/rack-multipart_related-([\w\.\-]+)/
-          v = $1
-          break
-        end
-      end
-    end
-    if v.nil?
-      path = ::File.expand_path('../../../../.git', __FILE__)
-      if ::File.exists?(path)
-        require "step-up"
-        v = StepUp::Driver::Git.last_version
-      end
-    end
-    if v.nil?
-      VERSION = "0.0.0"
-    else
-      v.sub!(/^v/, '')
-      v.sub!(/\+\d*$/, '')
-      VERSION = v
+    version = nil
+    version = $1 if ::File.expand_path('../../..', __FILE__) =~ /\/rack-multipart_related-([\w\.\-]+)/
+    if version.nil? && ::File.exists?(::File.expand_path('../../../../.git', __FILE__))
+      require "step-up"
+      version = StepUp::Driver::Git.last_version
     end
+    version = "0.0.0" if version.nil?
+    VERSION = version.gsub(/^v?([^\+]+)\+?\d*$/, '\1')
   end
 end

data/lib/rack/multipart_related.rb

@@ -11,7 +11,7 @@ module Rack
     def call(env)
       content_type = env['CONTENT_TYPE']
 
-      if content_type =~ /^multipart\/related/
+      if content_type =~ /^multipart\/related/ni
 
         start_part = content_type[/.* start=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni, 1]
         start_part_type = content_type[/.* type=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni, 1]
@@ -48,7 +48,7 @@ module Rack
         part_ref = data[/^cid:(.+)$/ni, 1]
 
         if part_ref
-          data = get_attribute(original_params, part_ref)[:tempfile]
+          data = get_attribute(original_params, part_ref)
         end
       elsif data.kind_of?(Array)
         data.each_with_index do |value, index|

data/test/rack/multipart_related_test.rb

@@ -51,7 +51,13 @@ class MultipartRelatedTest < Test::Unit::TestCase
     expected_request_form_hash_after_middleware = {
       "user" => {
         "name" => "Jhon", 
-        "avatar" => imagefile
+        "avatar" => {
+          :type => "image/png", 
+          :filename =>"image.png", 
+          :tempfile => imagefile, 
+          :head => "Content-Type: image/gif\r\nContent-Disposition: inline; name=\"avatar_image\"; filename=\"image.png\"\r\n", 
+          :name =>"avatar_image"
+        }
       }
     }
     
@@ -67,4 +73,4 @@ class MultipartRelatedTest < Test::Unit::TestCase
     assert last_response.ok?
     assert_equal last_request.env["rack.request.form_hash"], expected_request_form_hash_after_middleware
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-multipart_related
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lucas Fais
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -02:00
+date: 2010-12-27 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency