praxis 0.21 → 0.22.pre.1

data/spec/praxis/response_definition_spec.rb

@@ -1,7 +1,24 @@
 require "spec_helper"
 
 describe Praxis::ResponseDefinition do
-  subject(:response_definition) { Praxis::ResponseDefinition.new(name, &block) }
+  let(:praxis_app) 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.handler 'xml', Praxis::Handlers::XML
+    app.api_definition.instance_eval do |api_def|
+      api_def.info do
+        base_path "/api"
+        produces 'json','xml'
+      end
+    end
+    app
+  end
+  
+  
+  
+  subject(:response_definition) { Praxis::ResponseDefinition.new(name, praxis_app, &block) }
   let(:name) { 'response_name' }
 
   let(:block) do
@@ -482,7 +499,7 @@ describe Praxis::ResponseDefinition do
   context 'with invalid definitions' do
     it 'raises an error if status code is not part of the definition' do
       expect do
-        Praxis::ResponseDefinition.new('response name') do
+        Praxis::ResponseDefinition.new('response name',praxis_app) do
           description "testing"
         end
       end.to raise_error(Praxis::Exceptions::InvalidConfiguration)
@@ -496,7 +513,7 @@ describe Praxis::ResponseDefinition do
     let(:parts) { nil }
 
     let(:response) do
-      Praxis::ResponseDefinition.new(:custom) do
+      Praxis::ResponseDefinition.new(:custom, praxis_app) do
         status 300
       end
     end
@@ -524,8 +541,8 @@ describe Praxis::ResponseDefinition do
         its(['xml', :content_type]) { should eq('application/vnd.acme.instance+xml') }
 
         it 'properly encodes the example bodies' do
-          json = Praxis::Application.instance.handlers['json'].parse(examples['json'][:body])
-          xml = Praxis::Application.instance.handlers['xml'].parse(examples['xml'][:body])
+          json = praxis_app.handlers['json'].parse(examples['json'][:body])
+          xml = praxis_app.handlers['xml'].parse(examples['xml'][:body])
           expect(json).to eq xml
         end
 

data/spec/praxis/response_spec.rb

@@ -49,7 +49,14 @@ describe Praxis::Response do
   end
 
   subject(:response) { Praxis::Responses::Ok.new(status: response_status, headers: response_headers) }
-
+  let(:application) do
+    double("PraxisApp", handlers: handlers, config: praxis_config)
+  end
+  let(:handlers) do
+    {'json' => Praxis::Handlers::JSON.new }
+  end
+  let(:praxis_config){ double(praxis: double("...") )  }
+  
   describe '#validate' do
     before do
       allow(action).to receive(:responses).and_return({response_spec.name => response_spec })
@@ -86,7 +93,7 @@ describe Praxis::Response do
       before { response.body = response_body_entity }
 
       it 'leaves well enough alone' do
-        response.encode!
+        response.encode!(handlers: handlers)
         expect(response.body).to eq(response_body_entity)
       end
     end
@@ -95,7 +102,7 @@ describe Praxis::Response do
       before { response.body = response_body_structured_data }
 
       it 'encodes using a suitable handler' do
-        response.encode!
+        response.encode!(handlers: handlers)
         expect(JSON.load(response.body)).to eq(response_body_structured_data)
       end
     end
@@ -108,7 +115,7 @@ describe Praxis::Response do
           'Location'     => '/api/resources/123' }
       }
       it 'still defaults to the default handler' do
-        response.encode!
+        response.encode!(handlers: handlers)
         expect(JSON.load(response.body)).to eq(response_body_structured_data)
       end
     end
@@ -158,7 +165,7 @@ describe Praxis::Response do
         response.status = 500
       end
 
-      let!(:finished_response) { response.finish }
+      let!(:finished_response) { response.finish(application: application) }
 
       it 'returns status, headers, body' do
         expect(finished_response).to eq([response.status, response.headers, response.body])

data/spec/praxis/responses/internal_server_error_spec.rb

@@ -8,7 +8,7 @@ describe Praxis::Responses::InternalServerError do
     it 'always sets the json content type' do
       expect(response.name).to be(:internal_server_error)
       expect(response.status).to be(500)
-      expect(response.body).to be_empty
+      expect(response.body).to be_nil
       expect(response.headers).to have_key('Content-Type')
       expect(response.headers['Content-Type']).to eq('application/json')
       expect(response.instance_variable_get(:@error)).to be(nil)
@@ -17,15 +17,12 @@ describe Praxis::Responses::InternalServerError do
 
 
   context '.format!' do
+    let(:app){ double("PraxisApp", config: double(praxis: config)) }
     let(:error) { double('error', message: 'error message', backtrace: [1, 2], cause: cause) }
 
     let(:show_exceptions) { true }
     let(:config) { double("config", show_exceptions: show_exceptions) }
 
-    before do
-      allow(Praxis::Application.instance.config).to receive(:praxis).and_return(config)
-    end
-
     context 'with show_exceptions false' do
     end
 
@@ -52,8 +49,8 @@ describe Praxis::Responses::InternalServerError do
 
     subject(:response) { Praxis::Responses::InternalServerError.new(error: error) }
     before do
-      expect(response.body).to be_empty
-      response.format!
+      expect(response.body).to be_nil
+      response.format!(config: app.config)
     end
 
   end

data/spec/praxis/responses/validation_error_spec.rb

@@ -9,7 +9,7 @@ describe Praxis::Responses::ValidationError do
     it 'always sets the json content type' do
       expect(response.name).to be(:validation_error)
       expect(response.status).to be(400)
-      expect(response.body).to be_empty
+      expect(response.body).to be_nil
       expect(response.headers).to have_key('Content-Type')
       expect(response.headers['Content-Type']).to eq('application/json')
       expect(response.instance_variable_get(:@errors)).to be(nil)
@@ -24,7 +24,7 @@ describe Praxis::Responses::ValidationError do
     let(:exception){ nil }
     subject(:response) { Praxis::Responses::ValidationError.new(summary: summary, errors: errors, exception: exception) }
     before do
-      expect(response.body).to be_empty
+      expect(response.body).to be_nil
     end
     context 'when errors' do
       it 'it fills the errors key' do

data/spec/praxis/router_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Praxis::Router do
+  let(:application) do
+    app = Praxis::Application.new(skip_registration: true)
+    app.versioning_scheme = [:header, :params]
+    app
+  end
   describe Praxis::Router::VersionMatcher do
     let(:resource_definition){ double("resource_definition", version_options: { using: [:header, :params] }) }
     let(:action){ double("action", resource_definition: resource_definition ) }
@@ -17,7 +22,7 @@ describe Praxis::Router do
 
     context '.call' do
       let(:env){ {"HTTP_X_API_VERSION" => request_version } }
-      let(:request) {Praxis::Request.new(env)}
+      let(:request) {Praxis::Request.new(env,application: application)}
 
       context 'with matching versions' do
         let(:request_version) { "1.0" }
@@ -67,7 +72,6 @@ describe Praxis::Router do
     end
   end
 
-  let(:application) { instance_double('Praxis::Application')}
   subject(:router) {Praxis::Router.new(application)}
 
   context "attributes" do
@@ -104,7 +108,7 @@ describe Praxis::Router do
     let(:request_verb) { 'POST' }
     let(:request_path_info) { '/' }
     let(:request_version){ nil }
-    let(:request) {Praxis::Request.new(env)}
+    let(:request) {Praxis::Request.new(env, application: application)}
     let(:router_response){ 1 }
     let(:router_response_for_post){ "POST result" }
     let(:router_response_for_wildcard){ "* result" }
@@ -185,7 +189,7 @@ describe Praxis::Router do
       end
 
       context 'with X-Cascade disabled' do
-        let(:config) { Praxis::Application.instance.config.praxis }
+        let(:config) { application.config.praxis }
         before do
           expect(config).to receive(:x_cascade).and_return(false)
         end

data/spec/spec_app/config.ru

@@ -9,9 +9,4 @@ $:.unshift File.expand_path('lib', __dir__)
 
 require 'praxis'
 
-
-application = Praxis::Application.instance
-
-application.setup
-
-run application
+run Praxis::Application.new.setup

data/spec/spec_helper.rb

@@ -20,22 +20,21 @@ require 'rspec/its'
 require 'rspec/collection_matchers'
 
 
-
 Dir["#{File.dirname(__FILE__)}/../lib/praxis/plugins/*.rb"].each do |file|
   require file
 end
 
+APP = Praxis::Application.instance
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file
 end
 
-
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 
   config.before(:suite) do
     Praxis::Blueprint.caching_enabled = true
-    Praxis::Application.instance.setup(root:'spec/spec_app')
+    APP.setup(root:'spec/spec_app')
 
     # create the table
     setup_database!
@@ -50,6 +49,7 @@ RSpec.configure do |config|
   config.before(:all) do
     # disable logging below warn level
     Praxis::Application.instance.logger.level = 2 # warn
+    Thread.current[:praxis_instance] = APP
   end
 end
 

data/tasks/thor/templates/generator/empty_app/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem 'praxis', github: 'rightscale/praxis'
-gem 'attributor', github: 'rightscale/attributor'
-gem 'praxis-blueprints', github: 'rightscale/praxis-blueprints'
+gem 'praxis', github: 'praxis/praxis'
+gem 'attributor', github: 'praxis/attributor'
+gem 'praxis-blueprints', github: 'praxis/praxis-blueprints'
 
 gem 'rainbows', require: false
 gem 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: 0.22.pre.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -137,34 +143,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: harness
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -414,7 +406,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
@@ -439,6 +430,7 @@ files:
 - lib/api_browser/app/js/controllers/type.js
 - lib/api_browser/app/js/directives/attribute_description.js
 - lib/api_browser/app/js/directives/attribute_table.js
+- lib/api_browser/app/js/directives/conditional_requirements.js
 - lib/api_browser/app/js/directives/fixed_if_fits.js
 - lib/api_browser/app/js/directives/highlight.js
 - lib/api_browser/app/js/directives/menu_item.js
@@ -456,10 +448,12 @@ files:
 - lib/api_browser/app/js/factories/template_for.js
 - lib/api_browser/app/js/filters/attribute_name.js
 - lib/api_browser/app/js/filters/friendly_json.js
+- lib/api_browser/app/js/filters/has_requirement.js
 - lib/api_browser/app/js/filters/header_info.js
 - lib/api_browser/app/js/filters/is_empty.js
 - lib/api_browser/app/js/filters/markdown.js
 - lib/api_browser/app/js/filters/resource_name.js
+- lib/api_browser/app/js/filters/tag_requirement.js
 - lib/api_browser/app/sass/modules/_body.scss
 - lib/api_browser/app/sass/modules/_cloke.scss
 - lib/api_browser/app/sass/modules/_header.scss
@@ -489,9 +483,12 @@ files:
 - lib/api_browser/app/views/trait.html
 - lib/api_browser/app/views/type.html
 - lib/api_browser/app/views/type/details.html
+- lib/api_browser/app/views/types/embedded/array.html
 - lib/api_browser/app/views/types/embedded/default.html
 - lib/api_browser/app/views/types/embedded/field-selector.html
 - lib/api_browser/app/views/types/embedded/links.html
+- lib/api_browser/app/views/types/embedded/requirements.html
+- lib/api_browser/app/views/types/embedded/single_req.html
 - lib/api_browser/app/views/types/embedded/struct.html
 - lib/api_browser/app/views/types/label/link.html
 - lib/api_browser/app/views/types/label/primitive.html
@@ -539,10 +536,18 @@ files:
 - lib/praxis/exceptions/invalid_trait.rb
 - lib/praxis/exceptions/stage_not_found.rb
 - lib/praxis/exceptions/validation.rb
+- lib/praxis/extensions/attribute_filtering.rb
+- lib/praxis/extensions/attribute_filtering/active_record_filter_query_builder.rb
+- lib/praxis/extensions/attribute_filtering/filtering_params.rb
+- lib/praxis/extensions/attribute_filtering/query_builder.rb
 - lib/praxis/extensions/field_expansion.rb
 - lib/praxis/extensions/field_selection.rb
+- lib/praxis/extensions/field_selection/active_record_query_selector.rb
 - lib/praxis/extensions/field_selection/field_selector.rb
+- lib/praxis/extensions/field_selection/sequel_query_selector.rb
 - lib/praxis/extensions/mapper_selectors.rb
+- lib/praxis/extensions/rails_compat.rb
+- lib/praxis/extensions/rails_compat/request_methods.rb
 - lib/praxis/extensions/rendering.rb
 - lib/praxis/file_group.rb
 - lib/praxis/handlers/json.rb
@@ -560,6 +565,7 @@ files:
 - lib/praxis/plugin.rb
 - lib/praxis/plugin_concern.rb
 - lib/praxis/plugins/praxis_mapper_plugin.rb
+- lib/praxis/plugins/rails_plugin.rb
 - lib/praxis/request.rb
 - lib/praxis/request_stages/action.rb
 - lib/praxis/request_stages/load_request.rb
@@ -568,6 +574,7 @@ files:
 - lib/praxis/request_stages/validate.rb
 - lib/praxis/request_stages/validate_params_and_headers.rb
 - lib/praxis/request_stages/validate_payload.rb
+- lib/praxis/request_superclassing.rb
 - lib/praxis/resource_definition.rb
 - lib/praxis/response.rb
 - lib/praxis/response_definition.rb
@@ -583,7 +590,6 @@ files:
 - lib/praxis/routing_config.rb
 - lib/praxis/simple_media_type.rb
 - lib/praxis/stage.rb
-- lib/praxis/stats.rb
 - lib/praxis/tasks.rb
 - lib/praxis/tasks/api_docs.rb
 - lib/praxis/tasks/console.rb
@@ -644,7 +650,6 @@ files:
 - spec/praxis/router_spec.rb
 - spec/praxis/routing_config_spec.rb
 - spec/praxis/stage_spec.rb
-- spec/praxis/stats_spec.rb
 - spec/praxis/trait_spec.rb
 - spec/praxis/types/fuzzy_hash_spec.rb
 - spec/praxis/types/multipart_array/part_definition_spec.rb
@@ -711,7 +716,7 @@ files:
 - tasks/thor/templates/generator/empty_app/docs/app.js
 - tasks/thor/templates/generator/empty_app/docs/styles.scss
 - tasks/thor/templates/generator/empty_app/spec/spec_helper.rb
-homepage: https://github.com/rightscale/praxis
+homepage: https://github.com/praxis/praxis
 licenses:
 - MIT
 metadata: {}
@@ -726,12 +731,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Building APIs the way you want it.