stackmob 0.1.1 → 0.1.2

data/lib/stackmob/middleware/proxy.rb

@@ -56,13 +56,17 @@ module StackMob
         headers = {}
         for headerArr in env.select { |k, v| k.start_with? 'HTTP_' } 
           if !EXCLUDED_HEADERS.include?(headerArr[0])
-            headers[headerArr[0].sub('HTTP_', '')] = headerArr[1]
+            headers[normalize(headerArr[0])] = headerArr[1]
           end
         end
         headers["Accept"] = "application/json"
         headers
       end
 
+      def normalize(key)
+        key.sub('HTTP_', '').split('_').map! { |p| p.downcase }.join("-")
+      end 
+
     end
   end
 end

data/lib/stackmob/push.rb

@@ -18,9 +18,11 @@ module StackMob
     attr_accessor :client
 
     PUSH_SVC = :push
-    DEVICE_TOKEN_PATH = "/device_tokens"
-    BROADCAST_PATH = "/push_broadcast"
-    PUSH_PATH = "/push"
+    DEVICE_TOKEN_PATH = "/register_device_token_universal"
+    REMOVE_DEVICE_TOKEN = "/remove_token_universal"
+    BROADCAST_PATH = "/push_broadcast_universal"
+    PUSH_TOKENS_PATH = "/push_tokens_universal"
+    PUSH_USERS_PATH = "/push_users_universal"
 
     DEFAULT_BADGE = 0
     DEFAULT_SOUND = ""
@@ -33,31 +35,42 @@ module StackMob
       self.client.request(:post, PUSH_SVC, DEVICE_TOKEN_PATH, :userId => user_id, :token => device_token) # using non-convential symbols to conform to StackMob Push API
     end
 
-    def broadcast(opts)
-      aps_data = generate_aps_data(opts)
-      payload = {:recipients => [], :aps => aps_data, :areRecipientsDeviceTokens => true, :exclude_tokens => []}
-
-      self.client.request(:post, PUSH_SVC, BROADCAST_PATH, payload)
+    def remove(device_token)
+      self.client.request(:post, PUSH_SVC, REMOVE_DEVICE_TOKEN, device_token)
     end
 
-    def send_message(to, opts)
-      aps_data = generate_aps_data(opts)
-      recipients_are_device_tokens = (opts[:recipients_are_users]) ? false : true
-      payload = {:recipients => Array(to), :aps => aps_data, :areRecipientsDeviceTokens => recipients_are_device_tokens, :exclude_tokens => []}
-
-      self.client.request(:post, PUSH_SVC, PUSH_PATH, payload)
+    def broadcast(opts)
+      payload = { :kvPairs => opts }
+      self.client.request(:post, PUSH_SVC, BROADCAST_PATH, payload)
     end
 
-    def generate_aps_data(opts)
+    def aps_data(opts)
       alert = opts[:alert] || (raise ArgumentError.new("Push requires alert message"))
       badge = opts[:badge] || DEFAULT_BADGE
       sound = opts[:sound] || DEFAULT_SOUND
       
       {:badge => badge, :sound => sound, :alert => alert}
     end
-    private :generate_aps_data
 
-    
+    # Deprecated
+    def send_message(to, opts)
+      warn "[DEPRECATION] `send_message` is deprecated and does not support android, please use `send_message_to_tokens` or `send_message_to_users`"
+      recipients_are_device_tokens = (opts[:recipients_are_users]) ? false : true
+      payload = {:recipients => Array(to), :aps => aps_data(opts), :areRecipientsDeviceTokens => recipients_are_device_tokens, :exclude_tokens => []}
+
+      self.client.request(:post, PUSH_SVC, "/push", payload)
+    end
 
+    def send_message_to_tokens(to, opts)
+      to = [to] if to.is_a? Hash
+      payload = {:tokens => Array(to), :payload => { :kvPairs => opts }}
+      self.client.request(:post, PUSH_SVC, PUSH_TOKENS_PATH, payload)
+    end
+
+    def send_message_to_users(to, opts)
+      payload = {:userIds => Array(to), :kvPairs => opts}
+      self.client.request(:post, PUSH_SVC, PUSH_USERS_PATH, payload)
+    end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stackmob
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - StackMob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 Z
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -87,12 +87,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        version: "1.3"
   prerelease: false
   requirement: *id005
   type: :runtime