webstub 0.6.1 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f498c840e10f87af4e242bf40649b85c6e5f554
-  data.tar.gz: 6f73bdb65fd0884065a5aa35a75b5196ebb3a326
+  metadata.gz: 37e56234c1c4c8d97d42419be40c43f66fd225fe
+  data.tar.gz: 2c31c16fee03426ce3b2b2c12e40517da4a9f8f2
 SHA512:
-  metadata.gz: 89d90b6d50d6ead629cd3817d5ed730f61f33263bdab2db6bc5adc563cd7642bd464bc20c64d6affcf22f4f1a0489b2b2434e8ca1591a60fad1ed203906ed0a4
-  data.tar.gz: 6c7c9d832871faa3ad313c4606d18c12cdc8f8893465e189b97f0a4ea381af7ed356ef97efc45d9c3cf927f9aeaefa942c8300f92ce1e394e5fc42bab36ada34
+  metadata.gz: 1ce84e80cef83a0a0cd1dfdfffc8c1fcdcf93e6a1e375bfd3a67ce80138be6b9ca2c6a04f15b28784d4df5b54b2bfa30f10d727085b5c36b46227a8e9221bb94
+  data.tar.gz: fa376e32a5774b2afbf70e11fe2ef11ad46b5ec32c34e9a6a64b5976fe704f555a411aec44b542884a1e76e4b976d2226dd809474c58474dd294f112d9213d40

data/Rakefile

@@ -28,6 +28,7 @@ Motion::Project::App.setup do |app|
 
     app.files << File.join(File.dirname(__FILE__), "lib/spec/spec_delegate.rb")
     app.delegate_class = "SpecDelegate"
+    app.resources_dirs = %w(spec/resources/images)
   end
 
   app.name = gem_name

data/lib/webstub/json.rb

@@ -6,5 +6,17 @@ module WebStub
 
       NSString.alloc.initWithData(result, encoding:NSUTF8StringEncoding)
     end
+
+    def self.parse(str)
+      data = str
+      unless data.is_a?(NSData)
+        data = str.dataUsingEncoding(NSUTF8StringEncoding)
+      end
+
+      error = Pointer.new(:object)
+      result = NSJSONSerialization.JSONObjectWithData(data, options: 0, error: error)
+
+      result
+    end
   end
 end

data/lib/webstub/patch/session_configuration.rb

@@ -0,0 +1,29 @@
+if Kernel.const_defined?(:NSURLSessionConfiguration)
+  class NSURLSessionConfiguration
+    class << self
+      alias_method :originalDefaultSessionConfiguration, :defaultSessionConfiguration
+
+      def self.defaultSessionConfiguration
+        config = originalDefaultSessionConfiguration
+
+        unless config.include?(WebStub::Protocol)
+          config.protocolClasses << WebStub::Protocol
+        end
+
+        config
+      end
+
+      alias_method :originalEphemeralSessionConfiguration, :ephemeralSessionConfiguration
+
+      def self.ephemeralSessionConfiguration
+        config = originalEphemeralSessionConfiguration
+
+        unless config.include?(WebStub::Protocol)
+          config.protocolClasses << WebStub::Protocol
+        end
+
+        config
+      end
+    end
+  end
+end

data/lib/webstub/protocol.rb

@@ -74,7 +74,8 @@ module WebStub
       end
 
       client.URLProtocol(self, didReceiveResponse:response, cacheStoragePolicy:NSURLCacheStorageNotAllowed)
-      client.URLProtocol(self, didLoadData:@stub.response_body.dataUsingEncoding(NSUTF8StringEncoding))
+      client.URLProtocol(self, didLoadData: @stub.response_body.is_a?(NSData) ? @stub.response_body :
+                         @stub.response_body.dataUsingEncoding(NSUTF8StringEncoding))
       client.URLProtocolDidFinishLoading(self)
     end
 

data/lib/webstub/version.rb

@@ -1,3 +1,3 @@
 module WebStub
-  VERSION = "0.6.1"
+  VERSION = "1.0"
 end

data/spec/api_spec.rb

@@ -116,6 +116,21 @@ describe WebStub::API do
       end
     end
 
+    describe "response with binary data" do
+      before do
+        @image = load_image('homer')
+        @url = 'http://somehost/image'
+        WebStub::API.stub_request(:get, @url).
+          to_return(body: load_image('homer'), content_type: "image/jpeg")
+      end
+
+      it "returns the correct body" do
+        @response = get(@url, :binary_resp)
+        @response.body.isEqualToData(@image).should == true
+      end
+    end
+
+
     describe "when a stub sets a specified status code" do
       before do
         WebStub::API.stub_request(:get, @url).
@@ -152,7 +167,7 @@ describe WebStub::API do
       end
 
       it "returns the correct body" do
-        response = get(@url, { "My-Header" => "123" })
+        response = get(@url, :string_resp, { "My-Header" => "123" })
 
         response.body.should == '{}'
       end

data/spec/helpers/request_helper.rb

@@ -1,18 +1,30 @@
 class Response
-  def initialize(body, response, error)
-    @body = body ? NSString.alloc.initWithData(body, encoding:NSUTF8StringEncoding) : nil
+
+  def initialize(body, response, error, resp_type)
+    allocators = {:string_resp => ->(b) { alloc_data_string(b) },
+                  :binary_resp => ->(b) { alloc_data_binary(b) }}
+
+    @body = allocators[resp_type].call(body)
     @headers = response ? response.allHeaderFields : nil
     @error = error
     @status_code = response ? response.statusCode : nil
   end
 
+  def alloc_data_string(body)
+    body ? NSString.alloc.initWithData(body, encoding: NSUTF8StringEncoding) : nil
+  end
+
+  def alloc_data_binary(body)
+    NSData.alloc.initWithData(body)
+  end
+
   attr_reader :body
   attr_reader :headers
   attr_reader :error
   attr_reader :status_code
 end
 
-def get(url, headers={})
+def get(url, response_type = :string_resp, headers={})
   request = NSMutableURLRequest.alloc.init
   request.URL = NSURL.URLWithString(url)
 
@@ -20,7 +32,7 @@ def get(url, headers={})
     request.setValue(value, forHTTPHeaderField: key.to_s)
   end
 
-  issue_request(request)
+  issue_request(request, response_type)
 end
 
 def post(url, body)
@@ -34,16 +46,16 @@ def post(url, body)
 
       "#{key}=#{value}"
     end.join("&")
-    
-    request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField:"Content-Type")
+
+    request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
   end
 
   request.HTTPBody = body.dataUsingEncoding(NSUTF8StringEncoding)
 
-  issue_request(request)
+  issue_request(request, :string_resp)
 end
 
-def issue_request(request)
+def issue_request(request, response_type)
   result = {}
   queue = NSOperationQueue.alloc.init
   lock = NSConditionLock.alloc.initWithCondition(0)
@@ -59,6 +71,7 @@ def issue_request(request)
                                           end)
 
   lock.lockWhenCondition(1)
+  lock.unlockWithCondition(1)
 
-  Response.new(result[:data], result[:response], result[:error])
+  Response.new(result[:data], result[:response], result[:error], response_type)
 end

data/spec/helpers/resource_helper.rb

@@ -0,0 +1,4 @@
+def load_image(path)
+  NSData.dataWithContentsOfFile(
+      NSBundle.mainBundle.pathForResource(path, ofType:'jpeg'))
+end

data/spec/json_spec.rb

@@ -18,4 +18,34 @@ describe WebStub::JSON do
         }}).should == "{\"int\":42,\"string\":\"hello\",\"array\":[1,2,3],\"hash\":{\"title\":\"the title\"}}"
     end
   end
+
+  describe ".parse" do
+    [:string, :data].each do |type|
+      before do
+        if type == :string
+          @transformer = lambda { |s| s }
+        else
+          @transformer = lambda { |s| s.dataUsingEncoding(NSUTF8StringEncoding) }
+        end
+      end
+
+      it "parses an empty Array" do
+        WebStub::JSON.parse(@transformer.call("[]")).should == []
+      end
+
+      it "parses an empty Hash" do
+        WebStub::JSON.parse(@transformer.call("{}")).should == {}
+      end
+
+      it "parses a dictionary" do
+        json = %q({"int":42,"string":"hello","array":[1,2,3],"hash":{"title":"nested"}})
+        WebStub::JSON.parse(@transformer.call(json)).should == {
+          "int" => 42, 
+          "string" => "hello",
+          "array" => [1,2,3],
+          "hash" => {"title" => "nested"}
+        }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webstub
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '1.0'
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,6 +56,7 @@ files:
 - lib/webstub.rb
 - lib/webstub/api.rb
 - lib/webstub/json.rb
+- lib/webstub/patch/session_configuration.rb
 - lib/webstub/protocol.rb
 - lib/webstub/registry.rb
 - lib/webstub/spec_helpers.rb
@@ -64,9 +65,11 @@ files:
 - lib/webstub/version.rb
 - spec/api_spec.rb
 - spec/helpers/request_helper.rb
+- spec/helpers/resource_helper.rb
 - spec/json_spec.rb
 - spec/protocol_spec.rb
 - spec/registry_spec.rb
+- spec/resources/images/homer.jpeg
 - spec/spec_helpers_spec.rb
 - spec/stub_spec.rb
 - spec/uri_spec.rb
@@ -90,16 +93,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.1
 signing_key: 
 specification_version: 4
 summary: Easily stub out HTTP responses in RubyMotion specs
 test_files:
 - spec/api_spec.rb
 - spec/helpers/request_helper.rb
+- spec/helpers/resource_helper.rb
 - spec/json_spec.rb
 - spec/protocol_spec.rb
 - spec/registry_spec.rb
+- spec/resources/images/homer.jpeg
 - spec/spec_helpers_spec.rb
 - spec/stub_spec.rb
 - spec/uri_spec.rb
+has_rdoc: