afmotion 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90bbeab670fa163a23a4a02b4c9e0adbb8c2edb
-  data.tar.gz: b713abfe1188c39566ae6787a2732f1c615c8cf5
+  metadata.gz: 9c957c44c8f314d56ba6de33807ee4abaa7a842e
+  data.tar.gz: d15335cebcadd474f2ba2931d8172f8a3eb56c61
 SHA512:
-  metadata.gz: 56effec5e307c84dc035f793c25d210d713421e704db149033dcbf16f1cbf499c6e701785b30134e4c914da916261dca4e9b4822f9369862a9ce64a41c87fdeb
-  data.tar.gz: ec5008be1781a1e21388bed27e1498c3a26c3e8d26f7adc481902df7db629c2f95206d6c53c0c0e4d6c1a49ee82e7ce1b58df3e5088a5162e23056846531a28a
+  metadata.gz: 1d4e7deb050500b64ff7dc762723efe7761587c96467696c83edd3a82ab8b21bb760105a776791551d115a628fe0b99842faecd7623d16c2907f1f8958e9a96a
+  data.tar.gz: 084984dcf52bc788c36c05e26a004e16f2a1d5af89fd48bd6986842e62f5515efce55d75ded1d6f28d027b980d631c060bf1faa01cd6ec3711f02eb8ab13408f

data/AFMotion.gemspec

@@ -18,4 +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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afmotion (2.2.0)
+    afmotion (2.3.1)
       motion-cocoapods (>= 1.4.1)
       motion-require (>= 0.1)
 
@@ -48,10 +48,11 @@ GEM
       cocoapods (>= 0.32.1)
     motion-require (0.2.0)
     multi_json (1.10.1)
-    nap (0.7.0)
+    nap (0.8.0)
     netrc (0.7.7)
     open4 (1.3.4)
-    rake (10.1.0)
+    rake (10.3.2)
+    webstub (1.0.1)
     xcodeproj (0.17.0)
       activesupport (~> 3.0)
       colored (~> 1.2)
@@ -62,3 +63,4 @@ PLATFORMS
 DEPENDENCIES
   afmotion!
   rake
+  webstub

data/Rakefile

@@ -8,6 +8,8 @@ Bundler.require :default
 $:.unshift("./lib/")
 require './lib/afmotion'
 
+require 'webstub'
+
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'AFMotion'

data/lib/afmotion.rb

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

data/lib/afmotion/http.rb

@@ -18,6 +18,7 @@ module AFMotion
   class JSON < HTTP
     def self.configure_manager(manager)
       manager.json!
+      manager.responseSerializer.readingOptions = NSJSONReadingMutableContainers
     end
   end
 

data/lib/afmotion/http_client.rb

@@ -73,13 +73,20 @@ module AFMotion
       form: AFHTTPResponseSerializer
     }
     def response_serializer(serializer)
+      write_json_options = true
       if serializer.is_a?(Symbol) || serializer.is_a?(String)
         @operation_manager.responseSerializer = OPERATION_TO_RESPONSE_SERIALIZER[serializer.to_sym].serializer
       elsif serializer.is_a?(Class)
         @operation_manager.responseSerializer = serializer.serializer
       else
         @operation_manager.responseSerializer = serializer
+        write_json_options = false
       end
+      af_serializer = @operation_manager.responseSerializer
+      if af_serializer.is_a?(AFJSONResponseSerializer) && write_json_options
+        af_serializer.readingOptions = NSJSONReadingMutableContainers
+      end
+      af_serializer
     end
   end
 end
@@ -89,7 +96,7 @@ class AFHTTPRequestOperationManager
 
   AFMotion::HTTP_METHODS.each do |method|
     # EX client.get('my/resource.json')
-    define_method "#{method}", -> (path, parameters = {}, &callback) do
+    define_method "#{method}", -> (path, parameters = nil, &callback) do
       create_operation(method, path, parameters, &callback)
     end
   end

data/lib/afmotion/version.rb

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

data/spec/http_client_spec.rb

@@ -49,6 +49,16 @@ describe "AFMotion::ClientDSL" do
         @client.responseSerializer.is_a?(enc_class).should == true
       end
     end
+
+    it "should set mutable reading options for JSON serializer" do
+      @dsl.response_serializer :json
+      @client.responseSerializer.readingOptions.should == NSJSONReadingMutableContainers
+    end
+
+    it "should not set reading options for JSON serializer if raw one supplied" do
+      @dsl.response_serializer AFJSONResponseSerializer.serializer
+      @client.responseSerializer.readingOptions.should.not == NSJSONReadingMutableContainers
+    end
   end
 end
 

data/spec/integration_spec.rb

@@ -0,0 +1,69 @@
+describe "AFMotion" do
+  extend WebStub::SpecHelpers
+
+  before do
+    disable_network_access!
+  end
+
+  after do
+    enable_network_access!
+    reset_stubs
+  end
+
+  describe "JSON" do
+    it "should use mutable containers" do
+      url = "http://example.com/"
+      stub_request(:get, url).
+        to_return(json: {"data" => ["thing"]}, delay: 0.3)
+
+      AFMotion::JSON.get(url) do |result|
+        @object = result.object
+        resume
+      end
+
+      wait_max 1.0 do
+        array = @object['data']
+        array << 'derp'
+        array.count.should == 2
+
+        @object['hello'] = 'world'
+        @object.count.should == 2
+
+        @object.delete('data')
+        @object.count.should == 1
+      end
+    end
+  end
+
+  describe "Client" do
+    describe "JSON" do
+      it "should use mutable containers" do
+        base_url = "http://example.com/"
+        path = "path"
+        stub_request(:get, base_url + path).
+          to_return(json: {"data" => ["thing"]}, delay: 0.3)
+
+        client = AFMotion::Client.build(base_url) do
+          response_serializer :json
+        end
+
+        client.get(path, nil) do |result|
+          @object = result.object
+          resume
+        end
+
+        wait_max 1.0 do
+          array = @object['data']
+          array << 'derp'
+          array.count.should == 2
+
+          @object['hello'] = 'world'
+          @object.count.should == 2
+
+          @object.delete('data')
+          @object.count.should == 1
+        end
+      end
+    end
+  end
+end

data/spec/session_client_spec.rb

@@ -48,6 +48,16 @@ describe "AFMotion::SessionClientDSL" do
         @dsl.to_session_manager.responseSerializer.is_a?(enc_class).should == true
       end
     end
+
+    it "should set mutable reading options for JSON serializer" do
+      @dsl.response_serializer :json
+      @dsl.to_session_manager.responseSerializer.readingOptions.should == NSJSONReadingMutableContainers
+    end
+
+    it "should not set reading options for JSON serializer if raw one supplied" do
+      @dsl.response_serializer AFJSONResponseSerializer.serializer
+      @dsl.to_session_manager.responseSerializer.readingOptions.should.not == NSJSONReadingMutableContainers
+    end
   end
 
   describe "#session_configuration" do

data/vendor/Podfile.lock

@@ -1,28 +1,30 @@
 PODS:
-  - AFNetworking (2.2.4):
+  - AFNetworking (2.3.1):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
     - AFNetworking/UIKit
-  - AFNetworking/NSURLConnection (2.2.4):
+  - AFNetworking/NSURLConnection (2.3.1):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.2.4):
-    - AFNetworking/NSURLConnection
-  - AFNetworking/Reachability (2.2.4)
-  - AFNetworking/Security (2.2.4)
-  - AFNetworking/Serialization (2.2.4)
-  - AFNetworking/UIKit (2.2.4):
+  - AFNetworking/NSURLSession (2.3.1):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (2.3.1)
+  - AFNetworking/Security (2.3.1)
+  - AFNetworking/Serialization (2.3.1)
+  - AFNetworking/UIKit (2.3.1):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
 
 DEPENDENCIES:
-  - AFNetworking (~> 2.2.4)
+  - AFNetworking (~> 2.3.1)
 
 SPEC CHECKSUMS:
-  AFNetworking: ab63e259fe91eef4519b371ef0a4955af0e73e64
+  AFNetworking: 6d7b76aa5d04c8c37daad3eef4b7e3f2a7620da3
 
 COCOAPODS: 0.33.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afmotion
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webstub
+  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
 email:
 - clay.allsopp@gmail.com
@@ -82,6 +96,7 @@ files:
 - resources/test.png
 - spec/http_client_spec.rb
 - spec/http_spec.rb
+- spec/integration_spec.rb
 - spec/session_client_spec.rb
 - vendor/Podfile.lock
 homepage: https://github.com/clayallsopp/AFMotion
@@ -111,4 +126,5 @@ summary: A RubyMotion Wrapper for AFNetworking
 test_files:
 - spec/http_client_spec.rb
 - spec/http_spec.rb
+- spec/integration_spec.rb
 - spec/session_client_spec.rb