dirigible 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99130934f252d4982dc4366ab76d6f10026a6a43
-  data.tar.gz: 1c0fcb0e41f6af8ed94d379a59ba42313ae76cba
+  metadata.gz: b36b3346e8c2514e6726e129f10a6d2525afd203
+  data.tar.gz: fc4b117b7004ac49010feb6c8e1896138fea24e9
 SHA512:
-  metadata.gz: c75757b7c1eced8dd4f3955ca5b74bd1dd4a4472bc4b41aa820689facd586e85c34298355d69e5711e7c5db01854b6748be22300887875273a9a6a314e501bdd
-  data.tar.gz: 8c8ff094ae1fca659fd51289d9e71335f18a45df1dcb4e14f7a386dc9132ac3d3f9d875cea02a3ccd0904a78c2443597d2d2a38e281cb5db266649a8dda97119
+  metadata.gz: 8a2ffb0992991d31abc166565cbab34c7a57a848c958248a453e1b9deed080e8833f0b33c51bfa384a3265dac4dc0e5b41feb92caedbe165c7da230845f7b95e
+  data.tar.gz: 4f66cd85d0e7743b175c94e9419af128bf949e72bb4f98cec083d1f9f3ced2f73b98370f2cdcb60ea9ddfbae2c0fabf4da5d229a447a77be1d17be4756dff65c

data/dirigible.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Runtime dependencies
-  spec.add_dependency "faraday",            "~> 0.8"
+  spec.add_dependency "faraday",            "~> 0.8.0"
   spec.add_dependency "faraday_middleware", "~> 0.9"
   spec.add_dependency "hashie",             "~> 2.0"
   spec.add_dependency "multi_json",         "~> 1.8"

data/lib/dirigible/device_information.rb

@@ -37,9 +37,13 @@ class Dirigible::DeviceInformation
   # @example Example request:
   #   Dirigible::DeviceInformation.list_device_tokens
   #
+  # @example Request next page:
+  #   device_tokens = Dirigible::DeviceInformation.list_device_tokens
+  #   more_device_tokens = device_tokens.next_page
+  #
   # @see http://docs.urbanairship.com/reference/api/v3/device_information.html#device-listing
-  def self.list_device_tokens
-    Dirigible.get('/device_tokens')
+  def self.list_device_tokens(options = {})
+    List.new(Dirigible.get('/device_tokens', params))
   end
 
   # Fetch Android APIDs registered to this application and
@@ -48,9 +52,13 @@ class Dirigible::DeviceInformation
   # @example Example request:
   #   Dirigible::DeviceInformation.list_apids
   #
+  # @example Request next page:
+  #   apids = Dirigible::DeviceInformation.list_apids
+  #   more_apids = apids.next_page
+  #
   # @see http://docs.urbanairship.com/reference/api/v3/device_information.html#device-listing
-  def self.list_apids
-    Dirigible.get('/apids')
+  def self.list_apids(options = {})
+    List.new(Dirigible.get('/apids', params))
   end
 
   # Fetch BlackBerry PINs registered to this application and
@@ -59,9 +67,13 @@ class Dirigible::DeviceInformation
   # @example Example request:
   #   Dirigible::DeviceInformation.list_device_pins
   #
+  # @example Request next page:
+  #   device_pins = Dirigible::DeviceInformation.list_device_pins
+  #   more_device_pins = device_pins.next_page
+  #
   # @see http://docs.urbanairship.com/reference/api/v3/device_information.html#device-listing
-  def self.list_device_pins
-    Dirigible.get('/device_pins')
+  def self.list_device_pins(options = {})
+    List.new(Dirigible.get('/device_pins', params))
   end
 
   # Fetch device tokens that can't recieve messages because
@@ -74,4 +86,25 @@ class Dirigible::DeviceInformation
   def self.device_token_feedback(since)
     Dirigible.get("/device_tokens/feedback", { since: since })
   end
+  
+  class List
+    def initialize(response)
+      @response = response
+    end
+    
+    def [](value)
+      @response[value]
+    end
+    
+    # Fetch the next page for this device listing. Returns
+    # nil if next_page is nil.
+    def next_page(params = {})
+      return nil if @response[:next_page].nil?
+      uri = URI.parse(@response[:next_page])
+      path = "/#{uri.path.gsub(/\/api|\//, '')}"
+      # Shew! Need to simplify this!
+      params = (CGI.parse(uri.query).map{ |k,v| { k => v[0] } }.reduce({}) { |h,pairs| pairs.each { |k,v| (h[k.to_sym] = v) }; h }).merge!(params)
+      List.new(Dirigible.get(path, params))
+    end
+  end
 end

data/lib/dirigible/device_registration.rb

@@ -44,8 +44,8 @@ class Dirigible::DeviceRegistration
   #   })
   #
   # @see http://docs.urbanairship.com/reference/api/v3/registration.html#apid-registration
-  def self.register_apid(id, params)
-    Dirigible.put("/apids/#{id}", params)
+  def self.register_apid(id, options = {})
+    Dirigible.put("/apids/#{id}", options)
   end
 
   # Register this PIN with this application. This will mark

data/lib/dirigible/push.rb

@@ -9,7 +9,7 @@ class Dirigible::Push
   # @example Example request:
   #   Dirigible::Push.create({
   #     audience: { device_token: "998BAD77A8347EFE7920F5367A4811C4385D526AE42C598A629A73B94EEDBAC8" },
-  #     notification: { alert: "Hello"! },
+  #     notification: { alert: "Hello!" },
   #     device_types: "all"
   #   })
   #

data/lib/dirigible/request.rb

@@ -38,7 +38,7 @@ module Dirigible
 
       Utils.handle_api_error(response) unless (200..399).include?(response.status)
 
-      Utils.parse_json(response.body) unless response.body == ''
+      Utils.parse_message(response)
     end
   end
 end

data/lib/dirigible/utils.rb

@@ -2,7 +2,7 @@ module Dirigible
   # @private
   module Utils
     def self.handle_api_error(response)
-      message = parse_json(response.body)
+      message = parse_message(response)
 
       klass = case response.status
         when 400 then BadRequest
@@ -19,5 +19,13 @@ module Dirigible
     def self.parse_json(json)
       MultiJson.load(json, symbolize_keys: true)
     end
+    
+    def self.parse_message(response)
+      begin
+        parse_json(response.body)
+      rescue
+        response.body
+      end
+    end
   end
 end

data/lib/dirigible/version.rb

@@ -1,3 +1,3 @@
 module Dirigible
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dirigible
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 description: An Urban Airship v3 API wrapper written in Ruby
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Urban Airship REST API client library for Ruby