restpack_web 0.2.19 → 0.2.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDRiZTVkYzFmOGVlZTljYWVhYmE2NmIxYzI1ZTY0ZTJmYzFlOGY5Yg==
+    N2Y1Y2U5NjY1MjFmZWY0NjUyZTk0NmJjNzMwNGQ3Y2I3ODQzNWY3Nw==
   data.tar.gz: !binary |-
-    Y2RiYmIxZjE1M2UzNjkzNTFhODQ0ZTUyZDlhYjliYTgxMDJiYzRkOQ==
+    MjQxZGU0NDE0MDQ2YTU1MWZiZDk1ZDBhMzA5MmE0NjE2NGRhNGU1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjJmNTkzYmM0YTZkZGM3M2JiMzk3ZmZlZmUxYmY5MzFjZmQzZWY0YzA1ZDJm
-    NTA3ZjI5NjQzZDRjYWVhYWJkZjI1YmRkY2UyNzVjMThmZDFmNTVlNmJhMWQ1
-    ZWQyMGRiNzkzZTg3YTIyMDJmNTljNWY4ZmYyZWJiY2ExMTdjNzE=
+    OTcyNmQwM2Y1NjQwZTI4MDBjZDM2MmQ4ODJjNTQ3MWZiMmQ1NDQ3MTkxMTNk
+    MTVjNzQ4M2ZiMDE4N2YyMGE3MjMyM2NkZjEzMzFmMDlkMTdlNWM1MTg1NDlj
+    NDljMzJjOTE3MWVhNTY2MTY2ZjgzZDQwOTUzZGY3ZWQxMDZjNmY=
   data.tar.gz: !binary |-
-    ZGQ1MGYwNjAxNjlhZDQ0NjBjNTg3ZDk5YzRkYzZjMjM2YmRhOWJmYzgyOWY1
-    OGJlYzBlY2EwZDU5ZmEzMWM1ZWVmZmVhZjJjZDY1NzJkNzYyZDM2ODQzNGEy
-    MDUyMDRkMTFmNmE4ZTdhZjIxODlmOGZhZDgyMDkyZDdlOGMzMWQ=
+    NjNmMzhiOTM1NjA1NzlhYjE3YWE4MjkyOWVkN2ZiOGJkNjQyODYwMzZmY2Zl
+    ZmNmMjlkYjEzMzIxNWQ2YTAzODEzYTIwMDU4MGUyNTYwNzVmNzFjMTg5NmQ2
+    ZmJkMzRjOWRlNTk3YjA5NDJhNDI4NzBhNDliZmE4OWU3NDc5MzU=

data/lib/restpack_web/app.rb

@@ -4,7 +4,6 @@ module RestPack
   module Web
     class App
       def initialize(app, options = {})
-        p "RestPack::Web::App.initialize"
         @app = app
 
         options[:core_domain] ||= ENV['RESTPACK_CORE_SERVICE']
@@ -18,29 +17,17 @@ module RestPack
       def call(env)
         env[:restpack] ||= {}
 
-        begin #TODO: GJ: cache should handle errors gracefully
-          request = Rack::Request.new(env)
+        request = Rack::Request.new(env)
 
-          channel = @core_cache.get_channel(request.host)
-          domain = channel.get_domain_by_host(request.host)
+        domain = @core_cache.get_domain(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', [])
+        env[:restpack][:host] = request.host
+        env[:restpack][:channel] = domain.channel
+        env[:restpack][:application] = domain.application
+        env[:restpack][:domain] = domain
+        env[:restpack][:configurations] = @core_cache.configurations
 
-          add_user env
-
-        rescue Exception => e
-          p "---"
-          p e.message
-          p "===="
-          p e.backtrace.inspect
-          p "---"
-        end
+        add_user env
 
         @app.call(env)
       end
@@ -53,11 +40,11 @@ module RestPack
         user_id = env['rack.session'][:user_id]
 
         if user_id
-          user_id = env['rack.session'][:user_id]
-          channel_domains = env[:restpack][:channel].configurations.find{ |conf| conf.key == 'domains' }.value
-          auth_domain = channel_domains[:auth]
-          json = RestClient.get("#{auth_domain}/api/v1/users/#{user_id}.json")
-          env[:restpack][:user] = Yajl::Parser.parse(json)['user']
+          context = RestPack::Web::Context.new(env)
+
+          user_service_domain = context.get_service_domain('restpack-user-service')
+          json = RestClient.get("http://:#{ENV['RESTPACK_ACCESS_KEY']}@#{user_service_domain}/api/v1/users/#{user_id}.json")
+          env[:restpack][:user] = Yajl::Parser.parse(json, :symbolize_keys => true)[:user]
         end
 
         env[:restpack][:user_id] = user_id

data/lib/restpack_web/context.rb

@@ -3,18 +3,16 @@ require 'public_suffix'
 module RestPack
   module Web
     class Context
-      attr_accessor :domain, :application, :channel, :configurations, :services, :user, :user_id, :request
-      
-      def initialize(env)    
+      attr_accessor :domain, :application, :channel, :configurations, :user, :user_id
+
+      def initialize(env)
         restpack = env[:restpack]
 
         if restpack
-          @request = restpack[:request]
           @domain = restpack[:domain]
           @application = restpack[:application]
           @channel = restpack[:channel]
           @configurations = restpack[:configurations]
-          @services = restpack[:services]
           @user = restpack[:user]
           @user_id = @user[:id] if @user
         end
@@ -24,8 +22,20 @@ module RestPack
         !@user.nil?
       end
 
+      def get_configuration(key)
+        @configurations.find { |c| c.key == key }
+      end
+
+      def services
+        get_configuration('services').value
+      end
+
       def get_service(name)
-        @services.find { |s| s[:name] == name.to_s }
+        services.find { |s| s[:name] == name }
+      end
+
+      def get_service_domain(name)
+        get_service(name)[:domain]
       end
 
       def home_domain
@@ -54,14 +64,14 @@ module RestPack
         user_debug_info = ""
         if is_authenticated?
           image_debug_info = ""
-          image_debug_info = " * **image** : #{@user['image']} ![Image](#{@user['image']}" unless @user['image'].nil?
+          image_debug_info = " * **image** : #{@user[:image]} ![Image](#{@user[:image]}" unless @user[:image].nil?
 
           user_debug_info = %{
- * **id** : #{@user['id']}
- * **name** : #{@user['name']}
- * **nickname** : #{@user['nickname']}
- * **location** : #{@user['location']}
- * **description** : #{@user['description']}
+ * **id** : #{@user[:id]}
+ * **name** : #{@user[:name]}
+ * **nickname** : #{@user[:nickname]}
+ * **location** : #{@user[:location]}
+ * **description** : #{@user[:description]}
 #{image_debug_info})
           }
         end
@@ -94,6 +104,7 @@ module RestPack
 #### Configuration:
 
  * **keys**: #{@configurations.map { |c| c.key }.join(', ')}
+ * **services**: #{services.map { |s| s[:name] + ': ' + s[:domain] }.join(', ')}
 
 #### Authentication:
 
@@ -104,4 +115,4 @@ module RestPack
       end
     end
   end
-end
+end

data/lib/restpack_web/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Web
-    VERSION = "0.2.19"
+    VERSION = "0.2.20"
   end
 end

data/restpack_web.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rack-auto-session-domain', '~> 0.1.1'
-  gem.add_dependency 'restpack_core_client', '~> 0.2.4'
+  gem.add_dependency 'restpack_core_client', '~> 0.2.6'
   gem.add_dependency 'public_suffix', '~> 1.3.0'
   gem.add_dependency 'yajl-ruby', '~> 1.1.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_web
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-auto-session-domain
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement