restpack_web 0.2.21 → 0.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzkyYjAzMWU0NjA1MzUyYjc5NWU3MzM3NDg5ZmY0ZGE1MDI5MDcxZg==
-  data.tar.gz: !binary |-
-    Njc5OTE3NGJhYjRkYjkwY2IyMjVlNWM3N2I5M2JiYmMyNDcxZjFlYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTg1ZWZlMGM5ZmQxMGRkZTQwYjk1Yzg3ZTEyNjA2MDY5NDc2Y2IzNWM0MWNh
-    MDNjMWMzNmRmYWMxMzMzYTEyMDg3YWVjOGRhYmIzMTcyMDFmZjI2YTcyMGIw
-    MTllMjNiOWY3ZDVjNDlmZDZlNThjZDg5MDMwZjBiYjY0YmRkNzY=
-  data.tar.gz: !binary |-
-    OGY1OTI2MmZjMTM3ZTEzNWFmZjU5MDExMjE3MTQxMzJiYjMzOGZkMmM2NmQw
-    Y2JmNGM5ZDZjNjQ4NGJjZWU0NTNlOGJkNjFhMjhjN2ZhNjgwZDNmMmJlMDI3
-    MmQxMmMxNWIwYjQ2MmY1MDVkZWE2ZjNjYWM0NTRmY2EyNTVlNWY=
+SHA1:
+  metadata.gz: 5747a127d3d522bcf4968a47bf9ec9006b68acf0
+  data.tar.gz: 9e7e8ebf35d75e3fce8d99dd980820383f66bf47
+SHA512:
+  metadata.gz: c9abd53df497790f5ed9904466a79bc2c930ab812ae6a43a5812a74461b65de24edadb8e3c710bccb4cfad3b17a62df1e23a9f9838200dce1e4ed2206e10b732
+  data.tar.gz: 7b3b5dbed34dc462c45158f3696a785fa6d55c1a2b450ce26f391583828cecd14ee1fe4984c66aff27d916ca00a3e69de35176abd228523c7346e90d945de860

data/.gitignore

@@ -14,4 +14,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'encrypted_cookie', path: '../encrypted_cookie'

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Gavin Joyce
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,30 +1,3 @@
-## Install in Rails 3
-Add `restpack-web` to Gemfile
-```ruby
-gem 'restpack-web', '~> 0.2.16', :git => 'git://github.com/RestPack/restpack-web.git'
-```
-
-Use `RestPack::Web::App` as a middleware in `application.rb`
-```ruby
-config.middleware.use RestPack::Web::App
-```
-
-Set necessary environment variables:
-```ruby
-ENV['RESTPACK_ACCESS_KEY'] = 'secret'
-ENV['RESTPACK_CORE_SERVICE'] = 'restpack-core-service.restpack.org'
-```
-
-## Testing your app
-You can stub all requests from restpack_web to the core service.
-```ruby
-require 'restpack_web/test_support'
-RestPack::Web::TestSupport.stub_restpack_web
-```
-
-## Testing
-`bundle exec rake test`
-
-## Bump to a new version
-`bundle exec bump patch && rake tag`
+# restpack_web
 
+Rack middleware for your RestPack web apps

data/Rakefile

@@ -1,39 +1,2 @@
-require 'bundler/setup'
-require 'rake/testtask'
-require 'bump/tasks'
-require_relative 'lib/restpack_web/version'
-
-task :default => [:test]
-
-Rake::TestTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-task :gem do
-  ["gem:bump", "gem:tag", "gem:build", "gem:push"].each do |task|
-    Rake::Task[task].reenable
-    Rake::Task[task].invoke
-  end
-end
-
-namespace :gem do
-  task :build do
-    sh "gem build restpack_web.gemspec"
-  end
-
-  task :push do
-    require 'bump'
-    sh "gem push restpack_web-#{Bump::Bump.current}.gem"
-  end
-
-  task :tag do
-    require 'bump'
-    version = Bump::Bump.current
-    puts "tagging v#{version}"
-    `git push && git tag v#{version} && git push --tags`
-  end
-
-  task :bump do
-    Rake::Task["bump:patch"].invoke
-  end
-end
+require "restpack_gem"
+RestPack::Gem::Tasks.load_tasks

data/lib/restpack_web.rb

@@ -1,6 +1,11 @@
 require 'restpack_web/version'
+
+require 'restpack_web/configuration'
 require 'restpack_web/context'
-require 'restpack_web/app'
+
+require 'restpack_web/rack/domain'
+require 'restpack_web/rack/user'
+require 'restpack_web/rack/session'
 
 require 'restpack_web/rails/controller'
 require 'restpack_web/sinatra/app'

data/lib/restpack_web/configuration.rb

@@ -0,0 +1,16 @@
+module RestPack::Web
+  class Configuration
+    attr_accessor :authentication_port
+
+    def initialize
+      @authentication_port = nil
+    end
+  end
+
+  mattr_accessor :config
+  @@config = Configuration.new
+
+  def self.setup
+    yield @@config
+  end
+end

data/lib/restpack_web/context.rb

@@ -1,119 +1,70 @@
-require 'public_suffix'
-
-module RestPack
-  module Web
-    class Context
-      attr_accessor :request, :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]
-          @user = restpack[:user]
-          @user_id = @user[:id] if @user
-        end
+module RestPack::Web
+  class Context
+    attr_accessor :domain, :application, :user, :account
+
+    def initialize(env)
+      restpack = env['restpack']
+
+      if restpack
+        @domain = restpack[:domain]
+        @application = restpack[:application]
+        @user = restpack[:user]
+        @account = restpack[:account]
       end
+    end
 
-      def is_authenticated?
-        !@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 }
-      end
-
-      def get_service_domain(name)
-        get_service(name)[:domain]
-      end
-
-      def home_domain
-        @application.home_domain || "www.#{root_domain}"
-      end
-
-      def auth_domain
-        @application.auth_domain || "auth.#{root_domain}"
-      end
-
-      def root_domain
-        PublicSuffix.parse(@domain.host).domain
-      end
-
-      def logout_url(next_url = nil) #TODO: GJ: whitelist the next_url
-        next_url ||= "http://#{home_domain}/"
-        "http://#{auth_domain}/auth/logout?next=#{next_url}"
-      end
-
-      def login_url(provider = :twitter, next_url = nil)
-        next_url ||= "http://#{home_domain}/"
-        "http://#{auth_domain}/auth/#{provider}?next=#{next_url}"
-      end
-
-      def debug_info #TODO: GJ: move to a mixin
-        user_debug_info = ""
-        if is_authenticated?
-          image_debug_info = ""
-          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]}
-#{image_debug_info})
-          }
-        end
+    def authenticated?
+      !@user.nil?
+    end
 
-        %{
-### RestPack Context:
+    def user_id
+      authenticated? ? @user[:id] : nil
+    end
 
-#### User:
+    def account_id
+      authenticated? ? @account[:id] : nil
+    end
 
- * **is authenticated**: #{is_authenticated?}
-#{user_debug_info}
+    def application_id
+      @application[:id]
+    end
 
-#### Channel:
+    def domain_id
+      @domain[:id]
+    end
 
- * **id**: #{@channel.id}
- * **name**: #{@channel.name}
- * **applications**: #{@channel.applications.map { |a| a.name }.join(', ')}
+    def home_domain
+      "www.#{@domain[:identifier]}"
+    end
 
-#### Application:
+    def auth_domain
+      "auth.#{@domain[:identifier]}"
+    end
 
- * **id**: #{@application.id}
- * **name**: #{@application.name}
- * **domains**: #{@application.domains.map { |a| a.host }.join(', ')}
+    def logout_url(next_url = nil)
+      next_url ||= "http://#{home_domain}/"
+      auth_url('/auth/logout', next_url)
+    end
 
-#### Domain:
+    def login_url(provider = :twitter, next_url = nil)
+      auth_url("/auth/#{provider}", next_url)
+    end
 
- * **id**: #{@domain.id}
- * **host**: #{@domain.host}
+    def debug_info
+      "todo"
+    end
 
-#### Configuration:
+    private
 
- * **keys**: #{@configurations.map { |c| c.key }.join(', ')}
- * **services**: #{services.map { |s| s[:name] + ': ' + s[:domain] }.join(', ')}
+    def auth_url(path, next_url = nil)
+      #TODO: GJ: whitelist the next_url?
+      #TODO: GJ: URI encode next_url?
+      port = RestPack::Web.config.authentication_port
 
-#### Authentication:
+      port_part = port ? ":#{port}" : ""
+      next_part = next_url ? "?next=#{next_url}" : ""
 
- * **logout**: #{logout_url}
- * **twitter oauth**: #{login_url(:twitter)}
- * **google oauth**: #{login_url(:google_oauth2)}
-          }
-      end
+      "http://#{auth_domain}#{port_part}#{path}#{next_part}"
     end
   end
 end

data/lib/restpack_web/rack/domain.rb

@@ -0,0 +1,36 @@
+module RestPack::Web::Rack
+  class Domain
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      identifier = Rack::Request.new(env).host
+
+      response = Commands::Core::Domain::ByIdentifier.run({
+        identifier: identifier,
+        include: 'applications'
+      })
+
+      if response.status == :ok
+        domain = response.result[:domains][0]
+        application = response.result[:applications][0]
+
+        env['restpack'] ||= {}
+        env['restpack'][:domain] = domain
+        env['restpack'][:application] = application
+        env['restpack'][:application_id] = application[:id]
+
+        env['restpack.session.options'] ||= {}
+        env['restpack.session.options'][:key] = 'restpack.session'
+        env['restpack.session.options'][:secret] = domain[:session_secret]
+        env['restpack.session.options'][:domain] = domain[:identifier]
+      else
+        #TODO: GJ: better exceptions based on response status
+        raise "[#{identifier}] is not a RestPack domain"
+      end
+
+      @app.call(env)
+    end
+  end
+end

data/lib/restpack_web/rack/session.rb

@@ -0,0 +1,7 @@
+require 'encrypted_cookie'
+
+module RestPack::Web::Rack
+  class Session < Rack::Session::EncryptedCookie
+
+  end
+end

data/lib/restpack_web/rack/user.rb

@@ -0,0 +1,35 @@
+require 'restpack_user_service'
+require 'restpack_account_service'
+
+module RestPack::Web::Rack
+  class User
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      session = env["restpack.session"]
+      user_id = session[:user_id]
+      account_id = session[:account_id]
+
+      if user_id && account_id
+        response = Commands::Users::User::Get.run({
+          id: user_id,
+          application_id: env['restpack'][:application_id]
+        })
+
+        raise "Error getting user" unless response.success?
+        env['restpack'][:user] = response.result[:users][0]
+
+        response = Commands::Accounts::Account::Get.run({
+          id: account_id,
+          application_id: env['restpack'][:application_id]
+        })
+        raise "Error getting account" unless response.success?
+        env['restpack'][:account] = response.result[:accounts][0]
+      end
+
+      @app.call(env)
+    end
+  end
+end

data/lib/restpack_web/rails/controller.rb

@@ -1,15 +1,11 @@
-module RestPack
-  module Web
-    module Rails
-      module Controller
-        def self.included(base)
-          base.send(:before_filter, :include_restpack)
-        end
-  
-        def include_restpack
-          @restpack = RestPack::Web::Context.new(request.env)
-        end
-      end
+module RestPack::Web::Rails
+  module Controller
+    def self.included(base)
+      base.send(:before_filter, :setup_restpack_context)
+    end
+
+    def setup_restpack_context
+      @restpack = RestPack::Web::Context.new(request.env)
     end
   end
-end
+end

data/lib/restpack_web/sinatra/app.rb

@@ -1,20 +1,13 @@
-require 'rack-auto-session-domain'
+module RestPack::Web::Sinatra
+  module App
+    def self.included(base)
+      base.use RestPack::Web::Rack::Domain
+      base.use RestPack::Web::Rack::Session
+      base.use RestPack::Web::Rack::User
 
-module RestPack
-  module Web
-    module Sinatra
-      module App
-        def self.included(base)
-          base.use Rack::AutoSessionDomain
-          base.use RestPack::Web::App
-          base.enable :sessions
-          base.set :session_secret, 'c40b83f9048c497891f0f71e4b040a3f' #TODO: GJ: from restpack config
-
-          base.before do
-            @restpack = RestPack::Web::Context.new(env)
-          end
-        end
+      base.before do
+        @restpack = RestPack::Web::Context.new(env)
       end
     end
   end
-end
+end