praxis 0.21 → 0.22.pre.1

data/praxis.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.email = ["blanquer@gmail.com","dane.jensen@gmail.com"]
 
-  spec.homepage = "https://github.com/rightscale/praxis"
+  spec.homepage = "https://github.com/praxis/praxis"
   spec.license = "MIT"
   spec.required_ruby_version = ">=2.1"
 
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.bindir = 'bin'
   spec.executables << 'praxis'
 
-  spec.add_dependency 'rack', '~> 1'
-  spec.add_dependency 'mustermann', '~> 0'
+  spec.add_dependency 'rack', '>= 1'
+  spec.add_dependency 'mustermann', '>=0', '<=1'
   spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'mime', '~> 0'
   spec.add_dependency 'praxis-mapper', '~> 4.3'
@@ -29,9 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'attributor', '~> 5.1'
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency 'terminal-table', '~> 1.4'
-  spec.add_dependency 'harness', '~> 2'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 0.9'
   spec.add_development_dependency 'rake-notes', '~> 0'
   if RUBY_PLATFORM !~ /java/

data/spec/functional_spec.rb

@@ -333,11 +333,11 @@ describe 'Functional specs' do
 
   context 'wildcard verb routing' do
     it 'can terminate instances with POST' do
-      post '/api/clouds/23/instances/1/terminate?api_version=1.0', nil, 'global_session' => session
+      post '/api/clouds/23/instances/1/terminate?api_version=1.0', '', 'global_session' => session
       expect(last_response.status).to eq(200)
     end
     it 'can terminate instances with DELETE' do
-      post '/api/clouds/23/instances/1/terminate?api_version=1.0', nil, 'global_session' => session
+      post '/api/clouds/23/instances/1/terminate?api_version=1.0', '', 'global_session' => session
       expect(last_response.status).to eq(200)
     end
 
@@ -352,18 +352,16 @@ describe 'Functional specs' do
       get '/api/clouds/23/otherinstances/_action/exceptional?api_version=1.0', nil, 'global_session' => session
       expect(last_response.status).to eq(404)
     end
-
-
   end
 
   context 'auth_plugin' do
     it 'can terminate' do
-      post '/api/clouds/23/instances/1/terminate?api_version=1.0', nil, 'global_session' => session
+      post '/api/clouds/23/instances/1/terminate?api_version=1.0', '', 'global_session' => session
       expect(last_response.status).to eq(200)
     end
 
     it 'can not stop' do
-      post '/api/clouds/23/instances/1/stop?api_version=1.0', nil, 'global_session' => session
+      post '/api/clouds/23/instances/1/stop?api_version=1.0', '', 'global_session' => session
       expect(last_response.status).to eq(403)
     end
   end

data/spec/praxis/action_definition_spec.rb

@@ -1,6 +1,15 @@
 require 'spec_helper'
 
 describe Praxis::ActionDefinition do
+  
+  before(:context) do
+    Thread.current[:praxis_instance] = Praxis::Application.new(name: 'action_definition_spec', skip_registration: true)
+  end
+  
+  let(:praxis_instance) do
+    Thread.current[:praxis_instance]
+  end
+  
   class SpecMediaType < Praxis::MediaType
     identifier 'application/json'
 
@@ -31,10 +40,8 @@ describe Praxis::ActionDefinition do
       end
     end
   end
-
   subject(:action) do
-
-    Praxis::ApiDefinition.define do |api|
+    praxis_instance.api_definition.define do |api|
       api.response_template :ok do |media_type: , location: nil, headers: nil, description: nil |
         status 200
 
@@ -42,6 +49,10 @@ describe Praxis::ActionDefinition do
         location location
         headers headers if headers
       end
+      
+      api.info do # applies to all API infos
+        base_path "/pref"
+      end
     end
     Praxis::ActionDefinition.new(:foo, resource_definition) do
       routing { get '/:one' }
@@ -111,11 +122,11 @@ describe Praxis::ActionDefinition do
     let(:traits) { {test: trait} }
 
     before do
-      allow(Praxis::ApiDefinition.instance).to receive(:traits).and_return(traits)
+      allow(praxis_instance.api_definition).to receive(:traits).and_return(traits)
     end
 
     its('params.attributes.keys') { should eq [:inherited, :app_name, :name, :one]}
-    its('routes.first.path.to_s') { should eq '/api/foobars/hello_world/test_trait/:app_name/:one' }
+    its('routes.first.path.to_s') { should eq '/pref/foobars/hello_world/test_trait/:app_name/:one' }
     its(:traits) { should eq [:test] }
 
     it 'is reflected in the describe output' do
@@ -315,11 +326,9 @@ describe Praxis::ActionDefinition do
   end
 
   context 'with a base_path and base_params on ApiDefinition' do
-    # Without getting a fresh new ApiDefinition it is very difficult to test stuff using the Singleton
-    # So for some tests we're gonna create a new instance and work with it to avoid the singleton issues
-    let(:non_singleton_api) do
-      api_def=Praxis::ApiDefinition.__send__(:new)
-      api_def.instance_eval do |api|
+    subject(:action) do
+      api_def=Praxis::ApiDefinition.new(praxis_instance)
+      api_def.define do |api|
 
         api.info do
           base_path '/apps/:app_name'
@@ -332,11 +341,13 @@ describe Praxis::ActionDefinition do
         end
 
       end
-      api_def
-    end
-
-    before do
-      allow(Praxis::ApiDefinition).to receive(:instance).and_return(non_singleton_api)
+      # No setter...and its fine to do it here as it would not be used in a runtime situation
+      praxis_instance.instance_variable_set(:@api_definition, api_def)
+      # Define the action after the api_definition is set (as it uses is config to setup the routes)
+      Praxis::ActionDefinition.new(:bar, resource_definition) do
+        routing { get '/:one' }
+        params  { attribute :one, String }
+      end
     end
 
     its('routes.first.path.to_s') { should eq '/apps/:app_name/foobars/hello_world/:one' }

data/spec/praxis/api_definition_spec.rb

@@ -2,12 +2,18 @@ require 'spec_helper'
 
 describe Praxis::ApiDefinition do
 
-  subject(:api){  Praxis::ApiDefinition.instance }
+  # TODO: perhaps grab the spec app instance from some global var...(instead of relying on the singleton compat method)
+  subject(:api){ Praxis::ApiDefinition.instance } 
 
   # Without getting a fresh new ApiDefinition it is very difficult to test stuff using the Singleton
   # So for some tests we're gonna create a new instance and work with it to avoid the singleton issues
+  let(:app_instance){ double("AppInstance") }
+  before do
+    allow(app_instance).to receive(:versioning_scheme=).with([:header, :params])
+  end
+  
   let(:non_singleton_api) do
-    api_def=Praxis::ApiDefinition.__send__(:new)
+    api_def=Praxis::ApiDefinition.new(app_instance)
     api_def.instance_eval do |api|
       api.response_template :template1, &Proc.new {}
       api.trait :trait1, &Proc.new {}
@@ -32,12 +38,7 @@ describe Praxis::ApiDefinition do
     end
   end
 
-  context 'singleton' do
-    it 'should be a Singleton' do
-      expect(Praxis::ApiDefinition.ancestors).to include( Singleton )
-      expect(subject).to eq(Praxis::ApiDefinition.instance )
-    end
-
+  context 'initial definition' do
     it 'has the :ok and :created response templates registered' do
       expect(api.responses.keys).to include(:ok)
       expect(api.responses.keys).to include(:created)
@@ -58,6 +59,10 @@ describe Praxis::ApiDefinition do
       expect(api.responses.keys).to include(:foobar)
       expect(api.response(:foobar)).to be_kind_of(Praxis::ResponseTemplate)
     end
+    it 'stores the app instance' do
+      template = api.response(:template1)
+      expect(template.application).to be(app_instance)
+    end
   end
 
   context '.response' do

data/spec/praxis/api_general_info_spec.rb

@@ -2,12 +2,7 @@ require 'spec_helper'
 
 describe Praxis::ApiGeneralInfo do
 
-  subject(:info){ Praxis::ApiGeneralInfo.new }
-
-  before do
-    allow(Praxis::Application.instance).to receive(:versioning_scheme=).with([:header, :params])
-  end
-
+  subject(:info){ Praxis::ApiGeneralInfo.new(application: APP) }
 
   let(:info_block) do
     Proc.new do
@@ -64,8 +59,8 @@ describe Praxis::ApiGeneralInfo do
   end
 
   context 'base_path with versioning' do
-    let(:global_info){ Praxis::ApiGeneralInfo.new }
-    subject(:info){ Praxis::ApiGeneralInfo.new(global_info, version: '1.0') }
+    let(:global_info){ Praxis::ApiGeneralInfo.new(application: APP) }
+    subject(:info){ Praxis::ApiGeneralInfo.new(global_info, application: APP, version: '1.0') }
 
     before do
       global_info

data/spec/praxis/application_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Praxis::Application do
   context 'configuration' do
     subject(:app) do
-      app = Class.new(Praxis::Application).instance
+      app = Class.new(Praxis::Application).new(skip_registration: true)
 
       config = Object.new
       def config.define(key=nil, type=Attributor::Struct, **opts, &block)
@@ -45,7 +45,7 @@ describe Praxis::Application do
   end
 
   context 'media type handlers' do
-    subject { Class.new(Praxis::Application).instance }
+    subject { Class.new(Praxis::Application).new(skip_registration: true) }
 
     before do
       # don't actually bootload; we're merely running specs
@@ -94,12 +94,14 @@ describe Praxis::Application do
   end
 
   describe '#setup' do
-    subject { Class.new(Praxis::Application).instance }
-
+    subject { Praxis::Application.new(skip_registration: true) }
+    let(:boot_loader) { double("BL", setup!: true) }
+    let(:builder) { double("Builder", to_app: double('Rack app'), run: true) }
+    
     before do
-      # don't actually bootload; we're merely running specs
-      allow(subject.bootloader).to receive(:setup!).and_return(true)
-      allow(subject.builder).to receive(:to_app).and_return(double('Rack app'))
+      # don't actually bootload; we're merely running specs  
+      allow(subject).to receive(:bootloader).and_return(boot_loader)
+      allow(subject).to receive(:builder).and_return(builder)
     end
 
     it 'is idempotent' do
@@ -112,5 +114,9 @@ describe Praxis::Application do
       expect(subject.setup).to eq(subject)
       expect(subject.setup).to eq(subject)
     end
+    
+    it 'creates an ApiDefinition that has a back-reference' do
+      expect(subject.api_definition.application).to eq(subject)
+    end
   end
 end

data/spec/praxis/middleware_app_spec.rb

@@ -2,35 +2,49 @@ require 'spec_helper'
 
 describe Praxis::MiddlewareApp do
 
-  context '.for' do
-    let(:init_args){ { root: 'here'} }
-    subject(:middleware) { Praxis::MiddlewareApp.for( init_args ) }
+  let(:init_args){ { root: 'here', name: 'middleware_app_spec', skip_registration: true} }
+  let(:middleware) { Praxis::MiddlewareApp.for( init_args ) }
+  let(:instance){ middleware.new(target)}
 
-    it 'initializes the application singletone with the passed parameters' do
-      expect( Praxis::Application.instance ).to receive(:setup).with( init_args ).once
-      subject
+  context '.for' do
+    it 'does not initialize the Application instance yet' do
+      expect( Praxis::Application.instance ).to_not receive(:setup)
+      middleware
     end
     it 'returns its class' do
-      expect( subject ).to be( Praxis::MiddlewareApp )
+      expect( middleware ).to be < Praxis::MiddlewareApp 
     end
   end
 
   context 'instantiated' do
+    subject{ instance }
     let(:target_response){ [201,{}] }
     let(:target){ double("target app", call: target_response) }
-    subject(:instance){ Praxis::MiddlewareApp.new(target)}
     it 'saves the target app' do
       expect(subject.target).to be(target)
     end
+    it 'does not initialize the Application instance yet' do
+      expect( Praxis::Application.instance ).to_not receive(:setup)
+      subject
+    end
+    
     context '.call' do
+      let(:the_instance) { double("The instance", setup: nil) }
       let(:env){ {} }
       let(:praxis_response){ [200,{}] }
-      subject(:response){ Praxis::MiddlewareApp.new(target).call(env) }
+      subject(:response){ instance.call(env) }
       before do
         # always invokes the praxis app
-        expect( Praxis::Application.instance ).to receive(:call).with( env ).once.and_return(praxis_response)
+        expect( Praxis::Application ).to receive(:new).once.and_return(the_instance)
+        expect( the_instance ).to receive(:call).with( env ).once.and_return(praxis_response)
+        allow( the_instance ).to receive(:setup).and_return(the_instance)
       end
 
+      it 'does not explicitly call setup in the initialization (the app needs to do it at the right time)' do
+        expect( the_instance ).to_not receive(:setup)
+        subject
+      end
+      
       context 'properly handled (non-404 and 405) responses from praxis' do
         it 'are returned straight through' do
           expect( response ).to be(praxis_response)

data/spec/praxis/request_spec.rb

@@ -12,7 +12,17 @@ describe Praxis::Request do
     env['HTTP_AUTHORIZATION'] = 'Secret'
     env
   end
-
+  let(:application) do
+    app = Praxis::Application.new(skip_registration: true)
+    app.versioning_scheme = [:header, :params]
+    app.handler 'json' , Praxis::Handlers::JSON
+    app.handler 'x-www-form-urlencoded', Praxis::Handlers::WWWForm
+    app.api_definition.info do # applies to all API infos
+      base_path "/api"
+    end
+    app
+  end
+  
   let(:action) { Instances.definition.actions[:show] }
 
   let(:context) do
@@ -24,7 +34,7 @@ describe Praxis::Request do
   end
 
   subject(:request) do
-    request = Praxis::Request.new(env)
+    request = Praxis::Request.new(env, application: application)
     request.action = action
     request
   end
@@ -37,10 +47,10 @@ describe Praxis::Request do
   context 'path versioning' do
     before do
       allow(
-        Praxis::Application.instance
+        application
       ).to receive(:versioning_scheme).and_return(:path)
       allow(
-        Praxis::ApiDefinition.instance.info
+        application.api_definition.info
       ).to receive(:base_path).and_return('/api/v:api_version')
 
     end
@@ -64,7 +74,7 @@ describe Praxis::Request do
     let(:versioning_scheme){ Praxis::Request::VERSION_USING_DEFAULTS }
     before do
       allow(
-        Praxis::Application.instance
+        application
       ).to receive(:versioning_scheme).and_return(versioning_scheme)
     end
 
@@ -84,7 +94,7 @@ describe Praxis::Request do
 
       before do
         allow(
-          Praxis::ApiDefinition.instance.info
+          application.api_definition.info
         ).to receive(:base_path).and_return('/v:api_version')
       end
       it { should eq('5.0') }
@@ -209,7 +219,7 @@ describe Praxis::Request do
       let(:parsed_result){ double("parsed") }
 
       before do
-        Praxis::Application.instance.handler 'xml', Praxis::Handlers::XML
+        application.handler 'xml', Praxis::Handlers::XML
       end
 
       after do

data/spec/praxis/request_stages/validate_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Praxis::RequestStages::Validate do
-  let(:dispatcher) { Praxis::Dispatcher.new }
+  let(:dispatcher) { Praxis::Dispatcher.new(application: APP) }
 
   # Instances controller is defined in the 'app' folder and is already in scope. Using this
   # controller for the specs instead of creating a simple controller.

data/spec/praxis/resource_definition_spec.rb

@@ -101,12 +101,13 @@ describe Praxis::ResourceDefinition do
 
       end
     end
-
-    let(:non_singleton_api) do
-      api_def=Praxis::ApiDefinition.__send__(:new)
-      api_def.instance_eval do |api|
-
-        api.info do
+    let(:praxis_application) do
+      app = Praxis::Application.new(skip_registration: true)
+      app.versioning_scheme = [:header, :params]
+      app.handler 'json' , Praxis::Handlers::JSON
+      app.handler 'x-www-form-urlencoded', Praxis::Handlers::WWWForm
+      app.api_definition.instance_eval do |api_def|
+        api_def.info do
           base_path '/api/:base_param'
           base_params do
             attribute :base_param, String
@@ -116,22 +117,23 @@ describe Praxis::ResourceDefinition do
           end
         end
 
-        api.info '1.0' do
+        api_def.info '1.0' do
           base_params do
             attribute :app_name, String
           end
         end
-        api.info '2.0' do
+        api_def.info '2.0' do
           base_params do
             attribute :v2_param, String
           end
         end
+
       end
-      api_def
+      app
     end
 
     before do
-      allow(Praxis::ApiDefinition).to receive(:instance).and_return(non_singleton_api)
+      allow(Praxis::Application).to receive(:instance).and_return(praxis_application)
     end
 
     it 'are applied to actions' do