afmotion 0.2 → 0.3

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    afmotion (0.2)
+    afmotion (0.3)
       motion-cocoapods (>= 1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -32,12 +32,12 @@ GEM
     json (1.7.5)
     motion-cocoapods (1.2.1)
       cocoapods (>= 0.14.0)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
-    octokit (1.18.0)
+    octokit (1.19.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
-      faraday_middleware (~> 0.8)
+      faraday_middleware (~> 0.9)
       hashie (~> 1.2)
       multi_json (~> 1.3)
     open4 (1.3.0)

data/README.md

@@ -162,6 +162,40 @@ end
 
 If you're constantly used one web service, you can use the `AFMotion::Client.shared` variable have a common reference. It can be set like a normal variable or created with `AFMotion::Client.build_shared`.
 
+`AFHTTPClient` supports methods of the form `AFHTTPClient#get/post/put/patch/delete(url, request_parameters)`. The `request_parameters` is a hash containing your parameters to attach as the request body or URL parameters, depending on request type. For example:
+
+```ruby
+client.get("users", id: 1) do |result|
+  ...
+end
+
+client.post("users", name: "@clayallsopp", library: "AFMotion") do |result|
+  ...
+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:
+
+```ruby
+# an instance of UIImage
+image = my_function.get_image
+data = UIImagePNGRepresentation(image)
+
+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")
+  elsif result.success?
+    ...
+  else
+    ...
+  end
+end
+```
+
 #### Client Building DSL
 
 The `AFMotion::Client` DSL allows the following properties:

data/lib/afmotion/http_client.rb

@@ -80,18 +80,51 @@ class AFHTTPClient
   AFMotion::HTTP_METHODS.each do |method|
     # EX client.get('my/resource.json')
     define_method "#{method}", -> (path, parameters = {}, &callback) do
-      fn = "#{method}Path:parameters:success:failure:"
-      self.send(fn, path, parameters,
-        lambda {|operation, responseObject|
-          result = AFMotion::HTTPResult.new(operation, responseObject, nil)
-          callback.call(result)
-        }, lambda {|operation, error|
-          result = AFMotion::HTTPResult.new(operation, nil, error)
-          callback.call(result)
-        })
+      if @multipart
+        multipart_callback = callback.arity == 1 ? nil : lambda { |formData|
+            callback.call(nil, formData)
+          }
+        request = self.multipartFormRequestWithMethod(method, path: path,
+          parameters: parameters,constructingBodyWithBlock: multipart_callback)
+        operation = self.HTTPRequestOperationWithRequest(request,
+          success: lambda {|operation, responseObject|
+            result = AFMotion::HTTPResult.new(operation, responseObject, nil)
+            case callback.arity
+            when 1
+              callback.call(result)
+            when 2
+              callback.call(result, nil)
+            end
+          }, failure: lambda {|operation, error|
+            result = AFMotion::HTTPResult.new(operation, nil, error)
+            case callback.arity
+            when 1
+              callback.call(result)
+            when 2
+              callback.call(result, nil)
+            end
+          })
+        self.enqueueHTTPRequestOperation(operation)
+        @multipart = nil
+      else
+        fn = "#{method}Path:parameters:success:failure:"
+        self.send(fn, path, parameters,
+          lambda {|operation, responseObject|
+            result = AFMotion::HTTPResult.new(operation, responseObject, nil)
+            callback.call(result)
+          }, lambda {|operation, error|
+            result = AFMotion::HTTPResult.new(operation, nil, error)
+            callback.call(result)
+          })
+      end
     end
   end
 
+  def multipart
+    @multipart = true
+    self
+  end
+
   # options can be
   # - {username: ___, password: ____}
   # or

data/lib/afmotion/version.rb

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

data/spec/http_client_spec.rb

@@ -101,4 +101,37 @@ describe "AFHTTPClient" do
       @client.defaultValueForHeader("Authorization").split[0].should == "Token"
     end
   end
+
+  describe "#multipart" do
+    it "should trigger multipart logic" do
+      @client.multipart.should == @client
+      @client.instance_variable_get("@multipart").should == true
+    end
+
+    it "should trigger multipart request" do
+      @client.multipart.post("", test: "Herp") do |result|
+        @result = result
+        resume
+      end
+
+      wait_max(10) do
+        @result.should.not == nil
+        @result.operation.request.valueForHTTPHeaderField("Content-Type").include?("multipart/form-data").should == true
+      end
+    end
+
+    it "should work with form data" do
+      @client.multipart.post("", test: "Herp") do |result, form_data|
+        if result
+          resume
+        else
+          @form_data = form_data
+        end
+      end
+
+      wait_max(10) do
+        @form_data.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.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 77784384284444777
+      hash: -3932181106009024666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 77784384284444777
+      hash: -3932181106009024666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23