elevate 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elevate (0.3.1)
+    elevate (0.3.2)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -101,10 +101,6 @@ class ArtistsViewController < UITableViewController
 end
 ```
 
-Requirements
-------------
-* **iOS 6.x and higher** (due to `setDelegateQueue` being [horribly broken](http://openradar.appspot.com/10529053) on iOS 5.x.)
-
 Installation
 ------------
 Update your Gemfile:

data/lib/elevate/http/errors.rb

@@ -0,0 +1,16 @@
+module Elevate
+module HTTP
+  class RequestError < RuntimeError
+    def initialize(error)
+      super(error.localizedDescription)
+
+      @code = error.code
+    end
+
+    attr_reader :code
+  end
+
+  class OfflineError < RequestError
+  end
+end
+end

data/lib/elevate/http/http_client.rb

@@ -43,17 +43,12 @@ module HTTP
         options[:headers]["Content-Type"] = "application/json"
       end
 
-      request = HTTPRequest.new(method, url, options)
-
-      coordinator = IOCoordinator.for_thread
-
-      coordinator.signal_blocked(request) if coordinator
-      response = JSONHTTPResponse.new(request.response)
-      coordinator.signal_unblocked(request) if coordinator
+      response = send_request(method, url, options)
+      raise_error(response.error) if response.error
 
+      response = JSONHTTPResponse.new(response)
       if response.error == nil && block_given?
         result = yield response.body
-        puts result.inspect
 
         result
       else
@@ -61,6 +56,26 @@ module HTTP
       end
     end
 
+    def raise_error(error)
+      if error.code == -1009
+        raise OfflineError, error
+      else
+        raise RequestError, response.error
+      end
+    end
+
+    def send_request(method, url, options)
+      request = HTTPRequest.new(method, url, options)
+
+      coordinator = IOCoordinator.for_thread
+
+      coordinator.signal_blocked(request) if coordinator
+      response = request.response
+      coordinator.signal_unblocked(request) if coordinator
+
+      response
+    end
+
     def url_for(path)
       path = CFURLCreateStringByAddingPercentEscapes(nil, path.to_s, "[]", ";=&,", KCFStringEncodingUTF8)
 

data/lib/elevate/http/request.rb

@@ -39,7 +39,7 @@ module HTTP
       return unless started?
 
       NetworkThread.cancel(@connection)
-      @promise.set(nil)
+      @promise.fulfill(nil)
     end
 
     def response
@@ -47,7 +47,7 @@ module HTTP
         start()
       end
 
-      @promise.get()
+      @promise.value
     end
 
     def start
@@ -72,18 +72,18 @@ module HTTP
     end
 
     def connection(connection, didFailWithError: error)
-      puts "ERROR: #{error.localizedDescription}"
+      puts "ERROR: #{error.localizedDescription} (code: #{error.code})"
 
       @response.error = error
       @response.freeze
 
-      @promise.set(@response)
+      @promise.fulfill(@response)
     end
 
     def connectionDidFinishLoading(connection)
       @response.freeze
 
-      @promise.set(@response)
+      @promise.fulfill(@response)
     end
 
     def get_authorization_header(credentials)

data/lib/elevate/operation.rb

@@ -51,7 +51,7 @@ module Elevate
           @result = @target.execute
         end
 
-      rescue => e
+      rescue Exception => e
         @exception = e
       end
 

data/lib/elevate/promise.rb

@@ -8,7 +8,14 @@ module Elevate
       @result = nil
     end
 
-    def get
+    def fulfill(result)
+      if @lock.tryLockWhenCondition(OUTSTANDING)
+        @result = result
+        @lock.unlockWithCondition(FULFILLED)
+      end
+    end
+
+    def value
       result = nil
 
       @lock.lockWhenCondition(FULFILLED)
@@ -17,11 +24,5 @@ module Elevate
 
       result
     end
-
-    def set(result)
-      @lock.lockWhenCondition(OUTSTANDING)
-      @result = result
-      @lock.unlockWithCondition(FULFILLED)
-    end
   end
 end

data/lib/elevate/version.rb

@@ -1,3 +1,3 @@
 module Elevate
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elevate
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,6 +98,7 @@ files:
 - lib/elevate/dispatcher.rb
 - lib/elevate/dsl.rb
 - lib/elevate/http/base64.rb
+- lib/elevate/http/errors.rb
 - lib/elevate/http/http_client.rb
 - lib/elevate/http/request.rb
 - lib/elevate/http/response.rb
@@ -130,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 421563326578819591
+      hash: 3623850089933404602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 421563326578819591
+      hash: 3623850089933404602
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24