praxis 2.0.pre.1 → 2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66fe6c957729cb25f0696e23a380423d00ff30e51a838df8e575496db0894e5f
-  data.tar.gz: ca436e9dff7c965063d6787e6bbbd4f5178ba08b98124f98881f35ce5c5d5f22
+  metadata.gz: f23deb4aca50709972c23925ed41fde1fe98baaf7e865513b7f047611bd3af3d
+  data.tar.gz: 512839b90d37a8ac2cb67a7a14f32a8353160d15ef43d0066c860ec95da3002e
 SHA512:
-  metadata.gz: cfc68735d454382c9adc26c880bf0f4a3fda03df4de7b24e439071b576b97bf8a6fa0006e5c48c78ad82034c4c11461a1848caea535bd36457b4517cec17c536
-  data.tar.gz: 0b3f4143a20db3a80ceea7666f5b24af63d907fcdd9aecd1b7d3ca78b4b500756999d98b7bc5e85372be14bf7a5c16d65da0268e7c5565b24b4e35956fd21bf3
+  metadata.gz: 19ff50cbc1d7c9b003725f96122cfab8c8c221f54d8df5a142299ad260dcb2f9597d504e6761c18badee02a768d18dab81dc76425abda01704a9e61f0aae3769
+  data.tar.gz: 3b2885d5e46d68848541dfed03dabe8cc1df71a430d1fdd42fc330035f544fee5b05291cf8087c00a51c987c2087e4f6e2a502522566e61a88f50e0adee4a71f

data/.travis.yml

@@ -1,28 +1,13 @@
-language: ruby
-cache: bundler
 sudo: false
+language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
+script:
+  - bundle exec rspec spec
 branches:
   only:
     - master
-before_install:
-  - gem update --system # Due to: https://github.com/travis-ci/travis-ci/issues/8978
-# Leaving all API browser testing commented out as there are some very node dependencies that
-# need to be worked out and updated
-# node_js:
-#   - "0.10"
-# before_install:
-#   - nvm install 0.10
-#   - node --version
-#   - cd lib/api_browser
-#   - npm install
-#   - cd ../..
-# script:
-#   - bundle exec rspec spec
-#   - cd lib/api_browser
-#   - npm test
-#   - cd ../..
+    - /.*/

data/lib/praxis/action_definition/headers_dsl_compiler.rb

@@ -25,7 +25,7 @@ module Praxis
           # Defining the existence without any other options can only mean that it is required (otherwise it is a useless definition)
           options[:required] = true if options.empty?
         end
-        key name , String, options
+        key name , String, **options
       end
 
       # Override the attribute to really call "key" in the hash (for temporary backwards compat)      

data/lib/praxis/action_definition.rb

@@ -76,7 +76,7 @@ module Praxis
 
     def update_attribute(attribute, options, block)
       attribute.options.merge!(options)
-      attribute.type.attributes(options, &block)
+      attribute.type.attributes(**options, &block)
     end
 
     def response(name, type=nil, **args, &block)

data/lib/praxis/application.rb

@@ -114,7 +114,7 @@ module Praxis
 
     def config(key=nil, type=Attributor::Struct, **opts, &block)
       if block_given? || (type==Attributor::Struct && !opts.empty? )
-        @config.define(key, type, opts, &block)
+        @config.define(key, type, **opts, &block)
       else
         @config.get
       end

data/lib/praxis/config.rb

@@ -54,7 +54,7 @@ module Praxis
             )
           end
           top.options.merge!(opts)
-          top.type.attributes(opts, &block)
+          top.type.attributes(**opts, &block)
         else
           @attribute.attributes[key] = Attributor::Attribute.new(type, opts, &block)
         end

data/lib/praxis/media_type_identifier.rb

@@ -146,7 +146,8 @@ module Praxis
       if self.parameters.empty?
         self
       else
-        MediaTypeIdentifier.load(type: self.type, subtype: self.subtype, suffix: self.suffix)
+        val = {type: self.type, subtype: self.subtype, suffix: self.suffix}
+        MediaTypeIdentifier.load(val)
       end
     end
 

data/lib/praxis/notifications.rb

@@ -21,7 +21,7 @@ module Praxis
     end
 
     def self.instrument(name, payload = {}, &block)
-      ActiveSupport::Notifications.instrument(name, payload, &block)
+      ActiveSupport::Notifications.instrument(name, **payload, &block)
     end
 
     def self.subscribe(*args, &block)

data/lib/praxis/resource_definition.rb

@@ -49,7 +49,7 @@ module Praxis
         unless base_attributes.empty?
           params do
             base_attributes.each do |base_name, base_attribute|
-              attribute base_name, base_attribute.type, base_attribute.options
+              attribute base_name, base_attribute.type, **base_attribute.options
             end
           end
         end
@@ -87,9 +87,9 @@ module Praxis
         @display_name = string
       end
 
-      def on_finalize
+      def on_finalize(&block)
         if block_given?
-          @on_finalize << Proc.new
+          @on_finalize << proc(&block)
         end
 
         @on_finalize
@@ -168,7 +168,7 @@ module Praxis
 
               parent_attribute = parent_action.params.attributes[parent_name]
 
-              attribute name, parent_attribute.type, parent_attribute.options
+              attribute name, parent_attribute.type, **parent_attribute.options
             end
           end
         end
@@ -221,7 +221,7 @@ module Praxis
       end
 
       def to_href( params )
-        canonical_path.primary_route.path.expand(params)
+        canonical_path.primary_route.path.expand(params.transform_values(&:to_s))
       end
 
       def parse_href(path)

data/lib/praxis/route.rb

@@ -24,7 +24,7 @@ module Praxis
       path_params = example_hash.select{|k,v| path_param_keys.include? k }
       # Let's generate the example only using required params, to avoid mixing incompatible parameters
       query_params = example_hash.select{|k,v| required_query_param_keys.include? k }
-      example = { verb: self.verb, url: self.path.expand(path_params), query_params: query_params }
+      example = { verb: self.verb, url: self.path.expand(path_params.transform_values(&:to_s)), query_params: query_params }
 
     end
 

data/lib/praxis/routing_config.rb

@@ -55,7 +55,7 @@ module Praxis
       path = (base + path).gsub('//','/')
       # Reject our own options
       route_name = options.delete(:name);
-      pattern = Mustermann.new(path, {ignore_unknown_options: true}.merge( options ))
+      pattern = Mustermann.new(path, **{ignore_unknown_options: true}.merge( options ))
       route = Route.new(verb, pattern, version, name: route_name, prefixed_path: prefixed_path, **options)
       @routes << route
       route

data/lib/praxis/trait.rb

@@ -76,7 +76,7 @@ module Praxis
             dsl_compiler: ActionDefinition::HeadersDSLCompiler,
             case_insensitive_load: true
           }
-          Attributor::Hash.of(key: String).construct(Proc.new {}, hash_opts)
+          Attributor::Hash.of(key: String).construct(Proc.new {}, **hash_opts)
         else
           Attributor::Hash.construct(Proc.new {})
         end

data/lib/praxis/types/media_type_common.rb

@@ -32,8 +32,8 @@ module Praxis
         #
         # @return [String] the string-representation of this type's identifier
         def identifier(identifier=nil)
-          return @identifier.to_s unless identifier
-          (@identifier = MediaTypeIdentifier.load(identifier)).to_s
+          return @identifier unless identifier
+          @identifier = MediaTypeIdentifier.load(identifier)
         end
       end
 

data/lib/praxis/types/multipart.rb

@@ -12,7 +12,7 @@ module Praxis
       return value if value.kind_of?(self) || value.nil?
 
       unless (value.kind_of?(::String) && ! content_type.nil?)
-        raise Attributor::CoercionError, context: context, from: value.class, to: self.name, value: value
+        raise Attributor::CoercionError.new(context: context, from: value.class, to: self.name, value: value)
       end
 
       headers = {'Content-Type' => content_type}

data/lib/praxis/types/multipart_array/part_definition.rb

@@ -14,7 +14,7 @@ module Praxis
 
         def update_attribute(attribute, options, block)
           attribute.options.merge!(options)
-          attribute.type.attributes(options, &block)
+          attribute.type.attributes(**options, &block)
         end
 
         def create_attribute(type=Attributor::Struct, **opts, &block)

data/lib/praxis/types/multipart_array.rb

@@ -83,7 +83,7 @@ module Praxis
 
         self.multiple << name if multiple
 
-        compiler = Attributor::DSLCompiler.new(self, opts)
+        compiler = Attributor::DSLCompiler.new(self, **opts)
 
         if filename
           filename_attribute = compiler.define('filename', String, required: true)
@@ -218,7 +218,7 @@ module Praxis
       attr_accessor :preamble
       attr_reader :content_type
 
-      def initialize(content_type: self.class.identifier)
+      def initialize(content_type: self.class.identifier.to_s)
         self.content_type = content_type
       end
 

data/lib/praxis/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  VERSION = '2.0.pre.1'
+  VERSION = '2.0.pre.2'
 end

data/praxis.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables << 'praxis'
 
   spec.add_dependency 'rack', '>= 1'
-  spec.add_dependency 'mustermann', '>=0', '<=1'
+  spec.add_dependency 'mustermann', '>=1.1', '<=2'
   spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'mime', '~> 0'
-  spec.add_dependency 'praxis-blueprints', '~> 3.3'
-  spec.add_dependency 'attributor', '~> 5.1'
+  spec.add_dependency 'praxis-blueprints', '>= 3.4'
+  spec.add_dependency 'attributor', '>= 5.4'
   spec.add_dependency 'thor'
   spec.add_dependency 'terminal-table', '~> 1.4'
 
@@ -33,9 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 0.9'
   spec.add_development_dependency 'rake-notes', '~> 0'
   if RUBY_PLATFORM !~ /java/
-    spec.add_development_dependency 'pry', '~> 0'
-    spec.add_development_dependency 'pry-byebug', '~> 1'
-    spec.add_development_dependency 'pry-stack_explorer', '~> 0'
+    spec.add_development_dependency 'pry'
+    spec.add_development_dependency 'pry-byebug'
+    spec.add_development_dependency 'pry-stack_explorer'
     spec.add_development_dependency 'sqlite3', '~> 1'
   else
     spec.add_development_dependency 'jdbc-sqlite3'

data/spec/praxis/action_definition_spec.rb

@@ -281,7 +281,7 @@ describe Praxis::ActionDefinition do
     subject(:action) { resource_definition.actions[:show] }
 
     it 'works' do
-      expansion = action.primary_route.path.expand(cloud_id:232, id: 2)
+      expansion = action.primary_route.path.expand(cloud_id:'232', id: '2')
       expect(expansion).to eq "/api/clouds/232/instances/2"
     end
 

data/spec/praxis/application_spec.rb

@@ -27,7 +27,7 @@ describe Praxis::Application do
       end
 
       it 'passes the params and block to config' do
-        ret = app.config(:key, Attributor::Hash, {option: :one}, &myblock)
+        ret = app.config(:key, Attributor::Hash, **{option: :one}, &myblock)
         expect(ret).to eq([:key, Attributor::Hash, {option: :one}, myblock])
       end
 

data/spec/praxis/collection_spec.rb

@@ -8,6 +8,7 @@ describe Praxis::Collection do
   subject!(:collection) do
     Praxis::Collection.of(member_type)
   end
+  let(:identifier_string) { subject.identifier.to_s }
 
   context '.of' do
     let(:member_type) do
@@ -16,7 +17,7 @@ describe Praxis::Collection do
       end
     end
 
-    its(:identifier) { should eq 'application/an-awesome-type; type=collection' }
+    it { expect(identifier_string).to eq('application/an-awesome-type; type=collection') }
 
     it 'sets the collection on the media type' do
       expect(member_type::Collection).to be(collection)
@@ -34,7 +35,7 @@ describe Praxis::Collection do
   context 'defined explicitly' do
     subject(:type) { Volume::Collection }
     its(:member_type) { should be Volume }
-    its(:identifier) { should eq 'application/vnd.acme.volumes' }
+    it { expect(identifier_string).to eq('application/vnd.acme.volumes') }
   end
 
   context '.member_type' do

data/spec/praxis/config_spec.rb

@@ -72,12 +72,12 @@ describe Praxis::Config do
       
       it 'it is not allowed if its for the top key' do
         expect{
-          config.define nil, config_type, config_opts
+          config.define nil, config_type, **config_opts
         }.to raise_error(/You cannot define the top level configuration with a non-Struct type/)
       end
       
       before do
-        config.define config_key, config_type, config_opts
+        config.define config_key, config_type, **config_opts
       end
 
       it 'sets the attribute to the defined type' do

data/spec/praxis/media_type_spec.rb

@@ -52,16 +52,6 @@ describe Praxis::MediaType do
     subject(:address_klass) { address.class }
 
     context '#identifier' do
-      context 'in praxis v0' do
-        it 'should be a kind of String' do
-          if Praxis::VERSION =~ /^0/
-            expect(subject.identifier).to be_kind_of(String)
-          else
-            raise 'Please remove this spec which is no longer pertinent'
-          end
-        end
-      end
-
       context 'in praxis v1.0 and beyond' do
         it 'should be a kind of Praxis::MediaTypeIdentifier' do
           pending('interface-breaking change') if Praxis::VERSION =~ /^0/

data/spec/praxis/middleware_app_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Praxis::MiddlewareApp do
 
   let(:init_args){ { root: 'here'} }
-  let(:middleware) { Praxis::MiddlewareApp.for( init_args ) }
+  let(:middleware) { Praxis::MiddlewareApp.for( **init_args ) }
   let(:instance){ middleware.new(target)}
 
   context '.for' do

data/spec/praxis/request_stages/action_spec.rb

@@ -26,7 +26,14 @@ describe Praxis::RequestStages::Action do
 
   context '.execute' do
     before do
-      expect(controller).to receive(action_stage.name).with(request.params_hash).and_return(controller_response)
+      expect(controller).to receive(action_stage.name) do |args|
+        if args
+          expect(args).to eq({})
+        else
+           expect(args).to eq(nil)
+        end
+      end.and_return(controller_response)
+        
     end
     let(:controller_response){ controller.response }
 

data/spec/praxis/response_definition_spec.rb

@@ -448,7 +448,7 @@ describe Praxis::ResponseDefinition do
         context 'with legacy multipart response' do
           subject(:response) { Praxis::Responses::Ok.new(status: response_status, headers: response_headers) }
 
-          let(:part) { Praxis::MultipartPart.new('done', {'Status' => 200, 'Content-Type' => 'application/special'},{}) }
+          let(:part) { Praxis::MultipartPart.new('done', {'Status' => 200, 'Content-Type' => 'application/special'},**{}) }
 
           before do
             response_definition.parts like: :ok, media_type: 'application/special'
@@ -463,7 +463,7 @@ describe Praxis::ResponseDefinition do
           end
 
           context 'with invalid part' do
-            let(:part) { Praxis::MultipartPart.new('done', {'Status' => 200, "Location" => "somewhere"},{}) }
+            let(:part) { Praxis::MultipartPart.new('done', {'Status' => 200, "Location" => "somewhere"}) }
 
             it 'validates' do
               expect {
@@ -494,6 +494,7 @@ describe Praxis::ResponseDefinition do
     let(:location) { %r{/my/url/} }
     let(:headers) { {'Header1' => 'Value1'} }
     let(:parts) { nil }
+    let(:parts_block) { nil }
 
     let(:response) do
       Praxis::ResponseDefinition.new(:custom) do
@@ -505,7 +506,9 @@ describe Praxis::ResponseDefinition do
     before do
       response.description(description) if description
       response.location(location) if location
-      response.parts(parts) if parts
+      if parts || parts_block
+        parts ? response.parts(nil, **parts, &parts_block) : response.parts(nil, &parts_block) 
+      end
       response.headers(headers) if headers
     end
 
@@ -572,7 +575,7 @@ describe Praxis::ResponseDefinition do
         its([:status]){ should == 200 }
       end
       context 'using a full response definition block' do
-        let(:parts) do
+        let(:parts_block) do
           Proc.new do
             status 234
             media_type 'custom_media'

data/spec/praxis/response_spec.rb

@@ -117,7 +117,7 @@ describe Praxis::Response do
   end
 
   context 'multipart responses' do
-    let(:part) { Praxis::MultipartPart.new('not so ok', {'Status' => 400, "Location" => "somewhere"}, {}) }
+    let(:part) { Praxis::MultipartPart.new('not so ok', {'Status' => 400, "Location" => "somewhere"}) }
 
     context '#add_part' do
 

data/spec/praxis/router_spec.rb

@@ -6,7 +6,7 @@ describe Praxis::Router do
     let(:action){ double("action", resource_definition: resource_definition ) }
     let(:target){ double("target", action: action ) }
     let(:args){ {version: "1.0"} }
-    subject(:matcher){ Praxis::Router::VersionMatcher.new(target,args) }
+    subject(:matcher){ Praxis::Router::VersionMatcher.new(target,**args) }
 
     context '.initialize' do
       let(:args){ {} }

data/spec/spec_app/app/controllers/instances.rb

@@ -73,7 +73,7 @@ class Instances < BaseClass
 
       headers = {
         'Status' => '201',
-        'Content-Type' => Instance.identifier + '+json',
+        'Content-Type' => (Instance.identifier + '+json').to_s,
         'Location' => definition.to_href(cloud_id: cloud_id, id: instance.id)
       }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.1
+  version: 2.0.pre.2
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,20 +31,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -77,30 +77,30 @@ dependencies:
   name: praxis-blueprints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: attributor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -175,42 +175,42 @@ dependencies:
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   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'
 - !ruby/object:Gem::Dependency