restpack_web 0.2.21 → 0.4.1

data/lib/restpack_web/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Web
-    VERSION = "0.2.21"
+    VERSION = "0.4.1"
   end
-end
+end

data/restpack_web.gemspec

@@ -1,32 +1,31 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'restpack_web/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = "restpack_web"
-  gem.version       = RestPack::Web::VERSION
-  gem.authors       = ["Gavin Joyce"]
-  gem.email         = ["gavinjoyce@gmail.com"]
-  gem.description   = %q{Run a web application on RestPack}
-  gem.summary       = %q{Run a web application on RestPack}
-  gem.homepage      = "https://github.com/RestPack"
+Gem::Specification.new do |spec|
+  spec.name          = "restpack_web"
+  spec.version       = RestPack::Web::VERSION
+  spec.authors       = ["Gavin Joyce"]
+  spec.email         = ["gavinjoyce@gmail.com"]
+  spec.description   = %q{Rack middleware for your RestPack web apps}
+  spec.summary       = %q{Rack middleware}
+  spec.homepage      = "http://restpack.org/"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_dependency 'rack-auto-session-domain', '~> 0.1.1'
-  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'
+  spec.add_dependency "restpack_gem"
+  spec.add_dependency "restpack_core_service"
+  spec.add_dependency "restpack_user_service"
+  spec.add_dependency "restpack_account_service"
+  spec.add_dependency "restpack_group_service"
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rack'
-  gem.add_development_dependency 'bump', '~> 0.4'
-  gem.add_development_dependency 'minitest', '~> 4.7'
-  gem.add_development_dependency 'rack-test', '~> 0.6'
-  gem.add_development_dependency 'webmock', '~> 1.11'
-  gem.add_development_dependency 'rest-client'
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "bump"
 end

metadata

@@ -1,170 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: restpack_web
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.4.1
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack-auto-session-domain
+  name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: restpack_core_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: public_suffix
+  name: restpack_core_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: restpack_user_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: restpack_account_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: restpack_group_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Run a web application on RestPack
+description: Rack middleware for your RestPack web apps
 email:
 - gavinjoyce@gmail.com
 executables: []
@@ -173,26 +145,22 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/restpack_web.rb
-- lib/restpack_web/app.rb
+- lib/restpack_web/configuration.rb
 - lib/restpack_web/context.rb
+- lib/restpack_web/rack/domain.rb
+- lib/restpack_web/rack/session.rb
+- lib/restpack_web/rack/user.rb
 - lib/restpack_web/rails/controller.rb
 - lib/restpack_web/sinatra/app.rb
-- lib/restpack_web/test_support.rb
 - lib/restpack_web/version.rb
 - restpack_web.gemspec
-- spec/fixtures/channels.json
-- spec/fixtures/configurations_root.json
-- spec/fixtures/domains_search.json
-- spec/fixtures/users.json
-- spec/lib/restpack_web_spec.rb
-- spec/lib/test_support_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/RestPack
-licenses: []
+homepage: http://restpack.org/
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -200,25 +168,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: Run a web application on RestPack
-test_files:
-- spec/fixtures/channels.json
-- spec/fixtures/configurations_root.json
-- spec/fixtures/domains_search.json
-- spec/fixtures/users.json
-- spec/lib/restpack_web_spec.rb
-- spec/lib/test_support_spec.rb
-- spec/spec_helper.rb
+summary: Rack middleware
+test_files: []

data/LICENSE

@@ -1,22 +0,0 @@
-MIT License
------------
-
-Copyright (c) 2013 Gavin Joyce and RestPack contributors
-
-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/lib/restpack_web/app.rb

@@ -1,55 +0,0 @@
-require 'restpack_core_client'
-
-module RestPack
-  module Web
-    class App
-      def initialize(app, options = {})
-        @app = app
-
-        options[:core_domain] ||= ENV['RESTPACK_CORE_SERVICE']
-        options[:access_key] ||= ENV['RESTPACK_ACCESS_KEY']
-
-        raise "missing RestPack configuration" unless options[:core_domain] || options[:access_key]
-
-        @core_cache = RestPack::Core::Client::Cache.create(options[:core_domain], options[:access_key])
-      end
-
-      def call(env)
-        env[:restpack] ||= {}
-
-        request = Rack::Request.new(env)
-
-        domain = @core_cache.get_domain(request.host)
-
-        env[:restpack][:request] = request
-        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
-
-        @app.call(env)
-      end
-
-      private
-
-      def add_user(env)
-        return unless env['rack.session']
-
-        user_id = env['rack.session'][:user_id]
-
-        if user_id
-          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
-      end
-    end
-  end
-end

data/lib/restpack_web/test_support.rb

@@ -1,26 +0,0 @@
-require 'webmock'
-include WebMock::API
-
-module Rack
-  module Test
-    DEFAULT_HOST = 'sinatra.restpack-sample.org'
-  end
-end
-
-module RestPack
-  module Web
-    class TestSupport
-      def self.stub_restpack_web
-        host = "http://:#{ENV['RESTPACK_ACCESS_KEY']}@#{ENV['RESTPACK_CORE_SERVICE']}/api/v1"
-        stub_request(:get, "#{host}/configurations/root.json").to_return(:body => read_fixture('configurations_root'))
-        stub_request(:get, "#{host}/domains/search.json?host=sinatra.restpack-sample.org").to_return(:body => read_fixture('domains_search'))
-        stub_request(:get, "#{host}/channels/1.json").to_return(:body => read_fixture('channels'))
-      end
-
-      def self.read_fixture(name)
-        file = File.open("#{File.expand_path('../../../spec/fixtures', __FILE__)}/#{name}.json")
-        file.read
-      end
-    end
-  end
-end