zeppelin 0.3.0 → 0.4.0

data/lib/zeppelin.rb

@@ -23,8 +23,8 @@ class Zeppelin
   # @param [String] application_key your Urban Airship Application Key
   # @param [String] application_master_secret your Urban Airship Application
   #   Master Secret
-  def initialize(application_key, application_master_secret)
-    @connection = Faraday::Connection.new(BASE_URI) do |builder|
+  def initialize(application_key, application_master_secret, options = {})
+    @connection = Faraday::Connection.new(BASE_URI, options) do |builder|
       builder.request :json
       builder.adapter :net_http
     end
@@ -55,7 +55,7 @@ class Zeppelin
   # @return [Hash, nil]
   def device_token(device_token)
     response = @connection.get(device_token_uri(device_token))
-    successful?(response) ? Yajl::Parser.parse(response.body) : nil
+    successful?(response) ? parse(response.body) : nil
   end
   
   # Deletes a device token.
@@ -90,7 +90,7 @@ class Zeppelin
   # @return [Hash, nil]
   def apid(apid)
     response = @connection.get(apid_uri(apid))
-    successful?(response) ? Yajl::Parser.parse(response.body) : nil
+    successful?(response) ? parse(response.body) : nil
   end
   
   # Deletes an APID.
@@ -137,7 +137,26 @@ class Zeppelin
   # @return [Hash, nil]
   def feedback(since)
     response = @connection.get(feedback_uri(since))
-    successful?(response) ? Yajl::Parser.parse(response.body) : nil
+    successful?(response) ? parse(response.body) : nil
+  end
+
+  # Retrieve all tags on the service
+  #
+  # @return [Hash, nil]
+  def tags
+    response = @connection.get(tag_uri(nil))
+    successful?(response) ? parse(response.body) : nil
+  end
+
+  # Modifies device tokens associated with a tag.
+  #
+  # @param [String] tag The name of the tag to modify tag associations on
+  #
+  # @param [Hash] payload
+  #
+  # @see http://urbanairship.com/docs/tags.html#modifying-device-tokens-on-a-tag
+  def modify_device_tokens_on_tag(tag_name, payload = {})
+    @connection.post(tag_uri(tag_name), payload, JSON_HEADERS)
   end
 
   # Creates a tag that is not associated with any device
@@ -161,6 +180,14 @@ class Zeppelin
     successful?(response)
   end
 
+  # @param [String] device_token
+  #
+  # @return [Hash, nil]
+  def device_tags(device_token)
+    response = @connection.get(device_tag_uri(device_token, nil))
+    successful?(response) ? parse(response.body) : nil
+  end
+
   # @param [String] device_token
   #
   # @param [#to_s] tag_name
@@ -208,6 +235,10 @@ class Zeppelin
   def successful?(response)
     SUCCESSFUL_STATUS_CODES.include?(response.status)
   end
+
+  def parse(json)
+    Yajl::Parser.parse(json)
+  end
 end
 
 require 'zeppelin/version'

data/lib/zeppelin/version.rb

@@ -1,3 +1,3 @@
 class Zeppelin
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/test/zeppelin_test.rb

@@ -15,6 +15,12 @@ class ZeppelinTest < Zeppelin::TestCase
     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, {}, '']
@@ -304,6 +310,33 @@ class ZeppelinTest < Zeppelin::TestCase
     assert_nil response
   end
 
+  test '#tags' do
+    response_body = { 'tags' => ['green', 'eggs'] }
+
+    stub_requests @client.connection do |stub|
+      stub.get('/api/tags/') do
+        [200, {}, 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'
 
@@ -343,6 +376,33 @@ class ZeppelinTest < Zeppelin::TestCase
     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, {}, 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeppelin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2156462880 !ruby/object:Gem::Requirement
+  requirement: &2165051200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156462880
+  version_requirements: *2165051200
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2156462460 !ruby/object:Gem::Requirement
+  requirement: &2165050780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156462460
+  version_requirements: *2165050780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156493440 !ruby/object:Gem::Requirement
+  requirement: &2165050280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156493440
+  version_requirements: *2165050280
 - !ruby/object:Gem::Dependency
   name: journo
-  requirement: &2156493020 !ruby/object:Gem::Requirement
+  requirement: &2165049860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156493020
+  version_requirements: *2165049860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156492560 !ruby/object:Gem::Requirement
+  requirement: &2165049400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156492560
+  version_requirements: *2165049400
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &2156492140 !ruby/object:Gem::Requirement
+  requirement: &2165048980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156492140
+  version_requirements: *2165048980
 description: Ruby client for the Urban Airship Push Notification API
 email:
 - alex@kernul.com