zeppelin 0.1.0 → 0.2.0

data/lib/zeppelin.rb

@@ -67,6 +67,41 @@ class Zeppelin
     successful?(response)
   end
   
+  # Registers an APID.
+  # 
+  # @param [String] apid
+  # @param [Hash] payload the payload to send during registration
+  # @return [Boolean] whether or not the registration was successful
+  def register_apid(apid, payload = {})
+    uri = apid_uri(apid)
+    
+    if payload.empty?
+      response = @connection.put(uri)
+    else
+      response = @connection.put(uri, payload, JSON_HEADERS)
+    end
+    
+    successful?(response)
+  end
+  
+  # Retrieves information on an APID.
+  # 
+  # @param [String] apid
+  # @return [Hash, nil]
+  def apid(apid)
+    response = @connection.get(apid_uri(apid))
+    successful?(response) ? Yajl::Parser.parse(response.body) : nil
+  end
+  
+  # Deletes an APID.
+  # 
+  # @param [String] apid
+  # @return [Boolean] whether or not the deletion was successful
+  def delete_apid(apid)
+    response = @connection.delete(apid_uri(apid))
+    successful?(response)
+  end
+  
   # Pushes a message.
   # 
   # @param [Hash] payload the payload of the message
@@ -111,6 +146,10 @@ class Zeppelin
     "/api/device_tokens/#{device_token}"
   end
   
+  def apid_uri(apid)
+    "/api/apids/#{apid}"
+  end
+  
   def feedback_uri(since)
     "/api/device_tokens/feedback/?since=#{since.utc.iso8601}"
   end

data/lib/zeppelin/version.rb

@@ -1,3 +1,3 @@
 class Zeppelin
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/test/test_helper.rb

@@ -1,9 +1,13 @@
 require 'bundler/setup'
 require 'minitest/autorun'
+require 'journo'
 require 'mocha'
 require 'test_declarative'
 require 'zeppelin'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
-class Zeppelin::TestCase < MiniTest::Unit::TestCase; end
+class Zeppelin::TestCase < MiniTest::Unit::TestCase; end
+
+MiniTest::Unit.runner = Journo::SuiteRunner.new
+MiniTest::Unit.runner.reporters << Journo::Reporters::ProgressReporter.new

data/test/zeppelin_test.rb

@@ -105,6 +105,85 @@ class ZeppelinTest < Zeppelin::TestCase
     refute response
   end
   
+  test '#register_apid without a payload' do
+    stub_requests @client.connection do |stub|
+      stub.put("/api/apids/#{@apid}") do [201, {}, '']
+      end
+    end
+    
+    response = @client.register_apid(@apid)
+    assert response
+  end
+  
+  test '#register_apid an already registered APID' do
+    stub_requests @client.connection do |stub|
+      stub.put("/api/apids/#{@apid}") do
+        [200, {}, '']
+      end
+    end
+    
+    response = @client.register_apid(@apid)
+    assert response
+  end
+  
+  test '#register_apid with payload' do
+    payload = { :alias => 'CapnKernul' }
+    
+    stub_requests @client.connection do |stub|
+      stub.put("/api/apids/#{@apid}", Yajl::Encoder.encode(payload)) do
+        [200, {}, '']
+      end
+    end
+    
+    response = @client.register_apid(@apid, payload)
+    assert response
+  end
+  
+  test '#register_apid with an error' do
+    stub_requests @client.connection do |stub|
+      stub.put("/api/apids/#{@apid}", nil) do
+        [500, {}, '']
+      end
+    end
+    
+    response = @client.register_apid(@apid)
+    refute response
+  end
+  
+  test '#apid' do
+    response_body = { 'foo' => 'bar' }
+    stub_requests @client.connection do |stub|
+      stub.get("/api/apids/#{@apid}") do
+        [200, {}, Yajl::Encoder.encode(response_body)]
+      end
+    end
+    
+    response = @client.apid(@apid)
+    assert_equal response_body, response
+  end
+  
+  test '#delete_apid with a valid APID' do
+    stub_requests @client.connection do |stub|
+      stub.delete("/api/apids/#{@apid}") do
+        [204, {}, '']
+      end
+    end
+    
+    response = @client.delete_apid(@apid)
+    assert response
+  end
+  
+  test '#delete_apid with an unknown APID' do
+    stub_requests @client.connection do |stub|
+      stub.delete("/api/apids/#{@apid}") do
+        [404, {}, '']
+      end
+    end
+    
+    response = @client.delete_apid(@apid)
+    refute response
+  end
+  
   test '#push with a valid payload' do
     payload = {
       :device_tokens => [@device_token],

data/zeppelin.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday'
   s.add_dependency 'yajl-ruby'
   
-  s.add_development_dependency 'ansi'
   s.add_development_dependency 'minitest', '~> 2.0'
+  s.add_development_dependency 'journo'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'test_declarative'
   

metadata

@@ -2,7 +2,7 @@
 name: zeppelin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexander Kern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,25 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ansi
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: journo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,6 @@ files:
 - Rakefile
 - lib/zeppelin.rb
 - lib/zeppelin/version.rb
-- test/support/spec_reporter.rb
 - test/test_helper.rb
 - test/zeppelin_test.rb
 - zeppelin.gemspec
@@ -132,6 +131,5 @@ signing_key:
 specification_version: 3
 summary: Urban Airship library for Ruby
 test_files: 
-- test/support/spec_reporter.rb
 - test/test_helper.rb
 - test/zeppelin_test.rb

data/test/support/spec_reporter.rb

@@ -1,222 +0,0 @@
-require 'minitest/unit'
-require 'ansi'
-
-# Code for this runner has been borrowed and modified from MiniTest, written by
-# Ryan Davis of Seattle.rb. MiniTest is licensed under the MIT License, and can
-# be found on GitHub at https://github.com/seattlerb/minitest.
-# 
-# This code is also heavily based upon these gists as well, which don't appear
-# to have a license:
-# * https://gist.github.com/356945
-# * https://gist.github.com/960669
-# 
-# @abstract
-# @todo Add documentation to everything.
-module MiniTest
-  class Reporter
-    attr_accessor :runner
-    
-    def print(*args)
-      runner.output.print(*args)
-    end
-    
-    def puts(*args)
-      runner.output.puts(*args)
-    end
-    
-    def before_suites(suites); end
-    def after_suites(suites); end
-    def before_suite(suite); end
-    def after_suite(suite); end
-    def before_test(suite, test); end
-    def pass(suite, test); end
-    def skip(suite, test, e); end
-    def failure(suite, test, e); end
-    def error(suite, test, e); end
-  end
-end
-
-module MiniTest
-  class SpecReporter < Reporter
-    include ANSI::Code
-    
-    TEST_PADDING = 2
-    INFO_PADDING = 8
-    MARK_SIZE    = 5
-    
-    def before_suites(suites)
-      @suites_start_time = Time.now
-      puts 'Started'
-      puts
-    end
-    
-    def after_suites(suites)
-      total_time = Time.now - @suites_start_time
-      
-      puts('Finished in %.5fs' % total_time)
-      print('%d tests, %d assertions, ' % [runner.test_count, runner.assertion_count])
-      print(red { '%d failures, %d errors, ' } % [runner.failures, runner.errors])
-      print(yellow { '%d skips' } % runner.skips)
-      puts
-    end
-    
-    def before_suite(suite)
-      puts suite
-    end
-    
-    def after_suite(suite)
-      puts
-    end
-    
-    def before_test(suite, test)
-      @test_start_time = Time.now
-    end
-    
-    def pass(suite, test)
-      print(green { pad_mark('PASS') })
-      print_test_with_time(test)
-      puts
-    end
-    
-    def skip(suite, test, e)
-      print(yellow { pad_mark('SKIP') })
-      print_test_with_time(test)
-      puts
-    end
-    
-    def failure(suite, test, e)
-      print(red { pad_mark('FAIL') })
-      print_test_with_time(test)
-      puts
-      print_info(e)
-      puts
-    end
-    
-    def error(suite, test, e)
-      print(red { pad_mark('ERROR') })
-      print_test_with_time(test)
-      puts
-      print_info(e)
-      puts
-    end
-    
-    private
-    
-    def print_test_with_time(test)
-      total_time = Time.now - @test_start_time
-      print(" #{test} (%.2fs)" % total_time)
-    end
-    
-    def print_info(e)
-      e.message.each_line { |line| puts pad(line, INFO_PADDING) }
-      
-      trace = MiniTest.filter_backtrace(e.backtrace)
-      trace.each { |line| puts pad(line, INFO_PADDING) }
-    end
-    
-    def pad(str, size)
-      ' ' * size + str
-    end
-    
-    def pad_mark(str)
-      pad("%#{MARK_SIZE}s" % str, TEST_PADDING)
-    end
-  end
-end
-
-module MiniTest
-  class RunnerWithReporter < Unit
-    def initialize(new_reporter)
-      super()
-      @reporter = new_reporter
-      @reporter.runner = self
-    end
-    
-    def puke(suite, method, e)
-      case e
-      when MiniTest::Skip then
-        @skips += 1
-        [:skip, e]
-      when MiniTest::Assertion then
-        @failures += 1
-        [:failure, e]
-      else
-        @errors += 1
-        [:error, e]
-      end
-    end
-    
-    def _run_anything(type)
-      @test_count = @assertion_count = 0
-      suites = TestCase.send("#{type}_suites")
-      return if suites.empty?
-      
-      @reporter.before_suites(suites)
-      
-      sync = output.respond_to?(:'sync=') # stupid emacs
-      old_sync, output.sync = output.sync, true if sync
-      _run_suites(suites, type)
-      output.sync = old_sync if sync
-      
-      @reporter.after_suites(suites)
-    end
-    
-    def _run_suites(suites, type)
-      suites.map { |suite| _run_suite(suite, type) }
-    end
-    
-    def _run_suite(suite, type)
-      run_suite_header(suite, type)
-      
-      filter = options[:filter] || '/./'
-      filter = Regexp.new($1) if filter =~ /\/(.*)\//
-      
-      tests = suite.send("#{type}_methods").grep(filter)
-      
-      unless tests.empty?
-        @reporter.before_suite(suite)
-        run_suite_tests(suite, tests)
-        @reporter.after_suite(suite)
-      end
-    end
-    
-    private
-    
-    def run_suite_header(suite, type)
-      header_method = "#{type}_suite_header"
-      send(header_method, suite) if respond_to?(header_method)
-    end
-    
-    def run_suite_tests(suite, tests)
-      suite.startup if suite.respond_to?(:startup)
-      
-      tests.each do |test|
-        @reporter.before_test(suite, test)
-        response, e = run_suite_test(suite, test)
-        
-        case response
-        when :pass then @reporter.pass(suite, test)
-        when :skip then @reporter.skip(suite, test, e)
-        when :failure then @reporter.failure(suite, test, e)
-        else @reporter.error(suite, test, e)
-        end
-      end
-    ensure
-      suite.shutdown if suite.respond_to?(:shutdown)
-    end
-    
-    def run_suite_test(suite, test)
-      suite_instance = suite.new(test)
-      suite_instance._assertions = 0
-      
-      result = suite_instance.run(self)
-      
-      @test_count += 1
-      @assertion_count += suite_instance._assertions
-      
-      result == '.' ? :pass : result
-    end
-  end
-end
-
-MiniTest::Unit.runner = MiniTest::RunnerWithReporter.new(MiniTest::SpecReporter.new)