afmotion 0.3 → 0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afmotion (0.3)
+    afmotion (0.4)
       motion-cocoapods (>= 1.2.1)
 
 GEM

data/README.md

@@ -176,7 +176,7 @@ end
 
 #### Multipart Requests
 
-`AFHTTPClient` supports multipart form requests (i.e. for image uploading). Simply prepend `multipart` to any other URL request and it'll convert your parameters into properly encoding multipart data:
+`AFHTTPClient` supports multipart form requests (i.e. for image uploading). Simply prepend `multipart` to any other request method and it'll convert your parameters into properly encoded multipart data:
 
 ```ruby
 # an instance of UIImage
@@ -187,7 +187,26 @@ client.multipart.post("avatars") do |result, form_data|
   if form_data
     # Called before request runs
     # see: https://github.com/AFNetworking/AFNetworking/wiki/AFNetworking-FAQ
-    form_data.appendPartWithFileData(data, mimeType: "image/png", name: "avatar")
+    form_data.appendPartWithFileData(data, name: "avatar", fileName:"avatar.png", mimeType: "image/png")
+  elsif result.success?
+    ...
+  else
+    ...
+  end
+end
+```
+
+If you want to track upload progress, you can add a third callback argument which returns the upload percentage between 0.0 and 1.0:
+
+```ruby
+client.multipart.post("avatars") do |result, form_data, progress|
+  if form_data
+    # Called before request runs
+    # see: https://github.com/AFNetworking/AFNetworking/wiki/AFNetworking-FAQ
+    form_data.appendPartWithFileData(data, name: "avatar", fileName:"avatar.png", mimeType: "image/png")
+  elsif progress
+    # 0.0 <= progress <= 1.0
+    my_widget.update_progress(progress)
   elsif result.success?
     ...
   else

data/app/app_delegate.rb

@@ -1,6 +1,8 @@
 class AppDelegate
+  attr_accessor :image, :data
   def application(application, didFinishLaunchingWithOptions:launchOptions)
-
+    self.image = UIImage.imageNamed("test")
+    self.data = UIImagePNGRepresentation(self.image)
     true
   end
 end

data/lib/afmotion/http_client.rb

@@ -82,8 +82,16 @@ class AFHTTPClient
     define_method "#{method}", -> (path, parameters = {}, &callback) do
       if @multipart
         multipart_callback = callback.arity == 1 ? nil : lambda { |formData|
-            callback.call(nil, formData)
-          }
+          callback.call(nil, formData)
+        }
+        upload_callback = callback.arity > 2 ? lambda { |bytes_written_now, total_bytes_written, total_bytes_expect|
+          case callback.arity
+          when 3
+            callback.call(nil, nil, total_bytes_written.to_f / total_bytes_expect.to_f)
+          when 5
+            callback.call(nil, nil, bytes_written_now, total_bytes_written, total_bytes_expect)
+          end
+        } : nil
         request = self.multipartFormRequestWithMethod(method, path: path,
           parameters: parameters,constructingBodyWithBlock: multipart_callback)
         operation = self.HTTPRequestOperationWithRequest(request,
@@ -94,6 +102,10 @@ class AFHTTPClient
               callback.call(result)
             when 2
               callback.call(result, nil)
+            when 3
+              callback.call(result, nil, nil)
+            when 5
+              callback.call(result, nil, nil, nil, nil)
             end
           }, failure: lambda {|operation, error|
             result = AFMotion::HTTPResult.new(operation, nil, error)
@@ -102,8 +114,15 @@ class AFHTTPClient
               callback.call(result)
             when 2
               callback.call(result, nil)
+            when 3
+              callback.call(result, nil, nil)
+            when 5
+              callback.call(result, nil, nil, nil, nil)
             end
           })
+        if upload_callback
+          operation.setUploadProgressBlock(upload_callback)
+        end
         self.enqueueHTTPRequestOperation(operation)
         @multipart = nil
       else

data/lib/afmotion/version.rb

@@ -1,5 +1,5 @@
 module AFMotion
-  VERSION = "0.3"
+  VERSION = "0.4"
 
   HTTP_METHODS = [:get, :post, :put, :delete, :patch]
 end

data/spec/http_client_spec.rb

@@ -133,5 +133,25 @@ describe "AFHTTPClient" do
         @form_data.should.not == nil
       end
     end
+
+    it "should have upload callback with raw progress" do
+      image = UIImage.imageNamed("test")
+      @data = UIImagePNGRepresentation(image)
+      @client = AFHTTPClient.clientWithBaseURL("http://bing.com/".to_url)
+      @client.multipart.post("", test: "Herp") do |result, form_data, progress|
+        if form_data
+          form_data.appendPartWithFileData(@data, name: "test", fileName:"test.png", mimeType: "image/png")
+        elsif progress
+          @progress ||= progress
+        elsif result
+          resume
+        end
+      end
+
+      wait_max(20) do
+        @progress.should <= 1.0
+        @progress.should.not == nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -68,6 +68,7 @@ files:
 - lib/afmotion/version.rb
 - pkg/afmotion-0.0.2.gem
 - pkg/afmotion-0.0.3.gem
+- resources/test.png
 - spec/http_client_spec.rb
 - spec/http_spec.rb
 - spec/ns_url_request_spec.rb
@@ -136,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3932181106009024666
+      hash: -2510227457395499119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3932181106009024666
+      hash: -2510227457395499119
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23