afmotion 2.5 → 2.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: faa1ecf8a041e3e0ecadf1803e62f3e75df6bab1
-  data.tar.gz: 63bf5af8fc8133cf5d503942c073474d1f2fe522
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGU4YjcxZDY0YTVlMmM2OTIxNzYyZDhmMDBiOGQwYjhkMzkzNDJkYg==
+  data.tar.gz: !binary |-
+    NDFlOWRlZmFlOTkzNTgyMTQyMGUxMzlkYWI1MDcwNDQxYjA4NWMxNg==
 SHA512:
-  metadata.gz: 0fda9bafa27ef7d7e6fe83fd4ddcb0d615cd86ddadce7e6a8354a314cff2ec2585c001530d205afae971abfecdb8cf3f05091a72b87bfe5df78d5e51a0a9cb79
-  data.tar.gz: 3f1a0230a89efbb735b45f590601efc1b848be85b74a71529e130e535c01a654aa3ae514e6c9b5524aa6b1f45a2866065c8f821d6a5755cfeedf6808a83396cf
+  metadata.gz: !binary |-
+    MWRhOGVkYzNiYTE3MDRlNmExYzQ5YTQ3N2MyYjU4ZmYxNTRlMDA5OTNiMjAx
+    ZDI2MjMwNTVjNzA5MWM4Y2E5NmE3NTBhNWQyNWIwNTA1NGQ5NDBlNmYxNDE1
+    Njk2MzJhMjk3YWNkMjY4OWUwYzgwYWU0Yjc3NmIzMTk3MmU4YTQ=
+  data.tar.gz: !binary |-
+    ZWFlYjBiNjhiZDU3NmFhNTE4ZWNiNzU2OTk3YzY5N2M3MWY2NGUxZmVkMzQ3
+    NTZiZWU2Yzg1NzIwNTRjNjlkYzdmMDJmYTIyNTk4ZGY0YTI3ZmVlODYxMzFm
+    NWFmZmEzM2IwN2UwM2Y5M2M5YmQwNzcxM2UwZWZhMTM1ZTRkMGU=

data/.travis.yml

@@ -2,11 +2,24 @@ language: objective-c
 before_install:
 - (ruby --version)
 - sudo chown -R travis ~/Library/RubyMotion
-- mkdir -p ~/Library/RubyMotion/build
+- sudo mkdir -p ~/Library/RubyMotion/build
+- sudo chown -R travis ~/Library/RubyMotion/build
+- sudo motion update
+install:
 - bundle install
-- pod setup
-- bundle exec rake pod:install
+- pod setup > /dev/null
+- bundle exec rake pod:install > /dev/null
+gemfile:
+- Gemfile
 script: bundle exec rake spec
 env:
   global:
-  - COCOAPODS_NO_REPO_UPDATE_OUTPUT=true
+    - COCOAPODS_NO_REPO_UPDATE_OUTPUT=true
+deploy:
+  provider: rubygems
+  api_key:
+    secure: cCwC+P6XvkgW+iE3LY9YpzL8rSwCVVlUQ9dThepSGFN9mmMOYYMhohVm9NS3kkFzCFKCzu80ATi65ndKukOCwLEgsQO4HM9fH2y0XfmYp/aooJUUxzakDA7XI9kWc0SpqURSRujZBobcJnt4HctMLIogihYYQ/DlILgyy+0fU7U=
+  gem: afmotion
+  on:
+    tags: true
+    repo: clayallsopp/afmotion

data/AFMotion.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency "motion-cocoapods", ">= 1.4.1"
   s.add_dependency "motion-require", ">= 0.1"
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'webstub'
-end
+  s.add_development_dependency 'webstub', "~> 1.1"
+end

data/Gemfile.lock

@@ -8,57 +8,57 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.7.0)
-    cocoapods (0.35.0)
+    claide (0.8.1)
+    cocoapods (0.36.0)
       activesupport (>= 3.2.15)
-      claide (~> 0.7.0)
-      cocoapods-core (= 0.35.0)
-      cocoapods-downloader (~> 0.8.0)
-      cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.4.1)
-      cocoapods-try (~> 0.4.2)
+      claide (~> 0.8.1)
+      cocoapods-core (= 0.36.0)
+      cocoapods-downloader (~> 0.8.1)
+      cocoapods-plugins (~> 0.4.1)
+      cocoapods-trunk (~> 0.6.0)
+      cocoapods-try (~> 0.4.3)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.1.2)
+      molinillo (~> 0.2.1)
       nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.20.2)
-    cocoapods-core (0.35.0)
+      xcodeproj (~> 0.23.0)
+    cocoapods-core (0.36.0)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
-    cocoapods-downloader (0.8.0)
-    cocoapods-plugins (0.3.2)
+    cocoapods-downloader (0.8.1)
+    cocoapods-plugins (0.4.1)
       nap
-    cocoapods-trunk (0.4.1)
+    cocoapods-trunk (0.6.0)
       nap (>= 0.8)
       netrc (= 0.7.8)
-    cocoapods-try (0.4.2)
+    cocoapods-try (0.4.3)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
-    i18n (0.6.11)
-    json (1.8.1)
-    minitest (5.5.0)
-    molinillo (0.1.2)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    molinillo (0.2.1)
     motion-cocoapods (1.7.0)
       cocoapods (>= 0.34)
     motion-require (0.2.0)
     nap (0.8.0)
     netrc (0.7.8)
     open4 (1.3.4)
-    rake (10.3.2)
-    thread_safe (0.3.4)
+    rake (10.4.2)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    webstub (1.0.1)
-    xcodeproj (0.20.2)
+    webstub (1.1.2)
+    xcodeproj (0.23.0)
       activesupport (>= 3)
       colored (~> 1.2)
 
@@ -68,4 +68,7 @@ PLATFORMS
 DEPENDENCIES
   afmotion!
   rake
-  webstub
+  webstub (~> 1.1)
+
+BUNDLED WITH
+   1.10.4

data/README.md

@@ -1,6 +1,6 @@
 # AFMotion
 
-[![Build Status](https://travis-ci.org/usepropeller/afmotion.png?branch=master)](https://travis-ci.org/usepropeller/afmotion)
+[![Build Status](https://travis-ci.org/clayallsopp/afmotion.png?branch=master)](https://travis-ci.org/clayallsopp/afmotion)
 
 AFMotion is a thin RubyMotion wrapper for [AFNetworking](https://github.com/AFNetworking/AFNetworking), the absolute best networking library on iOS.
 
@@ -208,7 +208,7 @@ 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
+    # see: http://cocoadocs.org/docsets/AFNetworking/2.5.0/Protocols/AFMultipartFormData.html
     form_data.appendPartWithFileData(data, name: "avatar", fileName:"avatar.png", mimeType: "image/png")
   elsif result.success?
     ...
@@ -257,7 +257,7 @@ The `AFMotion::Client` & `AFMotion::SessionClient` DSLs allows the following pro
 
 - `header(header, value)`
 - `authorization(username: ___, password: ____)` for HTTP Basic auth, or `authorization(token: ____)` for Token based auth.
-- `request_serializer(serializer)`. Allows you to set an [`AFURLRequestSerialization`](http://cocoadocs.org/docsets/AFNetworking/2.0.0/Protocols/AFURLRequestSerialization.html) for all your client's requests, which determines how data is encoded on the way to the server. So if your API is always going to be JSON, you should set `operation(:json)`. Accepts `:json` and `:plist`, or any instance of `AFURLRequestSerialization`.
+- `request_serializer(serializer)`. Allows you to set an [`AFURLRequestSerialization`](http://cocoadocs.org/docsets/AFNetworking/2.0.0/Protocols/AFURLRequestSerialization.html) for all your client's requests, which determines how data is encoded on the way to the server. So if your API is always going to be JSON, you should set `operation(:json)`. Accepts `:json` and `:plist`, or any instance of `AFURLRequestSerialization` and must be called before calling `header` or `authorization` or else the [headers will not be applied](https://github.com/clayallsopp/afmotion/issues/78).
 - `response_serializer(serializer)`. Allows you to set an [`AFURLResponseSerialization`](http://cocoadocs.org/docsets/AFNetworking/2.0.0/Protocols/AFURLResponseSerialization.html), which determines how data is decoded once the server respnds. Accepts `:json`, `:xml`, `:plist`, `:image`, `:http`, or any instance of `AFURLResponseSerialization`.
 
 For `AFMotion::SessionClient` only:

data/Rakefile

@@ -13,4 +13,5 @@ require 'webstub'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'AFMotion'
+  app.deployment_target = "7.1"
 end

data/lib/afmotion.rb

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

data/lib/afmotion/client_shared.rb

@@ -108,7 +108,12 @@ module AFMotion
       method_signature = "#{http_method.upcase}:parameters:success:failure:"
       method = self.method(method_signature)
       success_block = AFMotion::Operation.success_block_for_http_method(http_method, callback)
-      operation = method.call(path, parameters, success_block, AFMotion::Operation.failure_block(callback))
+      failure_block = AFMotion::Operation.failure_block(callback)
+      operation = method.call(path, parameters, success_block, failure_block)
+      if parameters && parameters[:progress_block] && operation.respond_to?(:setDownloadProgressBlock)
+        operation.setDownloadProgressBlock(parameters.delete(:progress_block))
+      end
+      operation
     end
 
     alias_method :create_task, :create_operation
@@ -125,4 +130,4 @@ module AFMotion
       self.PATCH("", parameters: nil, success: nil, failure: nil)
     end
   end
-end
+end

data/lib/afmotion/http.rb

@@ -44,11 +44,12 @@ module AFMotion
     AFMotion::HTTP_METHODS.each do |method_name|
       method_signature = "#{method_name.to_s.upcase}:parameters:success:failure:"
       base.define_singleton_method(method_name, -> (url, parameters = nil, &callback) do
-        base.operation_manager.send(method_signature, url,
+        manager = base.operation_manager
+        manager.send(method_signature, url,
           parameters,
           AFMotion::Operation.success_block_for_http_method(method_name, callback),
           AFMotion::Operation.failure_block(callback))
       end)
     end
   end
-end
+end

data/lib/afmotion/http_client.rb

@@ -39,11 +39,14 @@ module AFMotion
     end
 
     def header(header, value)
-      @operation_manager.headers[header] = value
+      @headers ||= {}
+      @headers[header] = value
+      apply_header(header, value)
     end
 
     def authorization(options = {})
-      @operation_manager.requestSerializer.authorization = options
+      @authorization = options
+      apply_authorization(options)
     end
 
     def operation_queue(operation_queue)
@@ -62,6 +65,7 @@ module AFMotion
       else
         @operation_manager.requestSerializer = serializer
       end
+      reapply_options
     end
 
     OPERATION_TO_RESPONSE_SERIALIZER = {
@@ -88,6 +92,22 @@ module AFMotion
       end
       af_serializer
     end
+
+    private
+
+    def reapply_options
+      @headers.each{ |h,v| apply_header(h, v) } unless @headers.nil?
+      apply_authorization(@authorization) unless @authorization.nil?
+    end
+
+    def apply_header(header, value)
+      @operation_manager.headers[header] = value
+    end
+
+    def apply_authorization(options)
+      @operation_manager.requestSerializer.authorization = options
+    end
+
   end
 end
 
@@ -113,4 +133,4 @@ class AFHTTPRequestOperationManager
 
     operation
   end
-end
+end

data/lib/afmotion/session_client.rb

@@ -91,7 +91,7 @@ module AFMotion
     SESSION_CONFIGURATION_SHORTHAND = {
       default: :defaultSessionConfiguration,
       ephemeral: :ephemeralSessionConfiguration,
-      background: "backgroundSessionConfiguration:".to_sym
+      background: (UIDevice.currentDevice.systemVersion.to_f >= 8.0 ? "backgroundSessionConfigurationWithIdentifier:" : "backgroundSessionConfiguration:").to_sym
     }
 
     def session_configuration(session_configuration, identifier = nil)
@@ -147,4 +147,4 @@ class AFHTTPSessionManager
 
     task
   end
-end
+end

data/lib/afmotion/version.rb

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

data/spec/http_client_spec.rb

@@ -30,6 +30,18 @@ describe "AFMotion::ClientDSL" do
         @client.requestSerializer.is_a?(op_class).should == true
       end
     end
+
+    it "should retain header configuration" do
+      @dsl.header "X-Order", "agnostic"
+      @dsl.request_serializer :json
+      @client.requestSerializer.HTTPRequestHeaders["X-Order"].should == "agnostic"
+    end
+
+    it "should retain authorization" do
+      @dsl.authorization username: "clay", password: "test"
+      @dsl.request_serializer :json
+      @client.requestSerializer.HTTPRequestHeaders["Authorization"].nil?.should == false
+    end
   end
 
   describe "#response_serializer" do
@@ -75,6 +87,23 @@ describe "AFMotion::Client" do
       client = AFMotion::Client.build_shared("http://url")
       AFMotion::Client.shared.should == client
     end
+
+    it "should call progress when given to a chared client" do
+      image_path = "images/srpr/logo3w.png"
+      client = AFMotion::Client.build_shared("https://www.google.com/")
+      @progression = []
+      progress_block = Proc.new do |bytesRead, totalBytesRead, totalBytesExpectedToRead|
+        @progression << [bytesRead, totalBytesRead, totalBytesExpectedToRead]
+      end
+
+      client.get(image_path, {progress_block: progress_block}) do |result|
+        @result = result
+        resume
+      end
+      wait_max(10) do
+        @progression.empty?.should == false
+      end
+    end
   end
 end
 
@@ -193,4 +222,4 @@ describe "AFHTTPClient" do
       end
     end
   end
-end
+end

data/spec/session_client_spec.rb

@@ -177,7 +177,6 @@ describe "AFHTTPSessionManager" do
     end
   end
 
-
   ["multipart_post", "multipart_put"].each do |multipart_method|
     describe "##{multipart_method}" do
       it "should trigger multipart request" do
@@ -233,4 +232,4 @@ describe "AFHTTPSessionManager" do
       end
     end
   end
-end
+end

data/vendor/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
   - AFNetworking (2.5.0):
-    - AFNetworking/NSURLConnection
-    - AFNetworking/NSURLSession
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-    - AFNetworking/UIKit
+    - AFNetworking/NSURLConnection (= 2.5.0)
+    - AFNetworking/NSURLSession (= 2.5.0)
+    - AFNetworking/Reachability (= 2.5.0)
+    - AFNetworking/Security (= 2.5.0)
+    - AFNetworking/Serialization (= 2.5.0)
+    - AFNetworking/UIKit (= 2.5.0)
   - AFNetworking/NSURLConnection (2.5.0):
     - AFNetworking/Reachability
     - AFNetworking/Security
@@ -25,6 +25,6 @@ DEPENDENCIES:
   - AFNetworking (~> 2.5)
 
 SPEC CHECKSUMS:
-  AFNetworking: 0f54cb5d16ce38c1b76948faffb8d5fb705021c7
+  AFNetworking: 96ac9bf3eda33582701cb1fcc5b896aa1e20311e
 
-COCOAPODS: 0.34.1
+COCOAPODS: 0.36.0

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: '2.5'
+  version: '2.6'
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-11-11 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.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: motion-require
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.1'
 - !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'
 - !ruby/object:Gem::Dependency
   name: webstub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 description: A RubyMotion Wrapper for AFNetworking
 email:
 - clay.allsopp@gmail.com
@@ -109,17 +109,17 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A RubyMotion Wrapper for AFNetworking