afmotion 0.7 → 0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NjOGE1NWZjMWQzYzRmZjQ2MTRiOTc5N2QwZThlYTZiNTM1OGZhMg==
+    OTdiNzU4ZDY0OTM0YWM1MTEwOGE0OWExYjE3ZTcyYTA0YzA0MmMxZg==
   data.tar.gz: !binary |-
-    MjBhOTAxMmNkNjJhMWIwMDJkNjkwZWQ4MmNlM2E3ZTk1ZTY3MjIxMg==
+    ODZlZmFlNzBlMjNmMWMzZjMyNTE1MDc1OWQ3YTUzMjhmMGI3MzA1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzFhNDEyMmI0NTZlNjY0YWQ4MzVhZTYzZjVlMWJiMDRhYWI0ZGRhOWU4MThj
-    NDZlMDJjM2YyNzNmNzQ1ODZhNTBhZDVmNzYxNDY1ZjRhOTdlYmRkMTU3Njcw
-    ZjQxMGMwZTBhYTZlZTVkZDZhOWY1MzgyZTA1YmRiN2VjMmU3OGQ=
+    ZTkyYTM2ZjcxODc4OTkzYmEwZWQ4NGYyOWM1YjAwNTRlYmY5MTJmNThjY2Ey
+    Yjk3OTFiZjBhM2I5YmIxYjFlY2EzMzc2OGYyOTkyOGRhYTc5ZDQxZTQ4OGZj
+    NDhiNjQ5M2U1YTRjNGYyN2U0MzhiZTU0OTI3NWY1YTUzZmNmNmY=
   data.tar.gz: !binary |-
-    YmQwNTI3ZWUxYmI5ZDZkMjFjMzJkNGRmOTU0YTc5OGY3YTcyOWVmMDlhNTg0
-    OWZjNmUzODMxNGRjOWYyNDFjY2EwMWVjYTZlMWNmYzY1ZmI2ZTUwNTkxMmIx
-    ZmFmZDJkOGYyOTNiMmI3NmE2MzAyYWI4ZmM1NDRlYzM2NTcyMWU=
+    YjA5YTRkODQ5MGJkYjI5NjEyOWJhMmZjYzE1NTAzZWNmNTEwOTU0ZDc3Y2E0
+    OWM5ZDUwZTgyMjE5MmQ1NmJmZTY2ZTQzMmRmMzczZDU5ZmYxYzdkOTQzYWJl
+    ODVhNTYxMDRjZjI3NWZjZjE4ZmZjODdmMDQ5M2JlZmEyODA2Mjg=

data/AFMotion.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "motion-cocoapods", ">= 1.2.1"
+  s.add_dependency "motion-cocoapods", "~> 1.3.6"
   s.add_development_dependency 'rake'
 end

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    afmotion (0.7)
-      motion-cocoapods (>= 1.2.1)
+    afmotion (0.8)
+      motion-cocoapods (~> 1.3.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     claide (0.3.2)
-    cocoapods (0.22.1)
+    cocoapods (0.23.0)
       activesupport (~> 3.2.13)
       claide (~> 0.3.2)
-      cocoapods-core (= 0.22.1)
-      cocoapods-downloader (~> 0.1.1)
+      cocoapods-core (= 0.23.0)
+      cocoapods-downloader (~> 0.1.2)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json (~> 1.8.0)
       open4 (~> 1.3.0)
-      xcodeproj (~> 0.8.0)
-    cocoapods-core (0.22.1)
+      xcodeproj (~> 0.9.0)
+    cocoapods-core (0.23.0)
       activesupport (~> 3.2.13)
       json (~> 1.8.0)
       nap (~> 0.5.1)
-    cocoapods-downloader (0.1.1)
+    cocoapods-downloader (0.1.2)
     colored (1.2)
     escape (0.0.4)
-    i18n (0.6.1)
+    i18n (0.6.5)
     json (1.8.0)
-    motion-cocoapods (1.3.5)
+    motion-cocoapods (1.3.6)
       cocoapods (>= 0.17.0)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     nap (0.5.1)
     open4 (1.3.0)
     rake (0.9.2.2)
-    xcodeproj (0.8.0)
+    xcodeproj (0.9.0)
       activesupport (~> 3.2.13)
       colored (~> 1.2)
 

data/README.md

@@ -211,6 +211,21 @@ client.multipart.post("avatars") do |result, form_data, progress|
 end
 ```
 
+#### Client Operations
+
+If you want to grab an `AFURLConnectionOperation` from your client instance, use `create_operation` or `create_multipart_operation`:
+
+```ruby
+operation = client.create_operation(:get, "http://google.com", {q: "hello"}) do |result|
+end
+
+multipart_operation = client.create_multipart_operation(:get, "http://google.com", {q: "hello"}) do |result, form_data, progress|
+end
+
+# elsewhere
+client.enqueueHTTPRequestOperation(operation)
+```
+
 #### Client Building DSL
 
 The `AFMotion::Client` DSL allows the following properties:

data/lib/afmotion/http_client.rb

@@ -81,64 +81,72 @@ class AFHTTPClient
     # EX client.get('my/resource.json')
     define_method "#{method}", -> (path, parameters = {}, &callback) do
       if @multipart
-        multipart_callback = callback.arity == 1 ? nil : lambda { |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,
-          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)
-            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)
-            case callback.arity
-            when 1
-              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)
+        @operation = create_multipart_operation(method, path, parameters, &callback)
+        self.enqueueHTTPRequestOperation(@operation)
         @multipart = nil
-        @operation = operation
       else
-        request = self.requestWithMethod(method.upcase, path:path, parameters:parameters)
-        @operation = self.HTTPRequestOperationWithRequest(request, success: lambda {|operation, responseObject|
+        @operation = create_operation(method, path, parameters, &callback)
+        self.enqueueHTTPRequestOperation(@operation)
+      end
+      @operation
+    end
+  end
+
+  def create_multipart_operation(method, path, parameters = {}, &callback)
+    multipart_callback = callback.arity == 1 ? nil : lambda { |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,
+      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)
+        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)
+        case callback.arity
+        when 1
+          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
+    operation
+  end
+
+  def create_operation(method, path, parameters = {}, &callback)
+    request = self.requestWithMethod(method.upcase, path:path, parameters:parameters)
+    self.HTTPRequestOperationWithRequest(request, success: lambda {|operation, responseObject|
             result = AFMotion::HTTPResult.new(operation, responseObject, nil)
             callback.call(result)
           }, failure: lambda {|operation, error|
             result = AFMotion::HTTPResult.new(operation, nil, error)
             callback.call(result)
           })
-        self.enqueueHTTPRequestOperation(@operation)
-        @operation
-      end
-    end
   end
 
   def multipart

data/lib/afmotion/version.rb

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

data/vendor/Podfile.lock

@@ -1,11 +1,10 @@
-
 PODS:
-- AFNetworking (1.0.1)
+  - AFNetworking (1.0.1)
 
 DEPENDENCIES:
-- AFNetworking
+  - AFNetworking
 
 SPEC CHECKSUMS:
   AFNetworking: 0bce3ae41023e080e96b8a2e0d07c94709f72a81
 
-COCOAPODS: 0.15.2
+COCOAPODS: 0.23.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement