praxis 2.0.pre.6 → 2.0.pre.11

data/spec/praxis/response_definition_spec.rb

@@ -443,37 +443,6 @@ describe Praxis::ResponseDefinition do
           end
         end
       end
-
-      describe '#validate_parts!' 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'},**{}) }
-
-          before do
-            response_definition.parts like: :ok, media_type: 'application/special'
-            response.add_part(part)
-          end
-
-          it 'validates each part' do
-            response_definition.parts
-            expect {
-              response_definition.validate_parts!(response)
-            }.to_not raise_error
-          end
-
-          context 'with invalid part' do
-            let(:part) { Praxis::MultipartPart.new('done', {'Status' => 200, "Location" => "somewhere"}) }
-
-            it 'validates' do
-              expect {
-                response_definition.validate_parts!(response)
-              }.to raise_error(Praxis::Exceptions::Validation)
-            end
-
-          end
-        end
-      end
     end
 
   end

data/spec/praxis/response_spec.rb

@@ -29,7 +29,7 @@ describe Praxis::Response do
   let(:action) do
     instance_double(
       Praxis::ActionDefinition,
-      :resource_definition => config_class
+      :endpoint_definition => config_class
     )
   end
 

data/spec/praxis/router_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Praxis::Router do
   describe Praxis::Router::VersionMatcher do
-    let(:resource_definition){ double("resource_definition", version_options: { using: [:header, :params] }) }
-    let(:action){ double("action", resource_definition: resource_definition ) }
+    let(:endpoint_definition){ double("endpoint_definition", version_options: { using: [:header, :params] }) }
+    let(:action){ double("action", endpoint_definition: endpoint_definition ) }
     let(:target){ double("target", action: action ) }
     let(:args){ {version: "1.0"} }
     subject(:matcher){ Praxis::Router::VersionMatcher.new(target,**args) }
@@ -80,8 +80,8 @@ describe Praxis::Router do
     let(:target){ double('target') }
     let(:verb_router){ double('verb_router') }
 
-    let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-    let(:action) { double('action', resource_definition: resource_definition) }
+    let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+    let(:action) { double('action', endpoint_definition: endpoint_definition) }
     let(:target) { double('target', action: action) }
 
 
@@ -111,8 +111,8 @@ describe Praxis::Router do
     let(:post_target_router){ double("POST target", call: router_response_for_post) }
     let(:any_target_router){ double("ANY target", call: router_response_for_wildcard) }
 
-    let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-    let(:action) { double('action', resource_definition: resource_definition) }
+    let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+    let(:action) { double('action', endpoint_definition: endpoint_definition) }
     let(:target) { double('target', action: action) }
 
     before do
@@ -142,8 +142,8 @@ describe Praxis::Router do
     end
 
     context 'for routes with wildcards (a POST and a * route)' do
-      let(:resource_definition) { double('resource_definition', version_options: {using: [:header, :params]} ) }
-      let(:action) { double('action', resource_definition: resource_definition) }
+      let(:endpoint_definition) { double('endpoint_definition', version_options: {using: [:header, :params]} ) }
+      let(:action) { double('action', endpoint_definition: endpoint_definition) }
       let(:target) { double('target', action: action) }
 
       before do

data/spec/praxis/routing_config_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Praxis::RoutingConfig do
 
-  let(:resource_definition) do
+  let(:endpoint_definition) do
     Class.new do
-      include Praxis::ResourceDefinition
+      include Praxis::EndpointDefinition
       def self.name; 'MyResource'; end
     end
   end
 
   let(:routing_block) { Proc.new{} }
   let(:base_path){ '' }
-  let(:default_route_prefix) { "/" + resource_definition.name.split("::").last.underscore }
+  let(:default_route_prefix) { "/" + endpoint_definition.name.split("::").last.underscore }
 
   subject(:routing_config){ Praxis::RoutingConfig.new(base: base_path, &routing_block) }
 

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

@@ -68,7 +68,7 @@ class Instances < BaseClass
 
       part_body = {
         key: instance_id,
-        value: instance.render(view: :create)
+        value: instance.render(fields: {id: true, name: true})
       }
 
       headers = {
@@ -78,7 +78,6 @@ class Instances < BaseClass
       }
 
       part = Praxis::MultipartPart.new(part_body, headers, name: instance_id)
-
       response.body.push(part)
     end
 
@@ -89,13 +88,20 @@ class Instances < BaseClass
   def attach_file(id:, cloud_id:)
     response.headers['Content-Type'] = 'application/json'
 
-    destination_path = request.payload['destination_path']
-    file = request.payload['file']
-
+    destination_path = request.payload.part('destination_path').payload
+    file = request.payload.part('file')
+    file.payload.rewind # Ensure contents is at the beggining.
+    extra_part_names = request.payload.map(&:name) - ['destination_path', 'file']
+    extra_parts = extra_part_names.each_with_object({}) do |pname, hash|
+      hash[pname] = request.payload.part(pname).body
+    end
     result = {
       destination_path: destination_path,
-      file: file.dump,
-      options: request.payload['options'].dump
+      name: file.name,
+      filename: file.filename,
+      type: file.content_type.to_s,
+      contents: file.payload.read,
+      options: extra_parts
     }
 
     response.body = JSON.pretty_generate(result)

data/spec/spec_app/design/media_types/instance.rb

@@ -16,26 +16,8 @@ class Instance < Praxis::MediaType
     
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :root_volume
   end
-
-  view :link do
-    attribute :id
-    attribute :href
-  end
-
-  view :create do
-    attribute :id
-    attribute :name
-  end
-
-  view :extended, include_nil: true do
-    attribute :id
-    attribute :name
-    attribute :root_volume
-  end
-
-
 end

data/spec/spec_app/design/media_types/volume.rb

@@ -11,7 +11,7 @@ class Volume < Praxis::MediaType
     attribute :snapshots_summary, VolumeSnapshot::CollectionSummary
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :name
     attribute :source

data/spec/spec_app/design/media_types/volume_snapshot.rb

@@ -6,16 +6,11 @@ class VolumeSnapshot < Praxis::MediaType
     attribute :name, String, regexp: /snapshot-(\w+)/
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :name
   end
 
-  view :link do
-    attribute :id
-  end
-
-
   class CollectionSummary < Praxis::MediaType
     identifier 'application/json'
 
@@ -25,18 +20,11 @@ class VolumeSnapshot < Praxis::MediaType
       attribute :href, String
     end
 
-    view :default do
-      attribute :name
-      attribute :size
-      attribute :href
-    end
-
-    view :link do
+    default_fieldset do
       attribute :name
       attribute :size
       attribute :href
     end
-
   end
 
 end

data/spec/spec_app/design/resources/instances.rb

@@ -1,6 +1,6 @@
 module ApiResources
   class Instances
-    include Praxis::ResourceDefinition
+    include Praxis::EndpointDefinition
 
     media_type Instance
     version '1.0'
@@ -119,13 +119,10 @@ module ApiResources
         attribute :id
       end
 
-      # TODO: move to something else when Multipart is fully deprecated
-      silence_warnings do
-        payload Praxis::Multipart, allow_extra: true do
-          key 'destination_path', String, required: true
-          key 'file', Attributor::FileUpload, required: false
-          extra 'options'
-        end
+      payload Praxis::Types::MultipartArray do
+        part 'destination_path', String, required: true
+        file 'file', Attributor::Tempfile, required: false
+        part(/.*/, String) # Allows extra parts
       end
 
       response :ok, media_type: 'application/json'

data/spec/spec_app/design/resources/volume_snapshots.rb

@@ -2,7 +2,7 @@ require_relative 'volumes'
 
 module ApiResources
   class VolumeSnapshots
-    include Praxis::ResourceDefinition
+    include Praxis::EndpointDefinition
 
     media_type VolumeSnapshot
 

data/spec/spec_app/design/resources/volumes.rb

@@ -1,6 +1,6 @@
 module ApiResources
   class Volumes
-    include Praxis::ResourceDefinition
+    include Praxis::EndpointDefinition
 
     media_type Volume
     version '1.0'

data/spec/support/spec_authorization_plugin.rb

@@ -68,7 +68,7 @@ module AuthorizationPlugin
     end
   end
 
-  module ResourceDefinition
+  module EndpointDefinition
 
   end
 

data/spec/support/spec_blueprints.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+class PersonBlueprint < Praxis::Blueprint
+  attributes do
+    attribute :name, String, example: /[:first_name:]/
+    attribute :email, String, example: proc { |person| "#{person.name}@example.com" }
+
+    attribute :age, Integer
+
+    attribute :full_name, FullName
+    attribute :aliases, Attributor::Collection.of(FullName)
+
+    attribute :address, AddressBlueprint, example: proc { |person, context| AddressBlueprint.example(context, resident: person) }
+    attribute :work_address, AddressBlueprint
+
+    attribute :prior_addresses, Attributor::Collection.of(AddressBlueprint)
+    attribute :parents do
+      attribute :father, String
+      attribute :mother, String
+    end
+
+    attribute :tags, Attributor::Collection.of(String)
+    attribute :href, String
+    attribute :alive, Attributor::Boolean, default: true
+    attribute :myself, PersonBlueprint
+    attribute :friends, Attributor::Collection.of(PersonBlueprint)
+    attribute :metadata, Attributor::Hash
+  end
+
+  default_fieldset do
+    attribute :name
+    attribute :full_name
+    attribute :address do
+      attribute :name
+      attribute :street
+    end
+    attribute :prior_addresses do
+      attribute :name
+    end
+  end
+end
+
+class AddressBlueprint < Praxis::Blueprint
+  attributes do
+    attribute :id, Integer
+    attribute :name, String
+    attribute :street, String
+    attribute :state, String, values: %w(OR CA)
+
+    attribute :resident, PersonBlueprint, example: proc { |address, context| PersonBlueprint.example(context, address: address) }
+  end
+end
+
+class FullName < Attributor::Model
+  attributes do
+    attribute :first, String, example: /[:first_name:]/
+    attribute :last, String, example: /[:last_name:]/
+  end
+end
+
+class SimpleHash < Attributor::Model
+  attributes do
+    attribute :id, Integer
+    attribute :hash, Hash
+  end
+end
+
+class SimpleHashCollection < Attributor::Model
+  attributes do
+    attribute :id, Integer
+    attribute :hash_collection, Attributor::Collection.of(Hash)
+  end
+end

data/spec/support/{spec_resource_definitions.rb → spec_endpoint_definitions.rb}

@@ -7,7 +7,7 @@ Praxis::ApiDefinition.define do
 end
 
 class PeopleResource
-  include Praxis::ResourceDefinition
+  include Praxis::EndpointDefinition
 
   description 'People resource'
 
@@ -42,7 +42,7 @@ end
 
 
 class AddressResource
-  include Praxis::ResourceDefinition
+  include Praxis::EndpointDefinition
 
   description 'Address resource'
 

data/spec/support/spec_media_types.rb

@@ -8,7 +8,7 @@ class Person < Praxis::MediaType
     attribute :href, String, example: proc { |person| "/people/#{person.id}" }
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :name
   end
@@ -20,7 +20,7 @@ class Person < Praxis::MediaType
       attribute :size, Integer
     end
 
-    view :default do
+    default_fieldset do
       attribute :href
     end
 
@@ -47,7 +47,7 @@ class Address < Praxis::MediaType
     attribute :fields, Praxis::Types::FieldSelector.for(Person)
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :name
     attribute :owner
@@ -95,7 +95,7 @@ class Blog < Praxis::MediaType
 
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :href
     attribute :name
@@ -105,12 +105,6 @@ class Blog < Praxis::MediaType
 
     attribute :owner
   end
-
-  view :overview do
-    attribute :id
-    attribute :name
-    attribute :description
-  end
 end
 
 
@@ -147,7 +141,7 @@ class Post < Praxis::MediaType
     end
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :href
 
@@ -198,25 +192,11 @@ class User < Praxis::MediaType
       example: proc { |user,ctx| Post::CollectionSummary.example(ctx, href: "#{user.href}/posts") }
   end
 
-  view :default do
+  default_fieldset do
     attribute :id
     attribute :href
 
     attribute :first
     attribute :last
   end
-
-  view :extended do
-    attribute :id
-    attribute :href
-
-    attribute :first
-    attribute :last
-    attribute :primary_blog, view: :overview
-  end
-
-  view :with_post_links do
-    attribute :id
-    attribute :posts, view: :link
-  end
 end