restpack-web 0.1.17 → 0.1.18

data/lib/restpack-web/app.rb

@@ -2,11 +2,11 @@ require 'restpack-core-client'
 
 module RestPack
   module Web
-    class App      
+    class App
       def initialize(app, options = {})
         p "RestPack::Web::App.initialize"
         @app = app
-        
+
         options[:core_domain] ||= ENV['RESTPACK_CORE_SERVICE']
         options[:access_key] ||= ENV['RESTPACK_ACCESS_KEY']
         
@@ -14,8 +14,9 @@ module RestPack
       end
 
       def call(env)
+        env[:restpack] ||= {}
         begin #TODO: GJ: cache should handle errors gracefully
-          env[:restpack] ||= {}
+          
 
           host = env["SERVER_NAME"]
           env[:restpack][:host] = host
@@ -27,17 +28,10 @@ module RestPack
           env[:restpack][:application] = domain.application
           env[:restpack][:domain] = domain
           
+          add_user env
           
-          user_id = env['rack.session'][:user_id]
-          if user_id
-            url = "http://:1234@localhost:1112/api/v1/users/#{user_id}.json"
-            p url
-            json = RestClient.get(url)
-            user = JSON.parse(json)['user']
-            env[:restpack][:user] = user
-          end
+          add_application_domains env
           
-          env[:restpack][:user_id] = user_id
         rescue Exception => e
           p "---"
           p e.message  
@@ -48,5 +42,37 @@ module RestPack
         @app.call(env)
       end
     end
+    
+    private
+    
+    def add_user(env)
+      user_id = env['rack.session'][:user_id]
+      if user_id
+        url = "http://:1234@localhost:1112/api/v1/users/#{user_id}.json" #TODO: GJ: build from config
+        p url
+        json = RestClient.get(url)
+        user = JSON.parse(json)['user']
+        env[:restpack][:user] = user
+      end
+      
+      env[:restpack][:user_id] = user_id
+    end
+    
+    def add_application_domains(env)
+      application = env[:restpack][:application]
+      
+      domains = {}
+      
+      configured_domains = application.get_configuration_by_key('domains')
+            
+      if configured_domains
+        for key in configured_domains.value.keys
+          domains[key] = configured_domains.value[key]
+        end
+      end
+      
+      env[:restpack][:application_domains] = domains
+    end
+
   end
 end

data/lib/restpack-web/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Web
-    VERSION = "0.1.17"
+    VERSION = "0.1.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack-web
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-auto-session-domain