urbanairship 1.0.0 → 1.0.1

data/lib/urbanairship.rb

@@ -1,9 +1,16 @@
 require 'json'
 require 'net/https'
 require 'time'
-require 'system_timer'
 
 module Urbanairship
+  begin
+    require 'system_timer'
+    Timer = SystemTimer
+  rescue LoadError
+    require 'timeout'
+    Timer = Timeout
+  end
+
   VALID_PUSH_PARAMS = %w(device_tokens aliases tags schedule_for exclude_tokens aps)
 
   class << self
@@ -54,7 +61,7 @@ module Urbanairship
 
       yield(request) if block_given?
 
-      SystemTimer.timeout_after(request_timeout) do
+      Timer.timeout(request_timeout) do
         start_time = Time.now
         response = http_client.request(request)
         log_request_and_response(request, response, Time.now - start_time)

data/spec/urbanairship_spec.rb

@@ -418,14 +418,14 @@ describe Urbanairship do
     end
 
     it "uses a default request_timeout value of five seconds" do
-      SystemTimer.should_receive(:timeout_after).with(5.0).and_raise(Timeout::Error)
+      Urbanairship::Timer.should_receive(:timeout).with(5.0).and_raise(Timeout::Error)
       @logger.should_receive(:error).with(/Urbanairship request timed out/)
 
       Urbanairship.register_device('new_device_token')
     end
 
     it "accepts a configured request_timeout value" do
-      SystemTimer.should_receive(:timeout_after).with(1.23).and_raise(Timeout::Error)
+      Urbanairship::Timer.should_receive(:timeout).with(1.23).and_raise(Timeout::Error)
       @logger.should_receive(:error).with(/Urbanairship request timed out/)
 
       Urbanairship.request_timeout = 1.23

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: urbanairship
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Groupon, Inc.
@@ -19,7 +19,7 @@ date: 2011-06-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: system_timer
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +44,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,20 +60,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
 description: Urbanairship is a Ruby library for interacting with the Urbanairship (http://urbanairship.com) API.
 email: 
 - rubygems@groupon.com
@@ -102,7 +88,7 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ~>
+  - - ">="
     - !ruby/object:Gem::Version 
       hash: 59
       segments: 
@@ -122,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the Urbanairship API