aldous 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e396af4df13c405822eb290056947943e502c97b
-  data.tar.gz: 62e3f8739b0a35e9f0c4911347f088763e003944
+  metadata.gz: b4ac11d7020bca30f4a28b5a3bca292e92ce4422
+  data.tar.gz: 4dc1ba4b25bd15301374d4715419803521af1949
 SHA512:
-  metadata.gz: 8ab212817cec483cff3f3ae186eb74ca4f8b3dc499634e5c5ce8af68b92bf17a3fba96e3a043819527100d5c4e3fcdb472cf9e55621a933bf1dad3245e95f004
-  data.tar.gz: 409b37981511c069505dcce476fde2bfa8d3eb9d723c06f9f8fec34f65c32f34ef93cad3224a26040f023d69c1c615ba2ebe98466510d18660b6dd72f4eab793
+  metadata.gz: 386504b64bb33f3f6f5471c28b45e0a4af9c94a2195da419ad6a7422f3314c95890e15faad9592d742132f9b9f327d3335f0cfa423e614e1084838ee955d059c
+  data.tar.gz: 8fc61614c1d8d1642da533849c96982fe64ac9ef59f86629438ef528e4af0c1058bf3ef0d2e27bafa50bbba9d84a18c320c7143e3c8bcafac2e0c9516226d30e

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.1

data/README.md

@@ -8,7 +8,7 @@ Aldous attempts to address this, by introducing a light convention for creating
 
 2) Big and bloated controllers (despite our best intentions) that contain business logic and are hard to test. Not to mention the logic that is spread among the various `before_actions` requiring mental compilation to understand a controller action fully. Lastly the instance variables spread all over the controller that get inherited by the view templates as global variables.
 
-Aldous addresses this by introducing the concept of a controller action object. The Rails controllers still exist by they contain no logic in them. All the logic moves to the action classes with one action per class. Instance variables from these don't automatically get inherited by the view templates and the job of `before_actions` is taken over by precondition objects. See below for a more detailed overview of Aldous controller actions.
+Aldous addresses this by introducing the concept of a controller action object. The Rails controllers still exist, but they contain no logic in them. All the logic moves to the action classes with one action per class. Instance variables from these don't automatically get inherited by the view templates and the job of `before_actions` is taken over by precondition objects. See below for a more detailed overview of Aldous controller actions.
 
 3) Views that are not really views, but are instead view templates that inherit instance variables from controllers as globals and leave no good place for view-specific logic making us resort to hacky solutions like view helpers.
 
@@ -220,9 +220,9 @@ class TodosController::Index < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
+    return view_builder.build(Home::ShowRedirect) unless current_user
 
-    build_view(Todos::IndexView)
+    view_builder.build(Todos::IndexView)
   end
 
   private
@@ -287,15 +287,15 @@ class TodosController::Update < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
-    return build_view(Todos::NotFoundView, todo_id: params[:id]) unless todo
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
+    return view_builder.build(Todos::NotFoundView, todo_id: params[:id]) unless todo
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
 
     if todo.update_attributes(todo_params.fetch)
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(Todos::EditView)
+      view_builder.build(Todos::EditView)
     end
   end
 
@@ -316,14 +316,14 @@ Let's start with the `perform` method. As you can see it's fattish, but no fatte
 ```ruby
 class SignUpsController::Create < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
-    return build_view(Defaults::BadRequestView, errors: [user_params.error_message]) unless user_params.fetch
+    return view_builder.build(Todos::IndexRedirect) if current_user
+    return view_builder.build(Defaults::BadRequestView, errors: [user_params.error_message]) unless user_params.fetch
 
     if create_user_result.success?
       SignInService.perform!(session, create_user_result.user)
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(SignUps::NewView)
+      view_builder.build(SignUps::NewView)
     end
   end
 
@@ -349,7 +349,7 @@ class Shared::EnsureUserNotDisabledPrecondition < BasePrecondition
 
   def perform
     if current_user && current_user.disabled && !current_ability.can?(:manage, :all)
-      return build_view(Defaults::ForbiddenView, errors: ['Your account has been disabled'])
+      return view_builder.build(Defaults::ForbiddenView, errors: ['Your account has been disabled'])
     end
   end
 end
@@ -437,20 +437,21 @@ class BaseView < ::Aldous::Respondable::Renderable
   private
 
   def header_view
-    build_view(Modules::HeaderView)
+    view_builder.build(Modules::HeaderView)
   end
 end
 ```
 
 As you can see a view object ultimately inherits from `Aldous::Respondable::Renderable` and the key method to override is `template_data`. This method needs to return a hash with template or partial that we want to render as well as the locals that we want to supply. If we have a `BaseView` which I recommend, then we can also override the `default_template_locals` method. When you do this, some Aldous magic will happen and all the things in that hash will be available in all the templates as locals which is very handy for data that's common across all or most templates. The key things here is that you control it.
 
-You construct view objects either in your controller actions or in other view objects, to do this you use the `build_view` method which is available in both of those places. The only place where you may have to construct view objects directly is in tests. The constructor signature of a view object is:
+You construct view objects either in your controller actions or in other view objects, to do this you use the `view_builder` object `build` method. This object is always available and you don't need to worry about providing it, but if you ever want to override it (e.g. in tests), you can inject it also. The only place where you may have to construct view objects directly is in tests. The constructor signature of a view object is:
 
 ```ruby
-def initialize(status, view_data, view_context)
+def initialize(status, view_data, view_context, view_builder)
   @status = status
   @view_data = view_data
   @view_context = view_context
+  @view_builder = view_builder
  end
 ```
 
@@ -484,7 +485,7 @@ class Todos::IndexView < BaseView
   end
 
   def todo_view(todo)
-    build_view(Todos::IndexView::TodoView, todo: todo)
+    view_builder.build(Todos::IndexView::TodoView, todo: todo)
   end
 end
 ```
@@ -507,7 +508,7 @@ class BaseView < ::Aldous::Respondable::Renderable
   private
 
   def header_view
-    build_view(Modules::HeaderView)
+    view_builder.build(Modules::HeaderView)
   end
 end
 ```

data/examples/basic_todo/app/controller_actions/home_controller/show.rb

@@ -1,7 +1,7 @@
 class HomeController::Show < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
-    build_view(Home::ShowView)
+    return view_builder.build(Todos::IndexRedirect) if current_user
+    view_builder.build(Home::ShowView)
   end
 end
 

data/examples/basic_todo/app/controller_actions/shared/ensure_user_not_disabled_precondition.rb

@@ -3,7 +3,7 @@ class Shared::EnsureUserNotDisabledPrecondition < BasePrecondition
 
   def perform
     if current_user && current_user.disabled && !current_ability.can?(:manage, :all)
-      return build_view(Defaults::ForbiddenView, errors: ['Your account has been disabled'])
+      return view_builder.build(Defaults::ForbiddenView, errors: ['Your account has been disabled'])
     end
   end
 end

data/examples/basic_todo/app/controller_actions/sign_ins_controller/create.rb

@@ -1,14 +1,14 @@
 class SignInsController::Create < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
-    return build_view(Defaults::BadRequestView, status: :bad_request, errors: [user_params.error_message]) unless user_params.fetch
-    return build_view(SignIns::NewView, status: :not_found) unless user
+    return view_builder.build(Todos::IndexRedirect) if current_user
+    return view_builder.build(Defaults::BadRequestView, status: :bad_request, errors: [user_params.error_message]) unless user_params.fetch
+    return view_builder.build(SignIns::NewView, status: :not_found) unless user
 
     if user.authenticate(user_params.fetch[:password])
       SignInService.perform!(session, user)
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(SignIns::NewView, status: :unprocessable_entity, errors: ["Incorrect credentials"])
+      view_builder.build(SignIns::NewView, status: :unprocessable_entity, errors: ["Incorrect credentials"])
     end
   end
 

data/examples/basic_todo/app/controller_actions/sign_ins_controller/destroy.rb

@@ -1,9 +1,9 @@
 class SignInsController::Destroy < BaseAction
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
+    return view_builder.build(Home::ShowRedirect) unless current_user
 
     SignOutService.perform!(session)
 
-    build_view(Home::ShowRedirect)
+    view_builder.build(Home::ShowRedirect)
   end
 end

data/examples/basic_todo/app/controller_actions/sign_ins_controller/new.rb

@@ -1,7 +1,7 @@
 class SignInsController::New < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
+    return view_builder.build(Todos::IndexRedirect) if current_user
 
-    return build_view(SignIns::NewView)
+    return view_builder.build(SignIns::NewView)
   end
 end

data/examples/basic_todo/app/controller_actions/sign_ups_controller/create.rb

@@ -1,13 +1,13 @@
 class SignUpsController::Create < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
-    return build_view(Defaults::BadRequestView, errors: [user_params.error_message]) unless user_params.fetch
+    return view_builder.build(Todos::IndexRedirect) if current_user
+    return view_builder.build(Defaults::BadRequestView, errors: [user_params.error_message]) unless user_params.fetch
 
     if create_user_result.success?
       SignInService.perform!(session, create_user_result.user)
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(SignUps::NewView)
+      view_builder.build(SignUps::NewView)
     end
   end
 

data/examples/basic_todo/app/controller_actions/sign_ups_controller/new.rb

@@ -1,7 +1,7 @@
 class SignUpsController::New < BaseAction
   def perform
-    return build_view(Todos::IndexRedirect) if current_user
+    return view_builder.build(Todos::IndexRedirect) if current_user
 
-    return build_view(SignUps::NewView)
+    return view_builder.build(SignUps::NewView)
   end
 end

data/examples/basic_todo/app/controller_actions/todos/all_completed_controller/destroy.rb

@@ -1,11 +1,11 @@
 class Todos::AllCompletedController::Destroy < BaseAction
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
+    return view_builder.build(Home::ShowRedirect) unless current_user
 
     if todos.destroy_all
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(Defaults::ServerErrorView, errors: ['Unable to delete completed todos'])
+      view_builder.build(Defaults::ServerErrorView, errors: ['Unable to delete completed todos'])
     end
   end
 

data/examples/basic_todo/app/controller_actions/todos/completed_controller/create.rb

@@ -4,16 +4,16 @@ class Todos::CompletedController::Create < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Todos::NotFoundView, todo_id: todo_id) unless todo
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Todos::NotFoundView, todo_id: todo_id) unless todo
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
 
     todo.done = true
 
     if todo.save
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(Defaults::ServerErrorView, errors: ["Unable to mark todo completed"])
+      view_builder.build(Defaults::ServerErrorView, errors: ["Unable to mark todo completed"])
     end
   end
 

data/examples/basic_todo/app/controller_actions/todos_controller/create.rb

@@ -4,13 +4,13 @@ class TodosController::Create < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
 
     if todo.save
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(Todos::NewView)
+      view_builder.build(Todos::NewView)
     end
   end
 

data/examples/basic_todo/app/controller_actions/todos_controller/destroy.rb

@@ -4,13 +4,13 @@ class TodosController::Destroy < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Todos::NotFoundView, todo_id: params[:id]) unless todo
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:destroy, todo)
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Todos::NotFoundView, todo_id: params[:id]) unless todo
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:destroy, todo)
 
     todo.destroy
 
-    build_view(Todos::IndexRedirect)
+    view_builder.build(Todos::IndexRedirect)
   end
 
   private

data/examples/basic_todo/app/controller_actions/todos_controller/edit.rb

@@ -4,11 +4,11 @@ class TodosController::Edit < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Todos::NotFoundView, todo_id: params[:id]) unless todo
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Todos::NotFoundView, todo_id: params[:id]) unless todo
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
 
-    build_view(Todos::EditView)
+    view_builder.build(Todos::EditView)
   end
 
   private

data/examples/basic_todo/app/controller_actions/todos_controller/index.rb

@@ -4,9 +4,9 @@ class TodosController::Index < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
+    return view_builder.build(Home::ShowRedirect) unless current_user
 
-    build_view(Todos::IndexView)
+    view_builder.build(Todos::IndexView)
   end
 
   private

data/examples/basic_todo/app/controller_actions/todos_controller/new.rb

@@ -4,9 +4,9 @@ class TodosController::New < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
+    return view_builder.build(Home::ShowRedirect) unless current_user
 
-    build_view(Todos::NewView)
+    view_builder.build(Todos::NewView)
   end
 
   private

data/examples/basic_todo/app/controller_actions/todos_controller/update.rb

@@ -4,15 +4,15 @@ class TodosController::Update < BaseAction
   end
 
   def perform
-    return build_view(Home::ShowRedirect) unless current_user
-    return build_view(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
-    return build_view(Todos::NotFoundView, todo_id: params[:id]) unless todo
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
+    return view_builder.build(Home::ShowRedirect) unless current_user
+    return view_builder.build(Defaults::BadRequestView, errors: [todo_params.error_message]) unless todo_params.fetch
+    return view_builder.build(Todos::NotFoundView, todo_id: params[:id]) unless todo
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:update, todo)
 
     if todo.update_attributes(todo_params.fetch)
-      build_view(Todos::IndexRedirect)
+      view_builder.build(Todos::IndexRedirect)
     else
-      build_view(Todos::EditView)
+      view_builder.build(Todos::EditView)
     end
   end
 

data/examples/basic_todo/app/controller_actions/users_controller/index.rb

@@ -4,9 +4,9 @@ class UsersController::Index < BaseAction
   end
 
   def perform
-    return build_view(Defaults::ForbiddenView) unless current_ability.can?(:index, User)
+    return view_builder.build(Defaults::ForbiddenView) unless current_ability.can?(:index, User)
 
-    build_view(Users::IndexView)
+    view_builder.build(Users::IndexView)
   end
 
   private

data/examples/basic_todo/app/views/base_view.rb

@@ -13,6 +13,6 @@ class BaseView < ::Aldous::Respondable::Renderable
   private
 
   def header_view
-    build_view(Modules::HeaderView)
+    view_builder.build(Modules::HeaderView)
   end
 end

data/examples/basic_todo/app/views/todos/index_view.rb

@@ -21,6 +21,6 @@ class Todos::IndexView < BaseView
   end
 
   def todo_view(todo)
-    build_view(Todos::IndexView::TodoView, todo: todo)
+    view_builder.build(Todos::IndexView::TodoView, todo: todo)
   end
 end

data/examples/basic_todo/app/views/users/index_view.rb

@@ -21,6 +21,6 @@ class Users::IndexView < BaseView
   end
 
   def user_view(user)
-    build_view(Users::IndexView::UserView, user: user).template
+    view_builder.build(Users::IndexView::UserView, user: user).template
   end
 end

data/lib/aldous/controller/action/precondition.rb

@@ -1,5 +1,4 @@
 require 'aldous/controller/action/precondition/wrapper'
-require 'aldous/build_respondable_service'
 
 module Aldous
   module Controller
@@ -8,47 +7,42 @@ module Aldous
         include Aldous
 
         class << self
-          def build(action)
-            Aldous::Controller::Action::Precondition::Wrapper.new(new(action))
+          def build(action, controller, view_builder)
+            Aldous::Controller::Action::Precondition::Wrapper.new(new(action, controller, view_builder))
           end
 
-          def perform(action)
-            build(action).perform
+          def perform(action, controller, view_builder)
+            build(action, controller, view_builder).perform
           end
 
           def inherited(klass)
             ::Aldous.configuration.controller_methods_exposed_to_action.each do |method_name|
               unless klass.method_defined?(method_name)
                 define_method method_name do
-                  action.controller.send(method_name)
+                  controller.send(method_name)
                 end
               end
             end
           end
         end
 
-        attr_reader :action
+        attr_reader :action, :controller, :view_builder
 
-        def initialize(action)
+        def initialize(action, controller, view_builder)
           @action = action
+          @controller = controller
+          @view_builder = view_builder
         end
 
         def perform
           raise NotImplementedError.new("#{self.class.name} must implement method #perform")
         end
 
-        def controller
-          action.controller
-        end
-
-        def build_view(respondable_class, extra_data = {})
-          ::Aldous::BuildRespondableService.new(
-            view_context: action.controller.view_context,
-            default_view_data: action.default_view_data,
-            respondable_class: respondable_class,
-            status: extra_data[:status],
-            extra_data: extra_data
-          ).perform
+        ################################################
+        # NOTE deprecated
+        ################################################
+        def build_view(respondable_class, extra_data = {}) # deprecated
+          view_builder.build(respondable_class, extra_data)
         end
       end
     end

data/lib/aldous/controller/action/precondition/wrapper.rb

@@ -15,15 +15,29 @@ module Aldous
             precondition.action.default_view_data
           end
 
-          def default_error_respondable
-            precondition.action.default_error_respondable
+          def default_error_handler(error)
+            precondition.action.default_error_handler(error)
+          end
+
+          def controller
+            precondition.controller
+          end
+
+          def view_builder
+            precondition.view_builder
           end
 
           def perform
             precondition.perform
           rescue => e
             ::Aldous::LoggingWrapper.log(e)
-            precondition.build_view(default_error_respondable, errors: [e])
+
+            error_handler = default_error_handler(e)
+
+            if error_handler.kind_of?(Class) &&
+              error_handler.ancestors.include?(Aldous::Respondable::Base)
+              view_builder.build(error_handler, errors: [e])
+            end
           end
         end
       end

data/lib/aldous/controller/action/result_execution_service.rb

@@ -1,3 +1,4 @@
+require 'aldous/view_builder'
 require 'aldous/logging_wrapper'
 
 module Aldous

data/lib/aldous/controller/action/wrapper.rb

@@ -27,6 +27,10 @@ module Aldous
           controller_action.controller
         end
 
+        def view_builder
+          controller_action.view_builder
+        end
+
         def perform
           controller_action.perform
         rescue => e
@@ -36,7 +40,7 @@ module Aldous
 
           if error_handler.kind_of?(Class) &&
             error_handler.ancestors.include?(Aldous::Respondable::Base)
-            controller_action.build_view(error_handler, errors: [e])
+            view_builder.build(error_handler, errors: [e])
           end
         end
       end

data/lib/aldous/controller/action_execution_service.rb

@@ -1,3 +1,4 @@
+require 'aldous/view_builder'
 require 'aldous/controller/preconditions_execution_service'
 require 'aldous/controller/action/result_execution_service'
 require 'aldous/logging_wrapper'

data/lib/aldous/controller/preconditions_execution_service.rb

@@ -4,19 +4,18 @@ require 'aldous/controller/action/precondition/wrapper'
 module Aldous
   module Controller
     class PreconditionsExecutionService
-      attr_reader :action, :controller
+      attr_reader :action_wrapper, :controller
 
-      def initialize(action, controller)
-        @action = action
+      def initialize(action_wrapper, controller)
+        @action_wrapper = action_wrapper
         @controller = controller
       end
 
       def perform
-        if action.respond_to?(:preconditions) && !action.preconditions.empty?
-          action.preconditions.each do |precondition_class|
-            # action here is actually an action wrapper hence the
-            # action.controller_action below
-            precondition = precondition_class.build(action.controller_action)
+        if action_wrapper.respond_to?(:preconditions) && !action_wrapper.preconditions.empty?
+          action_wrapper.preconditions.each do |precondition_class|
+            action = action_wrapper.controller_action
+            precondition = precondition_class.build(action, controller, action.view_builder)
             precondition_result = precondition.perform
 
             if precondition_result.kind_of?(::Aldous::Respondable::Base)

data/lib/aldous/controller_action.rb

@@ -1,7 +1,7 @@
+require 'aldous/view_builder'
 require 'aldous/controller/action/wrapper'
 require 'aldous/view/blank/html_view'
 require 'aldous/simple_dto'
-require 'aldous/build_respondable_service'
 
 module Aldous
   class ControllerAction
@@ -30,8 +30,9 @@ module Aldous
 
     attr_reader :controller
 
-    def initialize(controller)
+    def initialize(controller, view_builder = nil)
       @controller = controller
+      @view_builder = view_builder
     end
 
     def perform
@@ -50,14 +51,15 @@ module Aldous
       ::Aldous::View::Blank::HtmlView
     end
 
-    def build_view(respondable_class, extra_data = {})
-      ::Aldous::BuildRespondableService.new(
-        view_context: controller.view_context,
-        default_view_data: default_view_data,
-        respondable_class: respondable_class,
-        status: extra_data[:status],
-        extra_data: extra_data
-      ).perform
+    def view_builder
+      @view_builder ||= Aldous::ViewBuilder.new(controller.view_context, default_view_data)
+    end
+
+    ################################################
+    # NOTE deprecated
+    ################################################
+    def build_view(respondable_class, extra_data = {}) # deprecated
+      view_builder.build(respondable_class, extra_data)
     end
   end
 end

data/lib/aldous/respondable/base.rb

@@ -1,3 +1,4 @@
+require 'aldous/view_builder'
 require 'aldous/simple_dto'
 
 module Aldous
@@ -5,10 +6,11 @@ module Aldous
     class Base
       attr_reader :view_data, :view_context
 
-      def initialize(status, view_data, view_context)
+      def initialize(status, view_data, view_context, view_builder = nil)
         @status = status
         @view_data = view_data
         @view_context = view_context
+        @view_builder = view_builder
       end
 
       def action(controller)
@@ -23,9 +25,15 @@ module Aldous
         :ok
       end
 
-      def build_view(klass, extra_data = {})
-        dto = Aldous::SimpleDto.new(view_data._data.merge(extra_data))
-        klass.new(status, dto, view_context)
+      def view_builder
+        @view_builder ||= ViewBuilder.new(view_context, view_data._data)
+      end
+
+      ################################################
+      # NOTE deprecated
+      ################################################
+      def build_view(respondable_class, extra_data = {}) # deprecated
+        view_builder.build(respondable_class, extra_data)
       end
     end
   end

data/lib/aldous/version.rb

@@ -1,3 +1,3 @@
 module Aldous
-  VERSION = "1.0.1"
+  VERSION = "1.1.2"
 end

data/lib/aldous/view_builder.rb

@@ -0,0 +1,21 @@
+require 'aldous/simple_dto'
+
+module Aldous
+  class ViewBuilder
+    attr_reader :view_context, :default_view_data
+
+    def initialize(view_context, default_view_data)
+      @view_context = view_context
+      @default_view_data = default_view_data
+    end
+
+    def build(respondable_class, extra_view_data = {}, status = nil)
+      actual_status = status || extra_view_data[:status]
+      extra_view_data_no_status = extra_view_data.reject{|k, v| k == :status}
+      actual_extra_view_data = default_view_data.merge(extra_view_data_no_status)
+      view_data_dto = Aldous::SimpleDto.new(actual_extra_view_data)
+
+      respondable_class.new(actual_status, view_data_dto, view_context)
+    end
+  end
+end

data/spec/aldous/controller/action/precondition/wrapper_spec.rb

@@ -3,17 +3,18 @@ RSpec.describe Aldous::Controller::Action::Precondition::Wrapper do
 
   let(:precondition) {double 'precondition',
                       action: controller_action,
-                      perform: nil,
-                      build_view: nil }
+                      view_builder: view_builder,
+                      perform: nil }
 
   let(:controller_action) { double 'controller action',
                             default_view_data: default_view_data,
-                            default_error_respondable: default_error_respondable,
-                            perform: nil,
-                            build_view: nil }
+                            default_error_handler: default_error_handler,
+                            view_builder: view_builder,
+                            perform: nil }
 
   let(:default_view_data) { {default_view_data: true} }
-  let(:default_error_respondable) {double 'default_error_respondable'}
+  let(:default_error_handler) {double 'default_error_handler'}
+  let(:view_builder) {double 'view_builder'}
 
   before do
     allow(Aldous::LoggingWrapper).to receive(:log)
@@ -34,9 +35,20 @@ RSpec.describe Aldous::Controller::Action::Precondition::Wrapper do
         allow(precondition).to receive(:perform).and_raise(e)
       end
 
-      it "builds a default error view with errors" do
-        expect(precondition).to receive(:build_view).with(default_error_respondable, errors: [e])
-        perform
+      context "when the default error handler is not a respondable" do
+        it "calls the default error handler" do
+          allow(controller_action).to receive(:default_error_handler).with(e)
+          perform
+        end
+      end
+
+      context "when the default error handler is a respondable" do
+        let(:default_error_handler) {Aldous::Respondable::Renderable}
+
+        it "builds the default error handler" do
+          allow(view_builder).to receive(:build).with(default_error_handler, errors: [e])
+          perform
+        end
       end
 
       it 'reports the error' do

data/spec/aldous/controller/action/precondition_spec.rb

@@ -8,10 +8,11 @@ RSpec.describe Aldous::Controller::Action::Precondition do
     Object.send :remove_const, 'ExamplePrecondition'
   end
 
-  let(:precondition) {ExamplePrecondition.new(action)}
+  let(:precondition) {ExamplePrecondition.new(action, controller, view_builder)}
 
   let(:action) {double 'action', controller: controller, default_view_data: default_view_data}
   let(:controller) {double 'controller', view_context: view_context}
+  let(:view_builder) {double 'view_builder'}
   let(:view_context) {double "view_context"}
   let(:default_view_data) {double "default_view_data"}
 
@@ -23,7 +24,7 @@ RSpec.describe Aldous::Controller::Action::Precondition do
 
     it "wraps a controller action instance" do
       expect(Aldous::Controller::Action::Precondition::Wrapper).to receive(:new).with(precondition)
-      ExamplePrecondition.build(action)
+      ExamplePrecondition.build(action, controller, view_builder)
     end
   end
 
@@ -37,7 +38,7 @@ RSpec.describe Aldous::Controller::Action::Precondition do
 
     it "calls perform on the wrapper" do
       expect(wrapper).to receive(:perform)
-      ExamplePrecondition.perform(action)
+      ExamplePrecondition.perform(action, controller, view_builder)
     end
   end
 
@@ -56,26 +57,4 @@ RSpec.describe Aldous::Controller::Action::Precondition do
       expect{precondition.perform}.to raise_error
     end
   end
-
-  describe "#build_view" do
-    before do
-      allow(Aldous::BuildRespondableService).to receive(:new).with(
-        view_context: view_context,
-        default_view_data: default_view_data,
-        respondable_class: respondable_class,
-        status: nil,
-        extra_data: extra_data
-      ).and_return(build_respondable_service)
-    end
-
-    let(:respondable_class) {double "respondable_class"}
-    let(:extra_data) { {hello: 1} }
-
-    let(:build_respondable_service) {double "build_respondable_service", perform: nil}
-
-    it "executes the BuildRespondableService" do
-      expect(build_respondable_service).to receive(:perform)
-      precondition.build_view(respondable_class, extra_data)
-    end
-  end
 end

data/spec/aldous/controller/action/result_execution_service_spec.rb

@@ -1,9 +1,17 @@
 RSpec.describe Aldous::Controller::Action::ResultExecutionService do
   let(:result_execution_service) {described_class.new(controller, respondable, default_view_data)}
 
-  let(:controller) {double "controller"}
-  let(:respondable) {double "respondable", action: action}
-  let(:default_view_data) {'hello'}
+  let(:controller) {double "controller", view_context: view_context}
+
+  let(:view_context) {double "view_context"}
+
+  let(:respondable) do
+    double "respondable", {
+      action: action
+    }
+  end
+
+  let(:default_view_data) { {hello: 'world'} }
 
   let(:action) {double 'action', execute: nil}
 
@@ -30,12 +38,12 @@ RSpec.describe Aldous::Controller::Action::ResultExecutionService do
   describe "#perform" do
     subject(:perform) {result_execution_service.perform}
 
-    it "fetches the action from the respondable" do
+    it "fetches the action from the complete respondable" do
       expect(respondable).to receive(:action).with(controller)
       perform
     end
 
-    it "executes the respondable action" do
+    it "executes the complete respondable action" do
       expect(action).to receive(:execute)
       perform
     end

data/spec/aldous/controller/action/wrapper_spec.rb

@@ -5,12 +5,13 @@ RSpec.describe Aldous::Controller::Action::Wrapper do
                             default_view_data: default_view_data,
                             preconditions: preconditions,
                             default_error_handler: default_error_handler,
-                            perform: nil,
-                            build_view: nil }
+                            view_builder: view_builder,
+                            perform: nil }
 
   let(:default_view_data) { {default_view_data: true} }
   let(:preconditions) { double 'preconditions' }
   let(:default_error_handler) {double 'default_error_handler'}
+  let(:view_builder) {double 'view_builder'}
 
   before do
     allow(Aldous::LoggingWrapper).to receive(:log)
@@ -40,14 +41,14 @@ RSpec.describe Aldous::Controller::Action::Wrapper do
         let(:default_error_handler) {Aldous::Respondable::Renderable}
 
         it "builds a default error view with errors" do
-          expect(controller_action).to receive(:build_view).with(default_error_handler, errors: [e])
+          expect(view_builder).to receive(:build).with(default_error_handler, errors: [e])
           perform
         end
       end
 
       context "and the default error handler is not a respondable" do
         it "doesn't need to do anything" do
-          expect(controller_action).to_not receive(:build_view)
+          expect(default_error_handler).to_not receive(:build)
           perform
         end
       end

data/spec/aldous/controller/preconditions_execution_service_spec.rb

@@ -3,7 +3,8 @@ RSpec.describe Aldous::Controller::PreconditionsExecutionService do
 
   let(:controller) {double "controller"}
   let(:action_wrapper) {double 'action wrapper', preconditions: preconditions, controller_action: action}
-  let(:action) {double 'action'}
+  let(:action) {double 'action', view_builder: view_builder}
+  let(:view_builder) {double 'view_builder'}
 
   let(:preconditions) { [] }
 
@@ -21,8 +22,8 @@ RSpec.describe Aldous::Controller::PreconditionsExecutionService do
       let(:precondition_class) {double 'precondition_class', build: precondition}
       let(:precondition) {double "precondition", perform: nil}
 
-      it "builds the precondition with the controller_aciont" do
-        expect(precondition_class).to receive(:build).with(action)
+      it "builds the precondition with the controller_action" do
+        expect(precondition_class).to receive(:build).with(action, controller, view_builder)
         perform
       end
 

data/spec/aldous/controller_action_spec.rb

@@ -72,26 +72,4 @@ RSpec.describe Aldous::ControllerAction do
       expect(action.default_error_handler('foo')).to eq Aldous::View::Blank::HtmlView
     end
   end
-
-  describe "#build_view" do
-    before do
-      allow(Aldous::BuildRespondableService).to receive(:new).with(
-        view_context: view_context,
-        default_view_data: Hash.new,
-        respondable_class: respondable_class,
-        status: nil,
-        extra_data: extra_data
-      ).and_return(build_respondable_service)
-    end
-
-    let(:respondable_class) {double "respondable_class"}
-    let(:extra_data) { {hello: 1} }
-
-    let(:build_respondable_service) {double "build_respondable_service", perform: nil}
-
-    it "executes the BuildRespondableService" do
-      expect(build_respondable_service).to receive(:perform)
-      action.build_view(respondable_class, extra_data)
-    end
-  end
 end

data/spec/aldous/{build_respondable_service_spec.rb → view_builder_spec.rb}

@@ -1,24 +1,18 @@
-RSpec.describe Aldous::BuildRespondableService do
-  let(:service) do
-    described_class.new(
-      view_context: view_context,
-      default_view_data: default_view_data,
-      respondable_class: respondable_class,
-      status: status,
-      extra_data: extra_data
-    )
-  end
+RSpec.describe Aldous::ViewBuilder do
+  let(:view_builder) { described_class.new(view_context, default_view_data) }
 
   let(:view_context)      { double "view_context" }
   let(:default_view_data) { {hello: 1} }
   let(:respondable_class) { double "respondable_class"}
-  let(:status)            { :foo }
   let(:extra_data)        { {world: 2} }
+  let(:status)            { :foo }
 
   let(:simple_dto) {instance_double(Aldous::SimpleDto)}
   let(:respondable_instance) {double "respondable_instance"}
 
-  describe "#perform" do
+  describe "#build" do
+    subject(:build) {view_builder.build(respondable_class, extra_data)}
+
     let(:view_data) { {hello: 1, world: 2} }
 
     before do
@@ -31,18 +25,18 @@ RSpec.describe Aldous::BuildRespondableService do
 
       it "creates a dto with the correct data" do
         expect(Aldous::SimpleDto).to receive(:new).with(view_data).and_return(simple_dto)
-        service.perform
+        build
       end
     end
 
     it "creates a dto with the correct data" do
       expect(Aldous::SimpleDto).to receive(:new).with(view_data).and_return(simple_dto)
-      service.perform
+      build
     end
 
     it "returns a respondable instance" do
-      expect(respondable_class).to receive(:new).with(status, simple_dto, view_context)
-      service.perform
+      expect(respondable_class).to receive(:new).with(nil, simple_dto, view_context)
+      build
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aldous
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alan Skorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,7 +202,6 @@ files:
 - examples/basic_todo/vendor/assets/javascripts/.keep
 - examples/basic_todo/vendor/assets/stylesheets/.keep
 - lib/aldous.rb
-- lib/aldous/build_respondable_service.rb
 - lib/aldous/configuration.rb
 - lib/aldous/controller.rb
 - lib/aldous/controller/action/precondition.rb
@@ -236,7 +235,7 @@ files:
 - lib/aldous/view/blank/atom_view.rb
 - lib/aldous/view/blank/html_view.rb
 - lib/aldous/view/blank/json_view.rb
-- spec/aldous/build_respondable_service_spec.rb
+- lib/aldous/view_builder.rb
 - spec/aldous/configuration_spec.rb
 - spec/aldous/controller/action/precondition/wrapper_spec.rb
 - spec/aldous/controller/action/precondition_spec.rb
@@ -269,6 +268,7 @@ files:
 - spec/aldous/view/blank/atom_view_spec.rb
 - spec/aldous/view/blank/html_view_spec.rb
 - spec/aldous/view/blank/json_view_spec.rb
+- spec/aldous/view_builder_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -290,12 +290,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails brave new world
 test_files:
-- spec/aldous/build_respondable_service_spec.rb
 - spec/aldous/configuration_spec.rb
 - spec/aldous/controller/action/precondition/wrapper_spec.rb
 - spec/aldous/controller/action/precondition_spec.rb
@@ -328,4 +327,5 @@ test_files:
 - spec/aldous/view/blank/atom_view_spec.rb
 - spec/aldous/view/blank/html_view_spec.rb
 - spec/aldous/view/blank/json_view_spec.rb
+- spec/aldous/view_builder_spec.rb
 - spec/spec_helper.rb

data/lib/aldous/build_respondable_service.rb

@@ -1,23 +0,0 @@
-require 'aldous/simple_dto'
-
-module Aldous
-  class BuildRespondableService
-    attr_reader :view_context, :default_view_data
-    attr_reader :respondable_class, :status, :extra_data
-
-    def initialize(view_context:, default_view_data:, respondable_class:, status: nil, extra_data: {})
-      @view_context = view_context
-      @default_view_data = default_view_data
-      @respondable_class = respondable_class
-      @status = status
-      @extra_data = extra_data
-    end
-
-    def perform
-      # we don't need the status as a local
-      actual_extra_data = extra_data.reject{|k, v| k == :status}
-      view_data = SimpleDto.new(default_view_data.merge(actual_extra_data))
-      respondable_class.new(status, view_data, view_context)
-    end
-  end
-end