zeppelin 0.5.0 → 0.6.0

data/zeppelin.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = 'zeppelin'
   s.version     = Zeppelin::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Alexander Kern']
-  s.email       = ['alex@kernul.com']
+  s.authors     = ['Alexander Kern', 'James Herdman']
+  s.email       = ['alex@kernul.com', 'james.herdman@me.com']
   s.homepage    = 'https://github.com/CapnKernul/zeppelin'
   s.summary     = %q{Urban Airship library for Ruby}
   s.description = %q{Ruby client for the Urban Airship Push Notification API}
@@ -15,12 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'zeppelin'
 
   s.add_dependency 'faraday'
-  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'multi_json', '~> 1.1'
 
-  s.add_development_dependency 'minitest', '~> 2.0'
-  s.add_development_dependency 'journo'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'test_declarative'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: zeppelin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
 - Alexander Kern
+- James Herdman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70115497098880 !ruby/object:Gem::Requirement
+  requirement: &70356824338980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,54 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115497098880
+  version_requirements: *70356824338980
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70115497097860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70115497097860
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70115497095520 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70356824337960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70115497095520
-- !ruby/object:Gem::Dependency
-  name: journo
-  requirement: &70115497094220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70115497094220
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70115497092480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
-  version_requirements: *70115497092480
+  version_requirements: *70356824337960
 - !ruby/object:Gem::Dependency
-  name: test_declarative
-  requirement: &70115497090680 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70356824337460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497090680
+  version_requirements: *70356824337460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115497089600 !ruby/object:Gem::Requirement
+  requirement: &70356824336900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,28 +55,33 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497089600
+  version_requirements: *70356824336900
 description: Ruby client for the Urban Airship Push Notification API
 email:
 - alex@kernul.com
+- james.herdman@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
 - .gitignore
 - .travis.yml
 - .yardopts
+- Changelog.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/zeppelin.rb
-- lib/zeppelin/json_parser_middleware.rb
+- lib/zeppelin/middleware.rb
+- lib/zeppelin/middleware/json_parser.rb
+- lib/zeppelin/middleware/response_raise_error.rb
 - lib/zeppelin/version.rb
-- test/json_parser_middleware_test.rb
-- test/test_helper.rb
-- test/zeppelin_test.rb
+- spec/middleware/json_parser_spec.rb
+- spec/middleware/response_raise_error_spec.rb
+- spec/spec_helper.rb
+- spec/zeppelin_spec.rb
 - zeppelin.gemspec
 homepage: https://github.com/CapnKernul/zeppelin
 licenses: []
@@ -122,25 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 437314845617063875
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 437314845617063875
 requirements: []
 rubyforge_project: zeppelin
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Urban Airship library for Ruby
 test_files:
-- test/json_parser_middleware_test.rb
-- test/test_helper.rb
-- test/zeppelin_test.rb
+- spec/middleware/json_parser_spec.rb
+- spec/middleware/response_raise_error_spec.rb
+- spec/spec_helper.rb
+- spec/zeppelin_spec.rb

data/.autotest

@@ -1,15 +0,0 @@
-Autotest.add_hook :initialize do |at|
-  # Requires bundler before minitest since the minitest bundled with Ruby does
-  # not support runners.
-  at.testlib = 'bundler/setup minitest/unit'
-  
-  # Mappings from http://opensoul.org/blog/archives/2008/08/22/autotest-mapping-for-rails-test-conventions/.
-  at.clear_mappings
-  
-  at.add_mapping %r%/^lib/(.*)\.rb$% do |_, m|
-    possible = File.basename(m[1])
-    files_matching %r%^test/.*(#{possible}_test|test_#{possible})\.rb$%
-  end
-  
-  at.add_mapping(%r%^test/.*\.rb$%) { |filename, _| filename }
-end

data/lib/zeppelin/json_parser_middleware.rb

@@ -1,35 +0,0 @@
-require 'yajl'
-
-class Zeppelin
-  # Middleware for Faraday that parses JSON response bodies. Based on code in
-  # the FaradayMiddleware project.
-  #
-  # @private
-  class JsonParserMiddleware < Faraday::Middleware
-    CONTENT_TYPE = 'Content-Type'
-
-    def initialize(app=nil)
-      @app = app
-    end
-
-    def call(env)
-      @app.call(env).on_complete do
-        parse_response(env) if process_content_type?(env) && parse_response?(env)
-      end
-    end
-
-    private
-
-    def parse_response(env)
-      env[:body] = Yajl::Parser.parse(env[:body])
-    end
-
-    def process_content_type?(env)
-      env[:response_headers][CONTENT_TYPE].to_s =~ /\bjson$/
-    end
-
-    def parse_response?(env)
-      env[:body].respond_to? :to_str
-    end
-  end
-end

data/test/json_parser_middleware_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-
-class JsonParserMiddlewareTest < Zeppelin::TestCase
-  def setup
-    @json_body = "{\"foo\":\"bar\"}"
-    @expected_parsed_body = { 'foo' => 'bar' }
-  end
-
-  test 'parses a standard JSON content type' do
-    assert_equal @expected_parsed_body, process(@json_body, 'application/json').body
-  end
-
-  test 'parses vendor JSON content type' do
-    assert_equal @expected_parsed_body, process(@json_body, 'application/vnd.urbanairship+json').body
-  end
-
-  test 'does not change nil body' do
-    assert process(nil).body.nil?
-  end
-
-  test 'does not parse non-JSON content types' do
-    assert_equal '<hello>world</hello>', process('<hello>world</hello>', 'text/xml').body
-  end
-
-  def process(body, content_type=nil, options={})
-    env = { :body => body, :response_headers => Faraday::Utils::Headers.new }
-    env[:response_headers]['content-type'] = content_type if content_type
-
-    middleware = Zeppelin::JsonParserMiddleware.new(
-      lambda { |env| Faraday::Response.new(env) }
-    )
-
-    middleware.call(env)
-  end
-end

data/test/test_helper.rb

@@ -1,13 +0,0 @@
-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
-
-MiniTest::Unit.runner = Journo::SuiteRunner.new
-MiniTest::Unit.runner.reporters << Journo::Reporters::ProgressReporter.new

data/test/zeppelin_test.rb

@@ -1,453 +0,0 @@
-require 'test_helper'
-
-class ZeppelinTest < Zeppelin::TestCase
-  def setup
-    @client = Zeppelin.new('app key', 'app master secret')
-    @device_token = '1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF'
-  end
-  
-  test '#connection' do
-    assert_instance_of Faraday::Connection, @client.connection
-    assert_equal 'https', @client.connection.scheme
-    assert_equal 'go.urbanairship.com', @client.connection.host
-    assert_includes @client.connection.builder.handlers, Faraday::Adapter::NetHttp
-    assert_includes @client.connection.builder.handlers, Faraday::Request::JSON
-    assert_includes @client.connection.builder.handlers, Zeppelin::JsonParserMiddleware
-    assert_equal 'Basic YXBwIGtleTphcHAgbWFzdGVyIHNlY3JldA==', @client.connection.headers['Authorization']
-  end
-  
-  test '#initialize with custom options' do
-    ssl_options = { :ca_path => '/dev/null' }
-    @client = Zeppelin.new('app key', 'app master secret', :ssl => ssl_options)
-    assert_equal(ssl_options, @client.connection.ssl)
-  end
-  
-  test '#register_device_token without a payload' do
-    stub_requests @client.connection do |stub|
-      stub.put("/api/device_tokens/#{@device_token}") do [201, {}, '']
-      end
-    end
-    
-    response = @client.register_device_token(@device_token)
-    assert response
-  end
-  
-  test '#register_device_token an already registered device token' do
-    stub_requests @client.connection do |stub|
-      stub.put("/api/device_tokens/#{@device_token}") do
-        [200, {}, '']
-      end
-    end
-    
-    response = @client.register_device_token(@device_token)
-    assert response
-  end
-  
-  test '#register_device_token with payload' do
-    payload = { :alias => 'CapnKernul' }
-    
-    stub_requests @client.connection do |stub|
-      stub.put("/api/device_tokens/#{@device_token}", Yajl::Encoder.encode(payload)) do
-        [200, {}, '']
-      end
-    end
-    
-    response = @client.register_device_token(@device_token, payload)
-    assert response
-  end
-  
-  test '#register_device_token with an error' do
-    stub_requests @client.connection do |stub|
-      stub.put("/api/device_tokens/#{@device_token}", nil) do
-        [500, {}, '']
-      end
-    end
-    
-    response = @client.register_device_token(@device_token)
-    refute response
-  end
-  
-  test '#device_token with valid device token' do
-    response_body = { 'foo' => 'bar' }
-    stub_requests @client.connection do |stub|
-      stub.get("/api/device_tokens/#{@device_token}") do
-        [200, { 'Content-Type' => 'application/json' }, Yajl::Encoder.encode(response_body)]
-      end
-    end
-    
-    response = @client.device_token(@device_token)
-    assert_equal response_body, response
-  end
-  
-  test '#device_token with an unknown device token' do
-    stub_requests @client.connection do |stub|
-      stub.get("/api/device_tokens/#{@device_token}") do
-        [404, {}, '']
-      end
-    end
-    
-    response = @client.device_token(@device_token)
-    assert_nil response
-  end
-  
-  test '#delete_device_token with a valid device token' do
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/device_tokens/#{@device_token}") do
-        [204, {}, '']
-      end
-    end
-    
-    response = @client.delete_device_token(@device_token)
-    assert response
-  end
-  
-  test '#delete_device_token with an unknown device token' do
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/device_tokens/#{@device_token}") do
-        [404, {}, '']
-      end
-    end
-    
-    response = @client.delete_device_token(@device_token)
-    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, { 'Content-Type' => 'application/json' }, 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],
-      :aps => { :alert => 'Hello from Urban Airship!' }
-    }
-    
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/', Yajl::Encoder.encode(payload)) do
-        [200, {}, '']
-      end
-    end
-    
-    response = @client.push(payload)
-    assert response
-  end
-  
-  # Although the Urban Airship documentation states that a 400 Status Code
-  # will be sent when there's an invalid payload, it doesn't state what
-  # constitutes an invalid payload. Hence, I'm just mocking out the request so
-  # that it returns a 400.
-  test '#push with an invalid payload' do
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/', '{}') do
-        [400, {}, '']
-      end
-    end
-    
-    response = @client.push({})
-    refute response
-  end
-  
-  test '#batch_push with a valid payload' do
-    message1 = {
-      :device_tokens => [@device_token],
-      :aps => { :alert => 'Hello from Urban Airship!' }
-    }
-    
-    message2 = {
-      :device_tokens => [],
-      :aps => { :alert => 'Yet another hello from Urban Airship!' }
-    }
-    
-    payload = [message1, message2]
-    
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/batch/', Yajl::Encoder.encode(payload)) do
-        [200, {}, '']
-      end
-    end
-    
-    response = @client.batch_push(message1, message2)
-    assert response
-  end
-  
-  # See the note above for why this test exists.
-  test '#batch_push with an invalid payload' do
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/batch/', '[{},{}]') do
-        [400, {}, '']
-      end
-    end
-    
-    response = @client.batch_push({}, {})
-    refute response
-  end
-  
-  test '#broadcast with a valid payload' do
-    payload = {
-      :aps => { :alert => 'Hello from Urban Airship!' }
-    }
-    
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/broadcast/', Yajl::Encoder.encode(payload)) do
-        [200, {}, '']
-      end
-    end
-    
-    response = @client.broadcast(payload)
-    assert response
-  end
-  
-  # See the note above for why this test exists.
-  test '#broadcast with an invalid payload' do
-    stub_requests @client.connection do |stub|
-      stub.post('/api/push/broadcast/', '{}') do
-        [400, {}, '']
-      end
-    end
-    
-    response = @client.broadcast({})
-    refute response
-  end
-  
-  test '#feedback with a valid since' do
-    response_body = { 'foo' => 'bar' }
-    since = Time.at(0)
-    
-    stub_requests @client.connection do |stub|
-      stub.get('/api/device_tokens/feedback/?since=1970-01-01T00%3A00%3A00Z') do
-        [200, { 'Content-Type' => 'application/json' }, Yajl::Encoder.encode(response_body)]
-      end
-    end
-    
-    response = @client.feedback(since)
-    assert_equal response_body, response
-  end
-  
-  test '#feedback with an error' do
-    since = Time.at(0)
-    
-    stub_requests @client.connection do |stub|
-      stub.get('/api/device_tokens/feedback/?since=1970-01-01T00%3A00%3A00Z') do
-        [400, {}, '']
-      end
-    end
-    
-    response = @client.feedback(since)
-    assert_nil response
-  end
-
-  test '#tags' do
-    response_body = { 'tags' => ['green', 'eggs'] }
-
-    stub_requests @client.connection do |stub|
-      stub.get('/api/tags/') do
-        [200, { 'Content-Type' => 'application/json' }, Yajl::Encoder.encode(response_body)]
-      end
-    end
-
-    response = @client.tags
-    assert_equal response_body, response
-  end
-
-  test '#modify_device_token_on_tag' do
-    tag_name = 'jimmy.page'
-    device_token = 'CAFEBABE'
-
-    stub_requests @client.connection do |stub|
-      stub.post("/api/tags/#{tag_name}") do
-        [200, {}, 'OK']
-      end
-    end
-
-    response = @client.modify_device_tokens_on_tag(tag_name, { 'device_tokens' => { 'add' => [device_token] } })
-    assert response
-  end
-
-  test '#add_tag' do
-    tag_name = 'chunky.bacon'
-
-    stub_requests @client.connection do |stub|
-      stub.put("/api/tags/#{tag_name}") do
-        [201, {}, '']
-      end
-    end
-
-    response = @client.add_tag(tag_name)
-    assert response
-  end
-
-  test '#remove_tag with an existing tag' do
-    tag_name = 'cats.pajamas'
-
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/tags/#{tag_name}") do
-        [204, {}, '']
-      end
-    end
-
-    response = @client.remove_tag(tag_name)
-    assert response
-  end
-
-  test '#remove_tag with non-existant tag' do
-    tag_name = 'cats.pajamas'
-
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/tags/#{tag_name}") do
-        [404, {}, 'Not Found']
-      end
-    end
-
-    response = @client.remove_tag(tag_name)
-    refute response
-  end
-
-  test '#device_tags with existing device' do
-    device_token = 'CAFEBABE'
-    response_body = { 'tags' => ['tag1', 'some_tag'] }
-
-    stub_requests @client.connection do |stub|
-      stub.get("/api/device_tokens/#{device_token}/tags/") do
-        [200, { 'Content-Type' => 'application/json' }, Yajl::Encoder.encode(response_body)]
-      end
-    end
-
-    response = @client.device_tags(device_token)
-    assert_equal response_body, response
-  end
-
-  test '#device_tags with non-existant device' do
-    device_token = 'CAFEBABE'
-
-    stub_requests @client.connection do |stub|
-      stub.get("/api/device_tokens/#{device_token}/tags/") do
-        [404, {}, 'Not Found']
-      end
-    end
-
-    response = @client.device_tags(device_token)
-    refute response
-  end
-
-  test '#add_tag_to_device' do
-    tag_name = 'radio.head'
-    device_token = 'CAFEBABE'
-
-    stub_requests @client.connection do |stub|
-      stub.put("/api/device_tokens/#{device_token}/tags/#{tag_name}") do
-        [201, {}, 'Created']
-      end
-    end
-
-    response = @client.add_tag_to_device(device_token, tag_name)
-    assert response
-  end
-
-  test '#remove_tag_from_device successfully' do
-    tag_name = 'martin.fowler'
-    device_token = 'DEADBEEF'
-
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/device_tokens/#{device_token}/tags/#{tag_name}") do
-        [204, {}, 'No Content']
-      end
-    end
-
-    response = @client.remove_tag_from_device(device_token, tag_name)
-    assert response
-  end
-
-  test '#remove_tag_from_device unsuccessfully' do
-    tag_name = 'martin.fowler'
-    device_token = 'DEADBEEF'
-
-    stub_requests @client.connection do |stub|
-      stub.delete("/api/device_tokens/#{device_token}/tags/#{tag_name}") do
-        [404, {}, 'Not Found']
-      end
-    end
-
-    response = @client.remove_tag_from_device(device_token, tag_name)
-    refute response
-  end
-  
-  def stub_requests(connection, &block)
-    connection.builder.handlers.delete(Faraday::Adapter::NetHttp)
-    connection.adapter(:test, &block)
-  end
-end