praxis 0.9 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea496999177f99af52478aa098d74e4eb07756bf
-  data.tar.gz: acbe97318d3f8951ea9e340ef7fe6b243162450a
+  metadata.gz: 8ef88025b412d1a511b45aaeebc4da3dc77e26ba
+  data.tar.gz: 12055f1821e6dbb2bf2db0db9243cc41c49ca8ab
 SHA512:
-  metadata.gz: a2a86df947317e255b79e44867424a18466031aef0978a457acc21292c2f7d33360dee2812b982467a3a964ad7e5de64e005f5cf501f8df8faa17bf1aae95893
-  data.tar.gz: 866fc777e303b9aef3b1cafa85b791ef1612daf7b345296fe8296735f135ed7529fc6542104fefdd3318f06bc9805c0079c14ab9911a3aefbdbd7b96a12ee48f
+  metadata.gz: 3976e3f0b241efbad32a3b1b1ff65b0aaad3c9b6e6c7d38e00f611441f2f9c4ee2a75ea4c389cbe7a055795a6e8da0713d191f1d142310beaf7c4ca9a88265d5
+  data.tar.gz: 8f609d4f6704949f59f6ab8fc35a9319909cec4ed90275abf03f2103fa1ddd11fb851a21a01fbf98ee00a4c6ad30b1d52542e33804ff94cb6957a532327b4468

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
   - "2.1.2"
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -0,0 +1,51 @@
+# praxis changelog
+
+## next
+
+* next thing here
+
+## 0.10.0
+
+* Avoid loading responses (and templates) lazily as they need to be registered in time
+* Fix: app generator's handling of 404. [@magneland](https://github.com/magneland) [Issue #10](https://github.com/rightscale/praxis/issues/10)
+* Fix: Getting started doc. [@WilliamSnyders](https://github.com/WilliamSnyders) [Issue #19](https://github.com/rightscale/praxis/issues/19)
+* Controller filters can now shortcut the request lifecycle flow by returning a `Response`:
+  * If a before filter returns it, both the action and the after filters will be skipped (as well as any remaining filters in the before list)
+  * If an after filter returns it, any remaining after filters in the block will be skipped.
+  * There is no way for the action result to skip the :after filters.
+* Refactored Controller module to properly used ActiveSupprt concerns. [@jasonayre](https://github.com/jasonayre) [Issue #26](https://github.com/rightscale/praxis/issues/26)
+* Separated the controller module into a Controller concern and a separable Callbacks concern
+* Controller filters (i.e. callbacks) can shortcut request lifecycle by returning a Response object:
+  * If a before filter returns it, both the action and the after filters will be skipped (as well as any remaining before filters)
+  * If an after filter returns it, any remaining after filters in the block will be skipped.
+  * There is no way for the action result to skip the :after filters.
+  * Fixes [Issue #21](https://github.com/rightscale/praxis/issues/21)
+* Introduced `around` filters using blocks:
+	* Around filters can be set wrapping any of the request stages (load, validate, action...) and might apply to only certain actions (i.e. exactly the same as the before/after filters)
+  * Therefore they supports the same attributes as `before` and `after` filters. The only difference is that an around filter block will get an extra parameter with the block to call to continue the chain.	
+	* See the [Instances](https://github.com/rightscale/praxis/blob/master/spec/spec_app/app/controllers/instances.rb) controller for examples.
+* Fix: Change :created response template to take an optiona ‘location’ parameter (instead of a media_type one, since it doesn’t make sense for a 201 type response) [Issue #26](https://github.com/rightscale/praxis/issues/23)
+* Make the system be more robust in error reporting when controllers do not return a String or a Response
+* Fix: ValidationError not setting a Content-Type header. [Issue #39](https://github.com/rightscale/praxis/issues/19)
+* Relaxed ActiveSupport version dependency (from 4 to >=3 )
+* Fix: InternalServerError not setting a Content-Type header. [Issue #42](https://github.com/rightscale/praxis/issues/42)
+* A few document browser improvements:
+	* Avoid showing certain internal type options (i.e. reference).
+	* Fixed type label cide to detect collections better, and differentiate between Attributor ones and MediaType ones.
+	* Tweaked _example.html template to be much more collapsed by default, as it is not great, but makes it easier to review.
+	* Enhanced _links.html template to use the rs-type-label, and rs-attribute-description directives.
+	* Small design improvements on the home page for showing routes and verbs more prominently.
+* Mediatype documentation improvements:
+	* Make `Links` always list its attributes when describe (never shallow)
+	* refactored MediaTypeCollection to store a member_attribute (instead of a member_type), and report it in describe much like attributor collections do.
+* `MediaTypeCollection`. See [volume_snapshot](spec/spec_app/design/media_types/volume_snapshot.rb) in the specs for an example.
+  * Added `member_view` DSL to define a view that renders the collection's members with the given view.
+  * Change: Now requires all views to be explicitly defined (and will not automatically use the underlying member view if it exists). To define a view for member element (wrapping it in a collection) one can use the new member_view.
+* Application.setup now returns the application instance so it can be chained to other application methods.
+  * This allows a more compact way to rackup the application: `run Praxis::Application.instance.setup`.
+* Request headers are now backed by `Attributor::Hash` rather than (Structs)
+** Header keys are case sensitive now (although Praxis gracefully allows loading the uppercased RACK names )
+* Added tests for using `Attributor::Hash` attributes that can accept "extra" keys:
+** See the `bulk_create` action for an example applied to `Praxis::Multipart` (which derives from `Attributor::Hash`) payload [here](https://github.com/rightscale/praxis/blob/master/spec/spec_app/design/resources/instances.rb).
+	
+## 0.9 Initial release

data/CONTRIBUTING.md

@@ -103,8 +103,9 @@ logical units of work using `git rebase -i` and `git push -f`. After every
 commit the test suite should be passing. Include documentation changes in the
 same commit so that a revert would remove all traces of the feature or fix.
 
-Commits that fix or close an issue should include a reference like `Closes
-#XXXX` or `Fixes #XXXX`, which will automatically close the issue when merged.
+Commits that fix or close an issue should include a reference like
+`Closes #XXXX` or `Fixes #XXXX`, which will automatically close the issue when
+merged.
 
 Please do not add yourself to the `AUTHORS` file unless you are on the Praxis
 github team.

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/README.md

@@ -48,12 +48,14 @@ job keeping the docs and the code in sync everytime they make code changes.
 
 ## Mailing List
 Join our Google Groups for discussion, support and announcements.
-* http://groups.google.com/d/forum/praxis-support (support for people using
+* [praxis-support](http://groups.google.com/d/forum/praxis-support) (support for people using
   Praxis)
-* http://groups.google.com/d/forum/praxis-announce (announcements)
-* http://groups.google.com/d/forum/praxis-development (discussion about the
+* [praxis-announce](http://groups.google.com/d/forum/praxis-announce) (announcements)
+* [praxis-development](http://groups.google.com/d/forum/praxis-development) (discussion about the
   development of Praxis itself)
 
+And follow us on twitter: [@praxisapi](http://twitter.com/praxisapi)
+
 ## Contributions
 Contributions to make Praxis better are welcome. Please refer to
 [CONTRIBUTING](https://github.com/rightscale/praxis/blob/master/CONTRIBUTING.md)

data/lib/api_browser/app/css/main.css

@@ -4376,6 +4376,10 @@ body {
   body a {
     cursor: pointer; }
 
+.content dl {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 .header .navbar-default {
   background-image: -ms-linear-gradient(top, #fff 0%, #f3f3f3 100%);
   background-image: -moz-linear-gradient(top, #fff 0%, #f3f3f3 100%);

data/lib/api_browser/app/js/directives/attribute_description.js

@@ -10,7 +10,8 @@
 
       _.forEach(scope.attribute.options, function(option, name) {
         var templatePath = 'views/directives/attribute_description/_default.html';
-
+        var skip_keys = ['reference','dsl_compiler','dsl_compiler_options'];
+        
         switch (name) {
           case 'example':
             // expects string
@@ -24,19 +25,21 @@
             break;
         }
 
-        $http.get(templatePath, { cache: $templateCache }).success(function(template) {
-          var row = $(template);
-          var rowScope = scope.$new(true);
-
-          rowScope.row = {
-            name: name,
-            value: option
-          };
-
-          $compile(row)(rowScope);
-          list.append(row);
-        });
-
+        if( ! _.contains( skip_keys, name ) ) {
+          $http.get(templatePath, { cache: $templateCache }).success(function(template) {
+            var row = $(template);
+            var rowScope = scope.$new(true);
+  
+            rowScope.row = {
+              name: name,
+              value: option
+            };
+  
+            $compile(row)(rowScope);
+            list.append(row);
+          });
+        }
+        
       })
     }
   };

data/lib/api_browser/app/js/directives/type_label.js

@@ -16,8 +16,8 @@
   var templates = {
     primitive: '<span>{{type.name}}</span>',
     type: '<a ui-sref="root.type({version: apiVersion, type: type.name})">{{type.name | resourceName}}</a>',
-    typeCollection: '<span>Collection&nbsp;[&nbsp;{{type.options.member_attribute.type.name}}&nbsp;]</a>',
-    primitiveCollection: '<span>Collection&nbsp;[&nbsp;<a ui-sref="root.type({version: apiVersion, type: type.options.member_attribute.type.name})">{{type.options.member_attribute.type.name | resourceName}}</a>&nbsp;]</span>',
+    primitiveCollection: '<span>Collection&nbsp;[&nbsp;{{type.member_attribute.type.name}}&nbsp;]</a>',
+    typeCollection: '<span>Collection&nbsp;[&nbsp;<a ui-sref="root.type({version: apiVersion, type: type.member_attribute.type.name})">{{type.member_attribute.type.name | resourceName}}</a>&nbsp;]</span>',
     link: '<span>Link&nbsp;[&nbsp;<a ui-sref="root.type({version: apiVersion, type: type.link_to})">{{type.link_to | resourceName}}</a>&nbsp;]</span>'
   };
 
@@ -29,15 +29,15 @@
     link: function(scope, element) {
 
       var template = templates.type;
-
       if (_.contains(primitives, scope.type.name)) {
         template = templates.primitive;
       }
-      else if (scope.type.name === 'Collection') {
-        if (_.contains(primitives, scope.type.options.member_attribute.type.name))
-          template = templates.typeCollection;
-        else
+      else if ( scope.type.member_attribute !== undefined ) { 
+        if ( _.contains(primitives, scope.type.member_attribute.type.name)){
           template = templates.primitiveCollection;
+        }else{
+          template = templates.typeCollection;
+				}
       }
       else if (scope.type.link_to) {
         template = templates.link;

data/lib/api_browser/app/sass/modules/_body.scss

@@ -8,4 +8,11 @@ body {
   a {
     cursor: pointer;
   }
-}
+}
+
+.content {
+	dl {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+}

data/lib/api_browser/app/views/directives/attribute_description/_example.html

@@ -1,8 +1,13 @@
-<dt ng-if="row.value.length < 250">example</dt>
-<dt ng-if="row.value.length >= 250">
-  <a ng-init="row.isCollapsed = true" ng-click="row.isCollapsed = !row.isCollapsed">example (click to {{row.isCollapsed? 'expand' : 'collapse'}})</a>
+<dt ng-if="row.value.length < 50">example</dt> 
+<dt ng-if="row.value.length >= 50">
+	  example (<a ng-init="row.isCollapsed = true" ng-click="row.isCollapsed = !row.isCollapsed">{{row.isCollapsed? 'show' : 'hide'}}</a>)
+	</dt>
 </dt>
-<dd ng-if="row.value.length <= 50"><code>{{row.value}}</code></dd>
+
+
+<dd ng-if="row.value.length <= 50">
+	<code ng-class="{hide: false}">{{row.value}}</code>
+</dd>
 <dd ng-if="row.value.length > 50">
   <pre ng-class="{hide: row.isCollapsed}">{{row.value}}</pre>
 </dd>

data/lib/api_browser/app/views/directives/attribute_table_row/_links.html

@@ -1,10 +1,11 @@
 <ng-include src="'views/directives/attribute_table_row/_default.html'" no-container></ng-include>
-<div class="row" ng-repeat="(k,v) in attribute.options.dsl_compiler_options.links">
-  <div class="col-sm-3" ng-bind-html="name + '.' + k | attributeName">
+<div class="row" ng-repeat="(attribute_name,attribute) in attribute.type.attributes">
+  <div class="col-sm-3" ng-bind-html="name + '.' + attribute_name | attributeName">
   </div>
   <div class="col-sm-2">
+		 <rs-type-label type="attribute.type"></rs-type-label>
   </div>
   <div class="col-sm-7">
-    {{v}}
+    <rs-attribute-description attribute="attribute"></rs-attribute-description>
   </div>
 </div>

data/lib/api_browser/app/views/resource/_actions.html

@@ -1,21 +1,27 @@
 <div class="attribute-table">
   <div class="row head">
-    <div class="col-sm-3">
+    <div class="col-sm-2">
       Name
     </div>
-    <div class="col-sm-9">
+    <div class="col-sm-4">
+      Route
+    </div>
+    <div class="col-sm-6">
       Description
     </div>
   </div>
   <div class="content">
     <div class="row" ng-repeat="action in controller.actions">
-      <div class="col-sm-3">
+      <div class="col-sm-2">
         <a ui-sref="root.action({action: action.name, controller: controllerName, version: apiVersion})">{{ action.name }}</a>
       </div>
-      <div class="col-sm-9">
+      <div class="col-sm-4">
         <div ng-repeat="url in action.urls">
-          {{ url.verb }} {{ url.path }}
+          <div class="label label-default">{{ url.verb }}</div>
+          <strong>{{ url.path }}</strong>
         </div>
+      </div>
+      <div class="col-sm-6" style="font-size: 110%;">
         {{ action.description }}
       </div>
     </div>

data/lib/praxis/action_definition/headers_dsl_compiler.rb

@@ -2,7 +2,6 @@ module Praxis
   class ActionDefinition
     class HeadersDSLCompiler < Attributor::DSLCompiler
 
-      alias_method :orig_attribute, :attribute
       # it allows to define expectations on incoming headers. For example:
       # header :X_SpecialCookie                        => implies the header is required
       # header :X_Something, /matching_this/           => implies that if the name header exists, it should match the regexp
@@ -22,13 +21,14 @@ 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
-        orig_attribute name.upcase , String, options
+        #orig_attribute name.upcase , String, options
+        key name , String, options
       end
 
-      def attribute( name, type, **rest)
-        raise Exceptions::InvalidConfiguration.new(
-          "You cannot use the 'attribute' DSL inside a headers definition"
-        )
+      # Override the attribute to really call "key" in the hash (for temporary backwards compat)      
+      def attribute(name, attr_type=nil, **opts, &block)
+        warn "[DEPRECATION] `attribute` is deprecated when defining headers.  Please use `key` instead."
+        key(name, attr_type, **opts, &block)
       end
 
     end

data/lib/praxis/action_definition.rb

@@ -16,7 +16,6 @@ module Praxis
     attr_reader :named_routes
     attr_reader :responses
 
-
     def initialize(name, resource_definition, **opts, &block)
       @name = name
       @resource_definition = resource_definition
@@ -105,15 +104,31 @@ module Praxis
       end
     end
 
-    def headers(**opts, &block)
+    def headers(type=Attributor::Hash.of(key:String), **opts, &block)
       return @headers unless block
-
       if @headers
         update_attribute(@headers, opts, block)
       else
-        @headers = create_attribute(dsl_compiler: HeadersDSLCompiler, **opts, &block)
+        @headers = create_attribute(type,
+          dsl_compiler: HeadersDSLCompiler, case_insensitive_load: true, 
+          **opts, &block)
+      end
+      @precomputed_header_keys_for_rack = nil #clear memoized data
+    end
+
+    # Good optimization to avoid creating lots of strings and comparisons
+    # on a per-request basis.
+    # However, this is hacky, as it is rack-specific, and does not really belong here
+    def precomputed_header_keys_for_rack
+      @precomputed_header_keys_for_rack ||= begin
+        @headers.attributes.keys.each_with_object(Hash.new) do |key,hash|
+          name = key.to_s
+          name = "HTTP_#{name.upcase}" unless ( name == "CONTENT_TYPE" || name == "CONTENT_LENGTH" )
+          hash[name] = key
+        end
       end
     end
+    
 
     def routing(&block)
       routing_config = Skeletor::RestfulRoutingConfig.new(name, resource_definition, &block)

data/lib/praxis/api_definition.rb

@@ -30,7 +30,7 @@ module Praxis
 
     def response(name)
       return @responses.fetch(name) do
-        raise ArgumentError, "no response defined with name #{name.inspect}"
+        raise ArgumentError, "no response template defined with name #{name.inspect}. Are you forgetting to register it with ApiDefinition?"
       end
     end
 
@@ -48,8 +48,8 @@ module Praxis
         status 200
       end
 
-      api.response_template :created do |media_type: |
-        media_type media_type
+      api.response_template :created do |location: nil|
+        location location
         status 201
       end
     end

data/lib/praxis/application.rb

@@ -40,6 +40,7 @@ module Praxis
       @root = Pathname.new(root).expand_path
 
       @bootloader.setup!
+      self
     end
 
     def call(env)

data/lib/praxis/bootloader_stages/routing.rb

@@ -7,7 +7,7 @@ module Praxis
 
       def execute
         application.controllers.each do |controller|
-          controller.actions.each do |action_name, action|
+          controller.definition.actions.each do |action_name, action|
             action.routes.each do |route|
               target = target_factory(controller, action_name)
               application.router.add_route target, route
@@ -18,11 +18,11 @@ module Praxis
 
 
       def target_factory(controller, action_name)
-        action = controller.action(action_name)
+        action = controller.definition.actions.fetch(action_name)
 
         Proc.new do |request|
           request.action = action
-          dispatcher = Dispatcher.current(thread: Thread.current, application: application)
+          dispatcher = Dispatcher.current( application: application)
 
           dispatcher.dispatch(controller, action, request)
         end

data/lib/praxis/bootloader_stages/warn_unloaded_files.rb

@@ -17,6 +17,7 @@ module Praxis
       def execute
         return unless self.class.enabled
         base = application.file_layout[:app].base
+        return unless base.exist?
         file_enum = base.find.to_a
         files = file_enum.select do |file|
           path = file.relative_path_from(base)

data/lib/praxis/callbacks.rb

@@ -0,0 +1,35 @@
+require 'active_support/concern'
+
+module Praxis
+  module Callbacks
+    extend ::ActiveSupport::Concern
+
+    included do
+      class_attribute :before_callbacks, :after_callbacks, :around_callbacks
+      self.before_callbacks = Hash.new
+      self.after_callbacks = Hash.new
+      self.around_callbacks = Hash.new
+    end
+    
+    module ClassMethods
+ 
+      def before(*stage_path, **conditions, &block)
+        stage_path = [:action] if stage_path.empty?
+        before_callbacks[stage_path] ||= Array.new
+        before_callbacks[stage_path] << [conditions, block]
+      end
+      
+      def after(*stage_path, **conditions, &block)
+        stage_path = [:action] if stage_path.empty?
+        after_callbacks[stage_path] ||= Array.new
+        after_callbacks[stage_path] << [conditions, block]
+      end
+      
+      def around(*stage_path, **conditions, &block)
+        stage_path = [:action] if stage_path.empty?
+        around_callbacks[stage_path] ||= Array.new
+        around_callbacks[stage_path] << [conditions, block]
+      end
+    end
+  end
+end

data/lib/praxis/controller.rb

@@ -1,59 +1,42 @@
 require 'active_support/concern'
-require 'active_support/inflector'
+require 'active_support/all'
 
 module Praxis
-
   module Controller
-    extend ActiveSupport::Concern
-
+    extend ::ActiveSupport::Concern
+    # A Controller always requires the callbacks
+    include Praxis::Callbacks
+    
     included do
       attr_reader :request
       attr_accessor :response
-      Application.instance.controllers << self
-      self.instance_eval do
-        @before_callbacks = Hash.new
-        @after_callbacks = Hash.new
-      end
-
     end
-
     module ClassMethods
-      attr_reader :before_callbacks, :after_callbacks
-
       def implements(definition)
         define_singleton_method(:definition) do
           definition
         end
-        definition.controller = self
-      end
 
-      def actions
-        definition.actions
-      end
-
-      def action(name)
-        actions.fetch(name)
-      end
-
-      def before(*stage_path, **conditions, &block)
-        stage_path = [:action] if stage_path.empty?
-        @before_callbacks[stage_path] ||= Array.new
-        @before_callbacks[stage_path] << [conditions, block]
-      end
-
-      def after(*stage_path, **conditions, &block)
-        stage_path = [:action] if stage_path.empty?
-        @after_callbacks[stage_path] ||= Array.new
-        @after_callbacks[stage_path] << [conditions, block]
+        definition.controller = self
+        Application.instance.controllers << self
       end
-
     end
 
-
     def initialize(request, response=Responses::Ok.new)
       @request = request
       @response = response
     end
 
+#    def request
+#      @request
+#    end
+#
+#    def response
+#      @response
+#    end
+#
+#    def response=(value)
+#      @response = value
+#    end
   end
 end

data/lib/praxis/file_group.rb

@@ -5,8 +5,14 @@ module Praxis
     attr_reader :groups, :base
 
     def initialize(base, &block)
+      if base.nil?
+        raise ArgumentError, "base must not be nil." \
+          "Are you missing a call Praxis::Application.instance.setup?" 
+      end
+
+
       @groups = Hash.new
-      @base = base
+      @base = Pathname.new(base)
 
       if block_given?
         self.instance_eval(&block)
@@ -18,16 +24,15 @@ module Praxis
     end
 
     def map(name, pattern, &block)
+      return unless base.exist?
+
       if block_given?
         @groups[name] = FileGroup.new(base + pattern, &block)
       else
         @groups[name] ||= []
-        file_enum = base.find.to_a
-        files = file_enum.select do |file|
-          path = file.relative_path_from(base)
-          file.file? && path.fnmatch?(pattern, File::FNM_PATHNAME)
-        end
-        files.sort_by { |file| [file.to_s.split('/').size, file.to_s] }.each { |file| @groups[name] << file }
+        files = Pathname.glob(base+pattern).select { |file| file.file? }
+        files.sort_by! { |file| [file.to_s.split('/').size, file.to_s] }
+        files.each { |file| @groups[name] << file }
       end
     end
 

data/lib/praxis/links.rb

@@ -42,6 +42,10 @@ module Praxis
       self
     end
 
+    def self.describe(shallow=false)
+      super(false) # Links must always describe attributes
+    end
+    
     def self._finalize!
       super
       if @attribute

data/lib/praxis/media_type_collection.rb

@@ -23,6 +23,10 @@ module Praxis
   class MediaTypeCollection < MediaType
     include Enumerable
 
+    class << self
+      attr_accessor :member_attribute
+    end
+    
     def self._finalize!
       super
 
@@ -35,10 +39,11 @@ module Praxis
     end
 
     def self.member_type(type=nil)
-      return @media_type unless type
+      return ( @member_attribute ? @member_attribute.type : nil) unless type
       raise ArgumentError, "invalid type: #{type.name}" unless type < MediaType
 
-      @member_type = type
+      member_options = {}
+      @member_attribute = Attributor::Attribute.new type, member_options
     end
 
     def self.example(context=nil, options: {})
@@ -59,10 +64,10 @@ module Praxis
 
       size.times do |i|
         subcontext = context + ["at(#{i})"]
-        members << @member_type.example(subcontext)
+        members << @member_attribute.example(subcontext)
       end
 
-      
+
       result.object._members = members
       result
     end
@@ -80,7 +85,7 @@ module Praxis
         self.new(self.attribute.load(value,context, **options))
       when Array
         object = self.attribute.load({})
-        object._members = value.collect { |subvalue| @member_type.load(subvalue) }
+        object._members = value.collect { |subvalue| @member_attribute.load(subvalue) }
         self.new(object)
       else
         # Just wrap whatever value
@@ -88,18 +93,19 @@ module Praxis
       end
     end
 
+    def self.describe(shallow = false)
+      hash = super
+      hash[:member_attribute] = member_attribute.describe(true)
+      hash
+    end
 
-    def render(view_name=:default, context: Attributor::DEFAULT_ROOT_CONTEXT)
-      if (view = self.class.views[view_name])
-        # we have the view ourselves, use it with our atrributes
-        super
-      else
-        # render each member with the view
-        @object.collect.with_index do |member, i| 
-          subcontext = context + ["at(#{i})"]
-          member.render(view_name, context: subcontext)
-        end
+    def self.member_view(name, using: nil)
+      if using
+        member_view = self.member_type.view(using)
+        return self.views[name] = CollectionView.new(name, self, member_view)
       end
+
+      self.views[name]
     end