afmotion 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6272282a85e6fd949a516177786517a7be33bc12
-  data.tar.gz: c60b1826698311ed4f8d1d249fe55b67e1df332b
+  metadata.gz: b99324f4972198d794024d6f1446c7a1b0733efe
+  data.tar.gz: b6cfbfd89ec96194bef5267f0029259db873b14c
 SHA512:
-  metadata.gz: a353b2ecc16ac721bc08bc893eb5da6001a3dcb0c0b0616dbfc47c43a02047739cead584e6d8393aaa1531b8b92ee2ad8b4d53bc313d1f4536ff45d9223b2476
-  data.tar.gz: 42d31e7089ce294031b79b3e37cd1483138f7b9f998369d5677eff2350b972b5dd10914bee192f472680de1f126dac72dba8846bcf22144814f4e751252b9733
+  metadata.gz: 3712e2ceb4ac7973649c392692ba1df96c672b6cca7562a552f2f4241a53f901bda3daeff7b30453eff8e044184767ab02e4db037d85a6d93355816654951f13
+  data.tar.gz: 317faec654548c60b2eb1c83e551e6399dc60e05cf89843cc5ce4f3b431f68477410efe8aba8622b61c26db9b6b36e8ba90f53ad12bd7a754305b97790b8908d

data/.travis.yml

@@ -0,0 +1,3 @@
+language: objective-c
+install: bundle install
+script: pod setup; bundle exec rake pod:install COCOAPODS_VERBOSE=1; bundle exec rake spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afmotion (2.0.0.rc1)
+    afmotion (2.0.0.rc2)
       motion-cocoapods (~> 1.4.0)
       motion-require (~> 0.0.7)
 
@@ -30,7 +30,7 @@ GEM
     colored (1.2)
     escape (0.0.4)
     i18n (0.6.5)
-    json (1.8.0)
+    json (1.8.1)
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
     motion-require (0.0.7)

data/README.md

@@ -1,5 +1,7 @@
 # AFMotion
 
+[![Build Status](https://travis-ci.org/usepropeller/afmotion.png?branch=master)](https://travis-ci.org/usepropeller/afmotion)
+
 AFMotion is a thin RubyMotion wrapper for [AFNetworking](https://github.com/AFNetworking/AFNetworking), the absolute best networking library on iOS.
 
 ## Usage

data/lib/afmotion/client_shared.rb

@@ -1,4 +1,30 @@
 module AFMotion
+  # ported from https://github.com/AFNetworking/AFNetworking/blob/master/UIKit%2BAFNetworking/UIProgressView%2BAFNetworking.m
+  class SessionObserver
+
+    def initialize(task, callback)
+      @callback = callback
+      task.addObserver(self, forKeyPath:"state", options:0, context:nil)
+      task.addObserver(self, forKeyPath:"countOfBytesSent", options:0, context:nil)
+    end
+
+    def observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context)
+      # I've only seen this be -1, so callback might not get called
+      if keyPath == "countOfBytesSent" && object.countOfBytesExpectedToSend > 0
+        @callback.call(nil, object.countOfBytesSent.to_f, object.countOfBytesExpectedToSend.to_f)
+      end
+
+      if keyPath == "state" && object.state == NSURLSessionTaskStateCompleted
+        begin
+          object.removeObserver(self, forKeyPath: "state")
+          object.removeObserver(self, forKeyPath: "countOfBytesSent")
+          @callback = nil
+        rescue
+        end
+      end
+    end
+  end
+
   module ClientShared
     def headers
       requestSerializer.headers
@@ -13,13 +39,15 @@ module AFMotion
     end
 
     def multipart_post(path, parameters = {}, &callback)
-      create_multipart_operation(path, parameters, &callback)
+      create_multipart_operation(:post, path, parameters, &callback)
     end
 
-    def create_multipart_operation(path, parameters = {}, &callback)
-      parameters = AFMotion::MultipartParametersWrapper.new(parameters)
-      inner_callback = Proc.new do |result, form_data,  bytes_written_now,  total_bytes_written, total_bytes_expect|
+    def multipart_put(path, parameters = {}, &callback)
+      create_multipart_operation(:put, path, parameters, &callback)
+    end
 
+    def create_multipart_operation(http_method, path, parameters = {}, &callback)
+      inner_callback = Proc.new do |result, form_data,  bytes_written_now,  total_bytes_written, total_bytes_expect|
         case callback.arity
         when 1
           callback.call(result)
@@ -37,7 +65,7 @@ module AFMotion
       end
 
       multipart_callback = nil
-      if callback.arity == 2
+      if callback.arity > 1
         multipart_callback = lambda { |formData|
           inner_callback.call(nil, formData)
         }
@@ -50,20 +78,29 @@ module AFMotion
         }
       end
 
-      operation = self.POST(path,
-        parameters: parameters,
-        constructingBodyWithBlock: multipart_callback,
-        success: lambda {|operation, responseObject|
-          result = AFMotion::HTTPResult.new(operation, responseObject, nil)
-          inner_callback.call(result)
-        }, failure: lambda {|operation, error|
-          result = AFMotion::HTTPResult.new(operation, nil, error)
-          inner_callback.call(result)
-        })
+      http_method = http_method.to_s.upcase
+      if http_method == "POST"
+        operation_or_task = self.POST(path,
+          parameters: parameters,
+          constructingBodyWithBlock: multipart_callback,
+          success: AFMotion::Operation.success_block_for_http_method(:post, inner_callback),
+          failure: AFMotion::Operation.failure_block(inner_callback))
+      else
+        operation_or_task = self.PUT(path,
+          parameters: parameters,
+          constructingBodyWithBlock: multipart_callback,
+          success: AFMotion::Operation.success_block_for_http_method(:pust, inner_callback),
+          failure: AFMotion::Operation.failure_block(inner_callback))
+      end
       if upload_callback
-        operation.setUploadProgressBlock(upload_callback)
+        if operation_or_task.is_a?(AFURLConnectionOperation)
+          operation_or_task.setUploadProgressBlock(upload_callback)
+        else
+          # using NSURLSession - messy, probably leaks
+          @observer = SessionObserver.new(operation_or_task, upload_callback)
+        end
       end
-      operation
+      operation_or_task
     end
 
     def create_operation(http_method, path, parameters = {}, &callback)

data/lib/afmotion/http_client.rb

@@ -79,52 +79,6 @@ module AFMotion
   end
 end
 
-# TODO: remove this when/if https://github.com/AFNetworking/AFNetworking/issues/1388 resolved
-module AFMotion
-  module QueryPairHelper
-    module_function
-
-    def af_QueryStringPairsFromDictionary(dictionary)
-      af_QueryStringPairsFromKeyAndValue(nil, dictionary)
-    end
-
-    def af_QueryStringPairsFromKeyAndValue(key, value)
-      mutableQueryStringComponents = []
-      if value.is_a?(NSDictionary)
-        sortDescriptor = NSSortDescriptor.sortDescriptorWithKey("description", ascending: true, selector:'caseInsensitiveCompare:')
-        value.allKeys.sortedArrayUsingDescriptors([sortDescriptor]).each do |nestedKey|
-          nestedValue = value[nestedKey]
-          if nestedValue
-            mutableQueryStringComponents += af_QueryStringPairsFromKeyAndValue(key ? "#{key}[#{nestedKey}]" : nestedKey, nestedValue)
-          end
-        end
-      elsif value.is_a?(NSArray)
-        value.each do |obj|
-          mutableQueryStringComponents += af_QueryStringPairsFromKeyAndValue(key, obj)
-        end
-      elsif value.is_a?(NSSet)
-        value.each do |obj|
-          mutableQueryStringComponents += af_QueryStringPairsFromKeyAndValue(key, obj)
-        end
-      else
-        mutableQueryStringComponents << AFQueryStringPair.alloc.initWithField(key, value: value)
-      end
-
-      mutableQueryStringComponents
-    end
-  end
-
-  class MultipartParametersWrapper < Hash
-    def initialize(parameters)
-      super()
-      query_pairs = QueryPairHelper.af_QueryStringPairsFromDictionary(parameters)
-      query_pairs.each do |key_pair|
-        self[key_pair.field] = key_pair.value
-      end
-    end
-  end
-end
-
 class AFHTTPRequestOperationManager
   include AFMotion::ClientShared
 
@@ -134,4 +88,17 @@ class AFHTTPRequestOperationManager
       create_operation(method, path, parameters, &callback)
     end
   end
+
+  # options = {parameters: , constructingBodyWithBlock: , success:, failure:}
+  def PUT(url_string, options = {})
+    parameters = options[:parameters]
+    block = options[:constructingBodyWithBlock]
+    success = options[:success]
+    failure = options[:failure]
+    request = self.requestSerializer.multipartFormRequestWithMethod("PUT", URLString: NSURL.URLWithString(url_string, relativeToURL:self.baseURL).absoluteString, parameters: parameters, constructingBodyWithBlock:block)
+    operation = self.HTTPRequestOperationWithRequest(request, success:success, failure:failure)
+    self.operationQueue.addOperation(operation)
+
+    operation
+  end
 end

data/lib/afmotion/http_result.rb

@@ -3,7 +3,7 @@ module AFMotion
     attr_accessor :operation, :object, :error, :task
 
     def initialize(operation_or_task, responseObject, error)
-      if operation_or_task.is_a?(NSURLSessionTask) ||
+      if defined?(NSURLSessionTask) && operation_or_task.is_a?(NSURLSessionTask) ||
         # cluser class ugh
         operation_or_task.class.to_s.include?("Task")
         self.task = operation_or_task

data/lib/afmotion/operation.rb

@@ -10,20 +10,21 @@ module AFMotion
 
     def success_block_for_http_method(http_method, callback)
       if http_method.downcase.to_sym == :head
-        return lambda { |operation|
-          AFMotion::HTTPResult.new(operation, nil, nil)
+        return lambda { |operation_or_task|
+          AFMotion::HTTPResult.new(operation_or_task, nil, nil)
         }
       end
 
-      lambda { |operation, responseObject|
-        result = AFMotion::HTTPResult.new(operation, responseObject, nil)
+      lambda { |operation_or_task, responseObject|
+        result = AFMotion::HTTPResult.new(operation_or_task, responseObject, nil)
         callback.call(result)
       }
     end
 
     def failure_block(callback)
-      lambda { |operation, error|
-        result = AFMotion::HTTPResult.new(operation, nil, error)
+      lambda { |operation_or_task, error|
+        response_object = operation_or_task.is_a?(AFHTTPRequestOperation) ? operation_or_task.responseObject : nil
+        result = AFMotion::HTTPResult.new(operation_or_task, response_object, error)
         callback.call(result)
       }
     end

data/lib/afmotion/session_client.rb

@@ -125,4 +125,26 @@ class AFHTTPSessionManager
       create_task(method, path, parameters, &callback)
     end
   end
+
+  # options = {parameters: , constructingBodyWithBlock: , success:, failure:}
+  def PUT(url_string, options = {})
+    parameters = options[:parameters]
+    block = options[:constructingBodyWithBlock]
+    success = options[:success]
+    failure = options[:failure]
+
+    request = self.requestSerializer.multipartFormRequestWithMethod("PUT", URLString: NSURL.URLWithString(url_string, relativeToURL: self.baseURL).absoluteString, parameters:parameters, constructingBodyWithBlock:block)
+
+    task = self.dataTaskWithRequest(request, completionHandler: ->(response, responseObject, error) {
+      if error && failure
+        failure.call(task, error)
+      elsif success
+        success.call(task, responseObject)
+      end
+    })
+
+    task.resume
+
+    task
+  end
 end

data/lib/afmotion/version.rb

@@ -1,5 +1,5 @@
 module AFMotion
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 
   HTTP_METHODS = [:get, :post, :put, :delete, :patch, :head]
 end

data/lib/afmotion.rb

@@ -16,6 +16,6 @@ Motion::Project::App.setup do |app|
   end
 
   app.pods do
-    pod 'AFNetworking', '~> 2.0.0'
+    pod 'AFNetworking', '~> 2.0.1'
   end
 end

data/spec/http_client_spec.rb

@@ -131,50 +131,55 @@ describe "AFHTTPClient" do
     end
   end
 
-  describe "#multipart_post" do
-    it "should trigger multipart request" do
-      @client.multipart_post("", test: "Herp") do |result, form_data|
-        @result = result
-        resume if result
-      end
+  ["multipart_post", "multipart_put"].each do |multipart_method|
+    describe "##{multipart_method}" do
+      it "should trigger multipart request" do
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data|
+          @result = result
+          resume if result
+        end
 
-      wait_max(10) do
-        @result.should.not == nil
-        @result.operation.request.valueForHTTPHeaderField("Content-Type").include?("multipart/form-data").should == true
+        wait_max(10) do
+          @result.should.not == nil
+          @result.operation.request.valueForHTTPHeaderField("Content-Type").include?("multipart/form-data").should == true
+        end
       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
+      it "should work with form data" do
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data|
+          if result
+            resume
+          else
+            @form_data = form_data
+          end
         end
-      end
 
-      wait_max(10) do
-        @form_data.should.not == nil
+        wait_max(10) do
+          @form_data.should.not == nil
+        end
       end
-    end
 
-    it "should have upload callback with raw progress" do
-      image = UIImage.imageNamed("test")
-      @data = UIImagePNGRepresentation(image)
-      @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("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
+      it "should have upload callback with raw progress" do
+        image = UIImage.imageNamed("test")
+        @data = UIImagePNGRepresentation(image)
+        @file_added = false
+        @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("http://bing.com/".to_url)
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data, progress|
+          if form_data
+            @file_added = true
+            form_data.appendPartWithFileData(@data, name: "test", fileName:"test.png", mimeType: "image/png")
+          elsif progress
+            @progress ||= progress
+          elsif result
+            resume
+          end
         end
-      end
 
-      wait_max(20) do
-        @progress.should <= 1.0
-        @progress.should.not == nil
+        wait_max(20) do
+          @file_added.should == true
+          @progress.should <= 1.0
+          @progress.should.not == nil
+        end
       end
     end
   end

data/spec/session_client_spec.rb

@@ -105,7 +105,7 @@ end
 
 describe "AFHTTPSessionManager" do
   before do
-    @client = AFHTTPSessionManager.alloc.initWithBaseURL("http://google.com/".to_url,
+    @client = AFHTTPSessionManager.alloc.initWithBaseURL("http://bing.com/".to_url,
       sessionConfiguration: NSURLSessionConfiguration.defaultSessionConfiguration)
   end
 
@@ -167,50 +167,59 @@ describe "AFHTTPSessionManager" do
     end
   end
 
-  describe "#multipart_post" do
-    it "should trigger multipart request" do
-      @client.multipart_post("", test: "Herp") do |result, form_data|
-        @result = result
-        resume if result
-      end
 
-      wait_max(10) do
-        @result.should.not == nil
-        @result.task.currentRequest.valueForHTTPHeaderField("Content-Type").include?("multipart/form-data").should == true
-      end
-    end
+  ["multipart_post", "multipart_put"].each do |multipart_method|
+    describe "##{multipart_method}" do
+      it "should trigger multipart request" do
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data|
+          @result = result
+          resume if result
+        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
+        wait_max(10) do
+          @result.should.not == nil
+          @result.task.currentRequest.valueForHTTPHeaderField("Content-Type").include?("multipart/form-data").should == true
         end
       end
 
-      wait_max(10) do
-        @form_data.should.not == nil
-      end
-    end
+      it "should work with form data" do
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data|
+          if result
+            resume
+          else
+            @form_data = form_data
+          end
+        end
 
-    it "should have upload callback with raw progress" do
-      image = UIImage.imageNamed("test")
-      @data = UIImagePNGRepresentation(image)
-      @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("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
+        wait_max(10) do
+          @form_data.should.not == nil
         end
       end
 
-      wait_max(20) do
-        @progress.should <= 1.0
-        @progress.should.not == nil
+      it "should have upload callback with raw progress" do
+        image = UIImage.imageNamed("test")
+        @data = UIImagePNGRepresentation(image)
+        @file_added = nil
+        @client.send(multipart_method, "", test: "Herp") do |result, form_data, progress|
+          if form_data
+            @file_added = true
+            form_data.appendPartWithFileData(@data, name: "test", fileName:"test.png", mimeType: "image/png")
+          elsif progress
+            @progress ||= progress
+          elsif result
+            @result = result
+            resume
+          end
+        end
+
+        wait_max(20) do
+          @file_added.should == true
+          if (UIDevice.currentDevice.model =~ /simulator/i).nil?
+            @progress.should <= 1.0
+            @progress.should.not == nil
+          end
+          @result.should.not == nil
+        end
       end
     end
   end

data/vendor/Podfile.lock

@@ -21,7 +21,7 @@ PODS:
     - AFNetworking/NSURLConnection
 
 DEPENDENCIES:
-  - AFNetworking (~> 2.0.0)
+  - AFNetworking (~> 2.0.1)
 
 SPEC CHECKSUMS:
   AFNetworking: a6f11ac4ac087303e6ff87adc1ba57b0dac20ef8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - AFMotion.gemspec
 - Gemfile
 - Gemfile.lock