restpack-web 0.2.22 → 0.2.23

data/lib/restpack-web/app.rb

@@ -9,6 +9,7 @@ module RestPack
 
         options[:core_domain] ||= ENV['RESTPACK_CORE_SERVICE']
         options[:access_key] ||= ENV['RESTPACK_ACCESS_KEY']
+        @options = options
         
         unless options[:core_domain] || options[:access_key]
           p "[WARNING] Missing RestPack configuration"
@@ -21,28 +22,19 @@ module RestPack
         env[:restpack] ||= {}
 
         #TODO: GJ: ignore requests with a file extension
-        begin #TODO: GJ: cache should handle errors gracefully
-          request = Rack::Request.new(env)
-          channel = @core_cache.get_channel(request.host)
-          domain = channel.get_domain_by_host(request.host)
-          
-          env[:restpack][:request] = request
-          env[:restpack][:host] = request.host
-          env[:restpack][:channel] = channel
-          env[:restpack][:application] = domain.application
-          env[:restpack][:domain] = domain
-          env[:restpack][:configurations] = @core_cache.configurations
-          env[:restpack][:services] = @core_cache.get_configuration_value('services', [])
-          
-          add_user env
-          
-        rescue Exception => e
-          p "---"
-          p e.message
-          p "===="
-          p e.backtrace.inspect
-          p "---"
-        end
+        request = Rack::Request.new(env)
+        channel = @core_cache.get_channel(request.host)
+        domain = channel.get_domain_by_host(request.host)
+        
+        env[:restpack][:request] = request
+        env[:restpack][:host] = request.host
+        env[:restpack][:channel] = channel
+        env[:restpack][:application] = domain.application
+        env[:restpack][:domain] = domain
+        env[:restpack][:configurations] = @core_cache.configurations
+        env[:restpack][:services] = @core_cache.get_configuration_value('services', [])
+        
+        add_user env
 
         @app.call(env)
       end
@@ -53,8 +45,7 @@ module RestPack
         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
+          url = "http://:#{@options[:access_key]}@#{ENV['RESTPACK_USER_SERVICE']}/api/v1/users/#{user_id}.json" #TODO: GJ: build from config
           json = RestClient.get(url)
           user = Yajl::Parser.parse(json, :symbolize_keys => true)[:user]
 

data/lib/restpack-web/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Web
-    VERSION = "0.2.22"
+    VERSION = "0.2.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack-web
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
   prerelease: 
 platform: ruby
 authors: