afmotion 0.9.0 → 2.0.0.rc1

data/spec/http_client_spec.rb

@@ -1,47 +1,52 @@
 describe "AFMotion::ClientDSL" do
   before do
-    @client = AFHTTPClient.clientWithBaseURL("http://url".to_url)
+    @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("http://url".to_url)
     @dsl = AFMotion::ClientDSL.new(@client)
   end
 
   describe "#header" do
     it "should set header" do
       @dsl.header "Accept", "application/json"
-      @client.defaultValueForHeader("Accept").should == "application/json"
+      @client.requestSerializer.HTTPRequestHeaders["Accept"].should == "application/json"
     end
   end
 
   describe "#authorization" do
     it "should set authorization" do
       @dsl.authorization username: "clay", password: "test"
-      @client.defaultValueForHeader("Authorization").nil?.should == false
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].nil?.should == false
     end
   end
 
-  describe "#operation" do
-    it "should set operation if provided type" do
-      @dsl.operation AFJSONRequestOperation
-      @client.registeredHTTPOperationClassNames.member?("AFJSONRequestOperation").should == true
+  describe "#request_serializer" do
+    it "should set request_serializer if provided type" do
+      @dsl.request_serializer AFJSONRequestSerializer
+      @client.requestSerializer.is_a?(AFJSONRequestSerializer).should == true
     end
 
-    it "should set operation if provided string" do
-      [["json", "AFJSONRequestOperation"], ["xml", "AFXMLRequestOperation"], ["plist", "AFPropertyListRequestOperation"]].each do |op, op_class|
-        @dsl.operation op
-        @client.registeredHTTPOperationClassNames.member?(op_class).should == true
+    it "should set request_serializer if provided string" do
+      [["json", AFJSONRequestSerializer], ["plist", AFPropertyListRequestSerializer]].each do |op, op_class|
+        @dsl.request_serializer op
+        @client.requestSerializer.is_a?(op_class).should == true
       end
     end
   end
 
-  describe "#parameter_encoding" do
-    it "should set encoding if provided type" do
-      @dsl.parameter_encoding AFJSONParameterEncoding
-      @client.parameterEncoding.should == AFJSONParameterEncoding
-    end
-
-    it "should set encoding if provided string" do
-      [["json", AFJSONParameterEncoding], ["form", AFFormURLParameterEncoding], ["plist", AFPropertyListParameterEncoding]].each do |enc, enc_class|
-        @dsl.parameter_encoding enc
-        @client.parameterEncoding.should == enc_class
+  describe "#response_serializer" do
+    it "should set response_serializer if provided type" do
+      @dsl.response_serializer AFJSONResponseSerializer
+      @client.responseSerializer.is_a?(AFJSONResponseSerializer).should == true
+    end
+
+    it "should set response_serializer if provided string" do
+      [["json", AFJSONResponseSerializer],
+       ["form", AFHTTPResponseSerializer],
+       ["http", AFHTTPResponseSerializer],
+       ["xml", AFXMLParserResponseSerializer],
+       ["plist", AFPropertyListResponseSerializer],
+       ["image", AFImageResponseSerializer]].each do |enc, enc_class|
+        @dsl.response_serializer enc
+        @client.responseSerializer.is_a?(enc_class).should == true
       end
     end
   end
@@ -49,9 +54,9 @@ end
 
 describe "AFMotion::Client" do
   describe ".build" do
-    it "should return an AFHTTPClient" do
+    it "should return an AFHTTPRequestOperationManager" do
       client = AFMotion::Client.build("http://url")
-      client.is_a?(AFHTTPClient).should == true
+      client.is_a?(AFHTTPRequestOperationManager).should == true
     end
   end
 
@@ -65,7 +70,7 @@ end
 
 describe "AFHTTPClient" do
   before do
-    @client = AFHTTPClient.clientWithBaseURL("http://google.com/".to_url)
+    @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("http://google.com/".to_url)
   end
 
   describe "URL Helpers" do
@@ -91,21 +96,21 @@ describe "AFHTTPClient" do
   describe "#authorization=" do
     it "should set basic auth" do
       @client.authorization = {username: "clay", password: "pass"}
-      @client.defaultValueForHeader("Authorization").split[0].should == "Basic"
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].split[0].should == "Basic"
     end
   end
 
   describe "#build_shared" do
     it "should set AFMotion::Client.shared" do
       @client.authorization = {token: "clay"}
-      @client.defaultValueForHeader("Authorization").split[0].should == "Token"
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].split[0].should == "Token"
     end
   end
 
   describe "#headers" do
     describe "#[]" do
       it "should return a header" do
-        @client.setDefaultHeader("test", value: "test_value")
+        @client.requestSerializer.setValue("test_value", forHTTPHeaderField: "test")
         @client.headers["test"].should == "test_value"
       end
     end
@@ -113,29 +118,24 @@ describe "AFHTTPClient" do
     describe "#[]=" do
       it "should set a header" do
         @client.headers["test"] = "test_set_value"
-        @client.defaultValueForHeader("test").should == "test_set_value"
+        @client.requestSerializer.HTTPRequestHeaders["test"].should == "test_set_value"
       end
     end
 
     describe "#delete" do
       it "should remove a header" do
-        @client.setDefaultHeader("test", value: "test_value")
+        @client.requestSerializer.setValue("test_value", forHTTPHeaderField: "test")
         @client.headers.delete("test").should == "test_value"
-        @client.defaultValueForHeader("test").should == nil
+        @client.requestSerializer.HTTPRequestHeaders["test"].should == nil
       end
     end
   end
 
-  describe "#multipart" do
-    it "should trigger multipart logic" do
-      @client.multipart!.should == @client
-      @client.instance_variable_get("@multipart").should == true
-    end
-
+  describe "#multipart_post" do
     it "should trigger multipart request" do
-      @client.multipart!.post("", test: "Herp") do |result|
+      @client.multipart_post("", test: "Herp") do |result, form_data|
         @result = result
-        resume
+        resume if result
       end
 
       wait_max(10) do
@@ -145,7 +145,7 @@ describe "AFHTTPClient" do
     end
 
     it "should work with form data" do
-      @client.multipart!.post("", test: "Herp") do |result, form_data|
+      @client.multipart_post("", test: "Herp") do |result, form_data|
         if result
           resume
         else
@@ -161,8 +161,8 @@ describe "AFHTTPClient" do
     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|
+      @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

data/spec/http_spec.rb

@@ -24,17 +24,6 @@ describe "AFMotion" do
             @result.nil?.should == false
           end
         end
-
-        it "should work with request" do
-          request = NSURLRequest.requestWithURL(NSURL.URLWithString("http://google.com"))
-          _module.get(request) do |result|
-            @result = result
-            resume
-          end
-          wait_max(10) do
-            @result.nil?.should == false
-          end
-        end
       end
     end
   end

data/spec/session_client_spec.rb

@@ -0,0 +1,217 @@
+describe "AFMotion::SessionClientDSL" do
+  before do
+    @dsl = AFMotion::SessionClientDSL.new("http://url")
+  end
+
+  describe "#header" do
+    it "should set header" do
+      @dsl.header "Accept", "application/json"
+      @dsl.to_session_manager.requestSerializer.HTTPRequestHeaders["Accept"].should == "application/json"
+    end
+  end
+
+  describe "#authorization" do
+    it "should set authorization" do
+      @dsl.authorization username: "clay", password: "test"
+      @dsl.to_session_manager.requestSerializer.HTTPRequestHeaders["Authorization"].nil?.should == false
+    end
+  end
+
+  describe "#request_serializer" do
+    it "should set request_serializer if provided type" do
+      @dsl.request_serializer AFJSONRequestSerializer
+      @dsl.to_session_manager.requestSerializer.is_a?(AFJSONRequestSerializer).should == true
+    end
+
+    it "should set request_serializer if provided string" do
+      [["json", AFJSONRequestSerializer], ["plist", AFPropertyListRequestSerializer]].each do |op, op_class|
+        @dsl.request_serializer op
+        @dsl.to_session_manager.requestSerializer.is_a?(op_class).should == true
+      end
+    end
+  end
+
+  describe "#response_serializer" do
+    it "should set response_serializer if provided type" do
+      @dsl.response_serializer AFJSONResponseSerializer
+      @dsl.to_session_manager.responseSerializer.is_a?(AFJSONResponseSerializer).should == true
+    end
+
+    it "should set response_serializer if provided string" do
+      [["json", AFJSONResponseSerializer],
+       ["form", AFHTTPResponseSerializer],
+       ["http", AFHTTPResponseSerializer],
+       ["xml", AFXMLParserResponseSerializer],
+       ["plist", AFPropertyListResponseSerializer],
+       ["image", AFImageResponseSerializer]].each do |enc, enc_class|
+        @dsl.response_serializer enc
+        @dsl.to_session_manager.responseSerializer.is_a?(enc_class).should == true
+      end
+    end
+  end
+
+  describe "#session_configuration" do
+    describe "for default" do
+      it "should work" do
+        @dsl.session_configuration :default
+        @dsl.to_session_manager.sessionConfiguration.URLCache.diskCapacity.should > 0
+      end
+    end
+
+    describe "for ephemeral" do
+      it "should work" do
+        @dsl.session_configuration :ephemeral
+        @dsl.to_session_manager.sessionConfiguration.URLCache.diskCapacity.should == 0
+      end
+    end
+
+    describe "for background" do
+      it "should work" do
+        @dsl.session_configuration :background, "com.usepropeller.afmotion.test"
+        manager = @dsl.to_session_manager
+        manager.sessionConfiguration.sessionSendsLaunchEvents.should == true
+        manager.sessionConfiguration.identifier.should == "com.usepropeller.afmotion.test"
+      end
+    end
+
+    describe "for instances" do
+      it "should work" do
+        session_config = NSURLSessionConfiguration.defaultSessionConfiguration
+        session_config.identifier = "test"
+        @dsl.session_configuration session_config
+        @dsl.to_session_manager.sessionConfiguration.should == session_config
+      end
+    end
+  end
+end
+
+describe "AFMotion::SessionClient" do
+  describe ".build" do
+    it "should return an AFHTTPSessionManager" do
+      client = AFMotion::SessionClient.build("http://url") do
+      end
+      client.is_a?(AFHTTPSessionManager).should == true
+    end
+  end
+
+  describe ".build_shared" do
+    it "should set AFMotion::SessionClient.shared" do
+      client = AFMotion::SessionClient.build_shared("http://url") do
+      end
+      AFMotion::SessionClient.shared.should == client
+    end
+  end
+end
+
+describe "AFHTTPSessionManager" do
+  before do
+    @client = AFHTTPSessionManager.alloc.initWithBaseURL("http://google.com/".to_url,
+      sessionConfiguration: NSURLSessionConfiguration.defaultSessionConfiguration)
+  end
+
+  describe "URL Helpers" do
+    it "should exist" do
+      AFMotion::HTTP_METHODS.each do |method|
+        @client.respond_to?(method).should == true
+      end
+    end
+  end
+
+  # Pretty basic test
+  it "should work" do
+    @result = nil
+    @client.get("") do |result|
+      @result = result
+      resume
+    end
+    wait_max(10) do
+      @result.nil?.should == false
+    end
+  end
+
+  describe "#authorization=" do
+    it "should set basic auth" do
+      @client.authorization = {username: "clay", password: "pass"}
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].split[0].should == "Basic"
+    end
+  end
+
+  describe "#build_shared" do
+    it "should set AFMotion::Client.shared" do
+      @client.authorization = {token: "clay"}
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].split[0].should == "Token"
+    end
+  end
+
+  describe "#headers" do
+    describe "#[]" do
+      it "should return a header" do
+        @client.requestSerializer.setValue("test_value", forHTTPHeaderField: "test")
+        @client.headers["test"].should == "test_value"
+      end
+    end
+
+    describe "#[]=" do
+      it "should set a header" do
+        @client.headers["test"] = "test_set_value"
+        @client.requestSerializer.HTTPRequestHeaders["test"].should == "test_set_value"
+      end
+    end
+
+    describe "#delete" do
+      it "should remove a header" do
+        @client.requestSerializer.setValue("test_value", forHTTPHeaderField: "test")
+        @client.headers.delete("test").should == "test_value"
+        @client.requestSerializer.HTTPRequestHeaders["test"].should == nil
+      end
+    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
+
+    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
+
+    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
+        end
+      end
+
+      wait_max(20) do
+        @progress.should <= 1.0
+        @progress.should.not == nil
+      end
+    end
+  end
+end

data/vendor/Podfile.lock

@@ -1,10 +1,29 @@
 PODS:
-  - AFNetworking (1.0.1)
+  - AFNetworking (2.0.1):
+    - AFNetworking/NSURLConnection
+    - AFNetworking/NSURLSession
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+    - AFNetworking/UIKit
+  - AFNetworking/NSURLConnection (2.0.1):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/NSURLSession (2.0.1):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (2.0.1)
+  - AFNetworking/Security (2.0.1)
+  - AFNetworking/Serialization (2.0.1)
+  - AFNetworking/UIKit (2.0.1):
+    - AFNetworking/NSURLConnection
 
 DEPENDENCIES:
-  - AFNetworking
+  - AFNetworking (~> 2.0.0)
 
 SPEC CHECKSUMS:
-  AFNetworking: 0bce3ae41023e080e96b8a2e0d07c94709f72a81
+  AFNetworking: a6f11ac4ac087303e6ff87adc1ba57b0dac20ef8
 
-COCOAPODS: 0.23.0
+COCOAPODS: 0.26.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -16,26 +16,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: motion-require
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A RubyMotion Wrapper for AFNetworking
@@ -54,19 +68,20 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/afmotion.rb
+- lib/afmotion/client_shared.rb
 - lib/afmotion/http.rb
 - lib/afmotion/http_client.rb
 - lib/afmotion/http_result.rb
-- lib/afmotion/image.rb
 - lib/afmotion/operation.rb
 - lib/afmotion/patch/NSString_NSUrl.rb
-- lib/afmotion/patch/NSURLRequest_params.rb
+- lib/afmotion/patch/UIImageView_url.rb
+- lib/afmotion/serializer.rb
+- lib/afmotion/session_client.rb
 - lib/afmotion/version.rb
 - resources/test.png
 - spec/http_client_spec.rb
 - spec/http_spec.rb
-- spec/ns_url_request_spec.rb
-- spec/operation_spec.rb
+- spec/session_client_spec.rb
 - vendor/Podfile.lock
 homepage: https://github.com/clayallsopp/AFMotion
 licenses:
@@ -78,14 +93,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -95,5 +110,4 @@ summary: A RubyMotion Wrapper for AFNetworking
 test_files:
 - spec/http_client_spec.rb
 - spec/http_spec.rb
-- spec/ns_url_request_spec.rb
-- spec/operation_spec.rb
+- spec/session_client_spec.rb

data/lib/afmotion/patch/NSURLRequest_params.rb

@@ -1,49 +0,0 @@
-class NSMutableURLRequest
-  alias_method :url, :URL
-  
-  def url=(url)
-    self.setURL(url.to_url)
-  end
-
-  def content_type=(content_type)
-    self.setValue(content_type, forHTTPHeaderField: "Content-Type")
-  end
-
-  def parameters=(params = {})
-    method = self.HTTPMethod
-
-    af_encoding = params[:__encoding__] || AFFormURLParameterEncoding
-    string_encoding = params[:__string_encoding__] || NSUTF8StringEncoding
-
-    params.delete :__encoding__
-    params.delete :__string_encoding__
-
-    use_url_based_params = ["GET", "HEAD", "DELETE", "PUT"].member?(method)
-
-    if use_url_based_params && !params.empty?
-      url_string = String.new(self.url.absoluteString)
-      has_query = url_string.rangeOfString("?").location == NSNotFound
-      format = has_query ? "?" : "&"
-      encoded = AFQueryStringFromParametersWithEncoding(params, string_encoding)
-      self.url = (url_string << format) << encoded
-    elsif !use_url_based_params
-      charset = CFStringConvertEncodingToIANACharSetName(CFStringConvertNSStringEncodingToEncoding(string_encoding))
-      error = Pointer.new(:object)
-      case af_encoding
-      when AFFormURLParameterEncoding
-        self.content_type = "application/x-www-form-urlencoded; charset=%@" << charset
-        self.HTTPBody = AFQueryStringFromParametersWithEncoding(params, string_encoding).dataUsingEncoding(string_encoding)
-      when AFJSONParameterEncoding
-        self.content_type = "application/json; charset=%@" << charset
-        self.HTTPBody = NSJSONSerialization.dataWithJSONObject(params, options: 0, error: error)
-      when AFPropertyListParameterEncoding
-        self.content_type = "application/x-plist; charset=%@" << charset
-        self.HTTPBody = NSPropertyListSerialization.dataWithPropertyList(params, format: NSPropertyListXMLFormat_v1_0, options: 0, error: error)
-      end
-
-      if error[0]
-        p "NSURLRequest #{self.inspect}#parameters=#{params.inspect} ERROR: #{error.localizedDescription}"
-      end
-    end
-  end
-end

data/spec/ns_url_request_spec.rb

@@ -1,41 +0,0 @@
-describe "NSMutableURLRequest" do
-  describe "parameters=" do
-    before do
-      @base_url = "http://google.com"
-    end
-
-    ["GET", "HEAD", "DELETE", "PUT"].each do |method|
-      it "should work with #{method} requests" do
-        @request = NSMutableURLRequest.requestWithURL(NSURL.URLWithString(@base_url))
-
-        @request.HTTPMethod = method
-
-        @request.parameters = {herp: "derp", "another" => 3}
-        @request.url.absoluteString.should == "http://google.com?herp=derp&another=3"
-      end
-    end
-
-    [:default, :URL, :JSON, :XML].each do |encoding|
-      it "POST should work with #{encoding} encoding" do
-        @request = NSMutableURLRequest.requestWithURL(NSURL.URLWithString(@base_url))
-        @request.HTTPMethod = "POST"
-
-        parameters = {herp: "derp", "another" => 3}
-        case encoding
-        when :URL
-          @request.parameters = parameters.merge({__encoding__: AFFormURLParameterEncoding})
-          String.new(@request.HTTPBody).should == "herp=derp&another=3"
-        when :JSON
-          @request.parameters = parameters.merge({__encoding__: AFJSONParameterEncoding})
-          String.new(@request.HTTPBody).should == "{\"herp\":\"derp\",\"another\":3}"
-        when :XML
-          @request.parameters = parameters.merge({__encoding__: AFPropertyListParameterEncoding})
-          String.new(@request.HTTPBody).should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>another</key>\n\t<integer>3</integer>\n\t<key>herp</key>\n\t<string>derp</string>\n</dict>\n</plist>\n"
-        else
-          @request.parameters = parameters
-          String.new(@request.HTTPBody).should == "herp=derp&another=3"
-        end
-      end
-    end
-  end
-end