stackmob 0.1.2 → 0.1.3

data/lib/stackmob.rb

@@ -73,6 +73,15 @@ module StackMob
     end
   end
 
+  def self.plain_proxy_host
+    if env_url = ENV['STACKMOB_DEV_URL']
+      env_url.sub(/^.*:\/\//, "")
+    else
+      cluster_name = (is_html5?) ? "mob1" : "mob2"
+      "api.#{cluster_name}.stackmob.com"
+    end
+  end
+
   def self.env
     (is_production?) ? PRODUCTION : SANDBOX
   end

data/lib/stackmob/middleware/proxy.rb

@@ -13,14 +13,18 @@
 # limitations under the License.
 
 require 'rack'
+require 'rack/proxy'
 
 module StackMob
   module Middleware
-    class Proxy
+    class Proxy < ::Rack::Proxy
       
       HEADER_NAME = 'X-StackMob-Proxy'
-      RACK_ENV_NAME = 'HTTP_X_STACKMOB_PROXY'
+      RACK_ENV_NAME = 'HTTP_X_STACKMOB_PROXY_PLAIN'
+      LEGACY_RACK_ENV_NAME = 'HTTP_X_STACKMOB_PROXY'
       VALID_HEADER_VALUES = ['stackmob-api']
+      STACKMOB_FORWARDED_HOST_ENV = 'HTTP_X_STACKMOB_FORWARDED_HOST'
+      STACKMOB_FORWARDED_PORT_ENV = 'HTTP_X_STACKMOB_FORWARDED_PORT'
 
       EXCLUDED_HEADERS = ["VERSION", "DATE", "HOST", "ACCEPT"].map { |s| "HTTP_#{s}" }
 
@@ -29,7 +33,9 @@ module StackMob
       end
 
       def call(env)
-        if VALID_HEADER_VALUES.include?(env[RACK_ENV_NAME])  
+        if VALID_HEADER_VALUES.include?(env[RACK_ENV_NAME]) || env['PATH_INFO'] =~ /^\/?.*\/accessToken/
+          super(env)
+        elsif VALID_HEADER_VALUES.include?(env[LEGACY_RACK_ENV_NAME])  
           req = ::Rack::Request.new(env)
           method = http_method(env)          
           headers = http_headers(env)
@@ -43,6 +49,18 @@ module StackMob
         end
       end
 
+      def rewrite_env(env)
+        env[STACKMOB_FORWARDED_HOST_ENV] = "127.0.0.1"
+        env[STACKMOB_FORWARDED_PORT_ENV] = env['SERVER_PORT']
+        env['HTTP_HOST'] = StackMob.plain_proxy_host
+        if StackMob.plain_proxy_host != ENV['STACKMOB_DEV_URL']
+          # rewrite port for api.stackmob.com
+          env['SERVER_PORT'] = 80 
+        end
+
+        env
+      end
+
       def client
         @client ||= StackMob::Client.new(StackMob.dev_url, StackMob.app_name, StackMob::SANDBOX, StackMob.key, StackMob.secret)
       end

data/lib/stackmob/push.rb

@@ -23,6 +23,7 @@ module StackMob
     BROADCAST_PATH = "/push_broadcast_universal"
     PUSH_TOKENS_PATH = "/push_tokens_universal"
     PUSH_USERS_PATH = "/push_users_universal"
+    GET_USERS_TOKEN_PATH = "/get_tokens_for_users_universal"
 
     DEFAULT_BADGE = 0
     DEFAULT_SOUND = ""
@@ -71,6 +72,11 @@ module StackMob
       payload = {:userIds => Array(to), :kvPairs => opts}
       self.client.request(:post, PUSH_SVC, PUSH_USERS_PATH, payload)
     end
+
+    def get_tokens_for_users(to)
+      payload = {:userIds => Array(to).join(",") }
+      response = self.client.request(:get, PUSH_SVC, GET_USERS_TOKEN_PATH, payload)
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stackmob
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - StackMob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-09 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -98,6 +98,22 @@ dependencies:
   name: rack
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 3
+        - 7
+        version: 0.3.7
+  prerelease: false
+  requirement: *id006
+  type: :runtime
+  name: rack-proxy
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,11 +125,11 @@ dependencies:
         - 0
         version: 2.11.0
   prerelease: false
-  requirement: *id006
+  requirement: *id007
   type: :development
   name: minitest
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,11 +141,11 @@ dependencies:
         - 0
         version: 0.6.0
   prerelease: false
-  requirement: *id007
+  requirement: *id008
   type: :development
   name: yard
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,11 +155,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id008
+  requirement: *id009
   type: :development
   name: cucumber
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,11 +171,11 @@ dependencies:
         - 0
         version: 1.0.0
   prerelease: false
-  requirement: *id009
+  requirement: *id010
   type: :development
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -171,11 +187,11 @@ dependencies:
         - 4
         version: 1.6.4
   prerelease: false
-  requirement: *id010
+  requirement: *id011
   type: :development
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -185,11 +201,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id011
+  requirement: *id012
   type: :development
   name: rcov
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -199,11 +215,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id012
+  requirement: *id013
   type: :development
   name: mocha
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -213,11 +229,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id013
+  requirement: *id014
   type: :development
   name: rack-test
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -227,11 +243,11 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  requirement: *id014
+  requirement: *id015
   type: :development
   name: bluecloth
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,7 +259,7 @@ dependencies:
         - 4
         version: 2.2.4
   prerelease: false
-  requirement: *id015
+  requirement: *id016
   type: :development
   name: httpclient
 description: Support Gem for StackMob Heroku Add-On