afmotion 2.6 → 3.0

data/Gemfile.lock

@@ -1,74 +0,0 @@
-PATH
-  remote: .
-  specs:
-    afmotion (2.5)
-      motion-cocoapods (>= 1.4.1)
-      motion-require (>= 0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    claide (0.8.1)
-    cocoapods (0.36.0)
-      activesupport (>= 3.2.15)
-      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.2.1)
-      nap (~> 0.8)
-      open4 (~> 1.3)
-      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.1)
-    cocoapods-plugins (0.4.1)
-      nap
-    cocoapods-trunk (0.6.0)
-      nap (>= 0.8)
-      netrc (= 0.7.8)
-    cocoapods-try (0.4.3)
-    colored (1.2)
-    escape (0.0.4)
-    fuzzy_match (2.0.4)
-    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.4.2)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    webstub (1.1.2)
-    xcodeproj (0.23.0)
-      activesupport (>= 3)
-      colored (~> 1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  afmotion!
-  rake
-  webstub (~> 1.1)
-
-BUNDLED WITH
-   1.10.4

data/lib/afmotion/http_client.rb

@@ -1,136 +0,0 @@
-motion_require 'version'
-motion_require 'client_shared'
-
-module AFMotion
-  class Client
-    class << self
-      attr_accessor :shared
-
-      # Returns an instance of AFHTTPRequestOperationManager
-      def build(base_url, &block)
-        operation_manager = AFHTTPRequestOperationManager.alloc.initWithBaseURL(base_url.to_url)
-        if block
-          dsl = AFMotion::ClientDSL.new(operation_manager)
-          case block.arity
-          when 0
-            dsl.instance_eval(&block)
-          when 1
-            block.call(dsl)
-          end
-        end
-        if !operation_manager.operationQueue
-          operation_manager.operationQueue = NSOperationQueue.mainQueue
-        end
-        operation_manager
-      end
-
-      # Sets AFMotion::Client.shared as the built client
-      def build_shared(base_url, &block)
-        self.shared = self.build(base_url, &block)
-      end
-    end
-  end
-end
-
-module AFMotion
-  class ClientDSL
-    def initialize(operation_manager)
-      @operation_manager = WeakRef.new(operation_manager)
-    end
-
-    def header(header, value)
-      @headers ||= {}
-      @headers[header] = value
-      apply_header(header, value)
-    end
-
-    def authorization(options = {})
-      @authorization = options
-      apply_authorization(options)
-    end
-
-    def operation_queue(operation_queue)
-      @operation_manager.operationQueue = operation_queue
-    end
-
-    OPERATION_TO_REQUEST_SERIALIZER = {
-      json: AFJSONRequestSerializer,
-      plist: AFPropertyListRequestSerializer
-    }
-    def request_serializer(serializer)
-      if serializer.is_a?(Symbol) || serializer.is_a?(String)
-        @operation_manager.requestSerializer = OPERATION_TO_REQUEST_SERIALIZER[serializer.to_sym].serializer
-      elsif serializer.is_a?(Class)
-        @operation_manager.requestSerializer = serializer.serializer
-      else
-        @operation_manager.requestSerializer = serializer
-      end
-      reapply_options
-    end
-
-    OPERATION_TO_RESPONSE_SERIALIZER = {
-      json: AFJSONResponseSerializer,
-      xml: AFXMLParserResponseSerializer,
-      plist: AFPropertyListResponseSerializer,
-      image: AFImageResponseSerializer,
-      http: AFHTTPResponseSerializer,
-      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
-
-    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
-
-class AFHTTPRequestOperationManager
-  include AFMotion::ClientShared
-
-  AFMotion::HTTP_METHODS.each do |method|
-    # EX client.get('my/resource.json')
-    define_method "#{method}", -> (path, parameters = nil, &callback) do
-      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/spec/http_client_spec.rb

@@ -1,225 +0,0 @@
-describe "AFMotion::ClientDSL" do
-  before do
-    @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.requestSerializer.HTTPRequestHeaders["Accept"].should == "application/json"
-    end
-  end
-
-  describe "#authorization" do
-    it "should set authorization" do
-      @dsl.authorization username: "clay", password: "test"
-      @client.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
-      @client.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
-        @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
-    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
-
-    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
-
-describe "AFMotion::Client" do
-  describe ".build" do
-    it "should return an AFHTTPRequestOperationManager" do
-      client = AFMotion::Client.build("http://url")
-      client.is_a?(AFHTTPRequestOperationManager).should == true
-    end
-  end
-
-  describe ".build_shared" do
-    it "should set AFMotion::Client.shared" 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
-
-describe "AFHTTPClient" do
-  before do
-    @client = AFHTTPRequestOperationManager.alloc.initWithBaseURL("http://google.com/".to_url)
-  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
-
-  ["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
-        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
-
-        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)
-        @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
-
-        wait_max(20) do
-          @file_added.should == true
-          @progress.should <= 1.0
-          @progress.should.not == nil
-        end
-      end
-    end
-  end
-end