much-rails 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b16874b1abd3bada37a15e501101bf2b1f3b0f49949e939078a06fe5df861ee
-  data.tar.gz: abf58e64838b2a14a2a2b3d243f6fb601dbe93fb1537f00a9cfca12e09c2c16a
+  metadata.gz: ba7d46f07c2592e152fe836a0cff5a7bf8061e9f531aac1c6a748f1365cc383b
+  data.tar.gz: 19e41c6e470a0021b6b78ea9c7eff7e6e530758d0522a591b4f8623b610f9fa2
 SHA512:
-  metadata.gz: 3a971f04f2f90b7c5adc8284d7fe7b6ff11a115d637183921c6bc2f12867e226f6ce741513068cf9418f6094778e9b2adf27e74fafaf11fcf3e621913271058f
-  data.tar.gz: c0ba8ef4a6242a9e0d1ccfe56d1d6b1a6aeec49f994e47e9d4c52553bc13f6311fe3f5e2a41ce7105c30b3d7bbac79f68399d6e2f75b5bbfbde85aad6d457b23
+  metadata.gz: 37bdf6aa9a624f270cd53e5ba22f3e400f331b9b91c29aed2c6169627350f9c49e2f929ff6b9bc83665c789953559f67f546c11fd4cc9660814b46f61bfb2bb9
+  data.tar.gz: eb78925cf707aef2f6484665963da6dee38f495cad04de680f7ea349292eae41b77bdd36f014b05a2e5fcda48e8c8d03b23485f60786020100794f4d1cb3c15f

data/lib/much-rails/action.rb

@@ -31,7 +31,7 @@ module MuchRails::Action
 
     add_config :much_rails_action
 
-    attr_reader :params, :current_session, :request, :errors
+    attr_reader :params, :request, :errors
   end
 
   mixin_class_methods do
@@ -112,9 +112,8 @@ module MuchRails::Action
   end
 
   mixin_instance_methods do
-    def initialize(params: nil, current_session: nil, request: nil)
+    def initialize(params: nil, request: nil)
       @params = params.to_h.with_indifferent_access
-      @current_session = current_session
       @request = request
       @errors = Hash.new{ |hash, key| hash[key] = [] }
     end
@@ -150,8 +149,17 @@ module MuchRails::Action
       @much_rails_successful_action
     end
 
+    def controller_session=(value)
+      @controller_session = value
+    end
+
     private
 
+    def controller_session
+      @controller_session ||=
+        request&.env&.[]("action_controller.instance")&.session
+    end
+
     def default_action_success_result
       MuchRails::Action::HeadResult.new(:ok)
     end

data/lib/much-rails/action/controller.rb

@@ -9,30 +9,31 @@ module MuchRails::Action; end
 # MuchRails::Action::Controller defines the behaviors for controllers processing
 # MuchRails::Actions.
 module MuchRails::Action::Controller
-  DEFAULT_ACTION_CLASS_FORMAT = :any
-
   include MuchRails::Mixin
 
+  def self.DEFAULT_ACTION_CLASS_FORMAT
+    :any
+  end
+
   mixin_included do
     attr_reader :much_rails_action_class
 
-    before_action(
+    prepend_before_action(
       :require_much_rails_action_class,
-      only: MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
+      only: MuchRails::Action::Router.CONTROLLER_CALL_ACTION_METHOD_NAME,
     )
     before_action :permit_all_much_rails_action_params
   end
 
   mixin_instance_methods do
     define_method(
-      MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
+      MuchRails::Action::Router.CONTROLLER_CALL_ACTION_METHOD_NAME,
     ) do
       respond_to do |format|
         format.public_send(much_rails_action_class_format) do
           result =
             much_rails_action_class.call(
               params: much_rails_action_params,
-              current_session: current_session,
               request: request,
             )
           instance_exec(result, &result.execute_block)
@@ -41,7 +42,7 @@ module MuchRails::Action::Controller
     end
 
     define_method(
-      MuchRails::Action::Router::CONTROLLER_NOT_FOUND_METHOD_NAME,
+      MuchRails::Action::Router.CONTROLLER_NOT_FOUND_METHOD_NAME,
     ) do
       respond_to do |format|
         format.html do
@@ -51,11 +52,12 @@ module MuchRails::Action::Controller
     end
 
     def much_rails_action_class_name
-      "::#{params[MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME]}"
+      "::#{params[MuchRails::Action::Router.ACTION_CLASS_PARAM_NAME]}"
     end
 
     def much_rails_action_class_format
-      much_rails_action_class.format || DEFAULT_ACTION_CLASS_FORMAT
+      much_rails_action_class.format ||
+      MuchRails::Action::Controller.DEFAULT_ACTION_CLASS_FORMAT
     end
 
     def much_rails_action_params
@@ -67,7 +69,7 @@ module MuchRails::Action::Controller
           params
             .to_h
             .except(
-              MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME,
+              MuchRails::Action::Router.ACTION_CLASS_PARAM_NAME,
               :controller,
               :action,
             ),

data/lib/much-rails/action/router.rb

@@ -6,10 +6,21 @@ module MuchRails; end
 module MuchRails::Action; end
 
 class MuchRails::Action::Router < MuchRails::Action::BaseRouter
-  DEFAULT_CONTROLLER_NAME = "application"
-  CONTROLLER_CALL_ACTION_METHOD_NAME = :much_rails_call_action
-  CONTROLLER_NOT_FOUND_METHOD_NAME = :much_rails_not_found
-  ACTION_CLASS_PARAM_NAME = :much_rails_action_class_name
+  def self.DEFAULT_CONTROLLER_NAME
+    "application"
+  end
+
+  def self.CONTROLLER_CALL_ACTION_METHOD_NAME
+    :much_rails_call_action
+  end
+
+  def self.CONTROLLER_NOT_FOUND_METHOD_NAME
+    :much_rails_not_found
+  end
+
+  def self.ACTION_CLASS_PARAM_NAME
+    :much_rails_action_class_name
+  end
 
   def self.url_class
     MuchRails::Action::Router::URL
@@ -38,7 +49,7 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
   def initialize(name = nil, controller_name: nil, &block)
     super(name, &block)
 
-    @controller_name = controller_name || DEFAULT_CONTROLLER_NAME
+    @controller_name = controller_name || self.class.DEFAULT_CONTROLLER_NAME
   end
 
   # Example:
@@ -49,8 +60,10 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
   #   end
   def apply_to(application_routes_draw_scope)
     validate!
-    draw_url_to   = "#{controller_name}##{CONTROLLER_NOT_FOUND_METHOD_NAME}"
-    draw_route_to = "#{controller_name}##{CONTROLLER_CALL_ACTION_METHOD_NAME}"
+    draw_url_to =
+      "#{controller_name}##{self.class.CONTROLLER_NOT_FOUND_METHOD_NAME}"
+    draw_route_to =
+      "#{controller_name}##{self.class.CONTROLLER_CALL_ACTION_METHOD_NAME}"
 
     definition_names = Set.new
 
@@ -63,7 +76,8 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
           as: (definition.name if definition_names.add?(definition.name)),
           defaults:
             definition.default_params.merge({
-              ACTION_CLASS_PARAM_NAME => request_type_action.class_name,
+              self.class.ACTION_CLASS_PARAM_NAME =>
+                request_type_action.class_name,
               "format" => request_type_action.format,
             }),
           constraints: request_type_action.constraints_lambda,
@@ -79,7 +93,8 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
         as: (definition.name if definition_names.add?(definition.name)),
         defaults:
           definition.default_params.merge({
-            ACTION_CLASS_PARAM_NAME => definition.default_action_class_name,
+            self.class.ACTION_CLASS_PARAM_NAME =>
+              definition.default_action_class_name,
             "format" => definition.default_action_format,
           }),
       )

data/lib/much-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuchRails
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/test/support/fake_action_controller.rb

@@ -13,20 +13,31 @@ module FakeActionController
   end
 
   mixin_class_methods do
-    def before_action(method_name, **)
-      before_actions << method_name
+    def before_action(*args, &block)
+      before_action_calls << Assert::StubCall.new(*args, &block)
     end
 
-    def before_actions
-      @before_actions ||= []
+    def prepend_before_action(*args, &block)
+      prepend_before_action_calls << Assert::StubCall.new(*args, &block)
+    end
+
+    def before_action_calls
+      @before_action_calls ||= []
+    end
+
+    def prepend_before_action_calls
+      @prepend_before_action_calls ||= []
     end
   end
 
   mixin_instance_methods do
     def initialize(params)
       @params = FakeParams.new(params)
-      self.class.before_actions.each do |before_action|
-        public_send(before_action)
+      self.class.prepend_before_action_calls.each do |before_action_call|
+        public_send(before_action_call.args.first)
+      end
+      self.class.before_action_calls.each do |before_action_call|
+        public_send(before_action_call.args.first)
       end
     end
 

data/test/unit/action/controller_tests.rb

@@ -17,8 +17,8 @@ module MuchRails::Action::Controller
       assert_that(subject).includes(MuchRails::Mixin)
     end
 
-    should "know its constants" do
-      assert_that(subject::DEFAULT_ACTION_CLASS_FORMAT).equals(:any)
+    should "know its attributes" do
+      assert_that(subject.DEFAULT_ACTION_CLASS_FORMAT).equals(:any)
     end
   end
 
@@ -29,6 +29,19 @@ module MuchRails::Action::Controller
     let(:receiver_class) do
       Class.new{ include FakeActionController }
     end
+
+    should "be configured as expected" do
+      assert_that(subject.prepend_before_action_calls.size).equals(1)
+      assert_that(subject.prepend_before_action_calls.last.args)
+        .equals([
+          :require_much_rails_action_class,
+          only: MuchRails::Action::Router.CONTROLLER_CALL_ACTION_METHOD_NAME,
+        ])
+
+      assert_that(subject.before_action_calls.size).equals(1)
+      assert_that(subject.before_action_calls.last.args)
+        .equals([:permit_all_much_rails_action_params])
+    end
   end
 
   class ReceiverInitTests < ReceiverTests
@@ -41,7 +54,7 @@ module MuchRails::Action::Controller
 
     let(:params1) do
       {
-        MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME => "Actions::Show",
+        MuchRails::Action::Router.ACTION_CLASS_PARAM_NAME => "Actions::Show",
         controller: "actions",
         action: "show",
         nested: {
@@ -53,10 +66,10 @@ module MuchRails::Action::Controller
     should have_readers :much_rails_action_class
 
     should have_imeths(
-      MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
+      MuchRails::Action::Router.CONTROLLER_CALL_ACTION_METHOD_NAME,
     )
     should have_imeths(
-      MuchRails::Action::Router::CONTROLLER_NOT_FOUND_METHOD_NAME,
+      MuchRails::Action::Router.CONTROLLER_NOT_FOUND_METHOD_NAME,
     )
     should have_imeths :much_rails_action_class_name
     should have_imeths :much_rails_action_class_format
@@ -69,7 +82,7 @@ module MuchRails::Action::Controller
         .equals("::Actions::Show")
 
       assert_that(subject.much_rails_action_class_format)
-        .equals(unit_module::DEFAULT_ACTION_CLASS_FORMAT)
+        .equals(unit_module.DEFAULT_ACTION_CLASS_FORMAT)
 
       assert_that(subject.much_rails_action_params)
         .equals(
@@ -91,7 +104,7 @@ module MuchRails::Action::Controller
 
     let(:params1) do
       {
-        MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME =>
+        MuchRails::Action::Router.ACTION_CLASS_PARAM_NAME =>
           "Actions::Unknown",
       }
     end

data/test/unit/action/router_tests.rb

@@ -16,17 +16,17 @@ class MuchRails::Action::Router
 
     should have_imeths :url_class
 
-    should "be a BaseRouter" do
+    should "be configured as expected" do
       assert_that(subject < MuchRails::Action::BaseRouter).is_true
     end
 
-    should "know its constants" do
-      assert_that(subject::DEFAULT_CONTROLLER_NAME).equals("application")
-      assert_that(subject::CONTROLLER_CALL_ACTION_METHOD_NAME)
+    should "know its attributes" do
+      assert_that(subject.DEFAULT_CONTROLLER_NAME).equals("application")
+      assert_that(subject.CONTROLLER_CALL_ACTION_METHOD_NAME)
         .equals(:much_rails_call_action)
-      assert_that(subject::CONTROLLER_NOT_FOUND_METHOD_NAME)
+      assert_that(subject.CONTROLLER_NOT_FOUND_METHOD_NAME)
         .equals(:much_rails_not_found)
-      assert_that(subject::ACTION_CLASS_PARAM_NAME)
+      assert_that(subject.ACTION_CLASS_PARAM_NAME)
         .equals(:much_rails_action_class_name)
       assert_that(subject.url_class).equals(unit_class::URL)
     end
@@ -64,7 +64,7 @@ class MuchRails::Action::Router
 
     should "know its attributes" do
       assert_that(subject.controller_name)
-        .equals(unit_class::DEFAULT_CONTROLLER_NAME)
+        .equals(unit_class.DEFAULT_CONTROLLER_NAME)
 
       router = unit_class.new(controller_name: controller_name1)
       assert_that(router.controller_name).equals(controller_name1)
@@ -99,13 +99,13 @@ class MuchRails::Action::Router
 
       expected_draw_url_to =
         "#{subject.controller_name}"\
-        "##{unit_class::CONTROLLER_NOT_FOUND_METHOD_NAME}"
+        "##{unit_class.CONTROLLER_NOT_FOUND_METHOD_NAME}"
       expected_draw_route_to =
         "#{subject.controller_name}"\
-        "##{unit_class::CONTROLLER_CALL_ACTION_METHOD_NAME}"
+        "##{unit_class.CONTROLLER_CALL_ACTION_METHOD_NAME}"
       expected_default_defaults =
         {
-          unit_class::ACTION_CLASS_PARAM_NAME => default_class_name,
+          unit_class.ACTION_CLASS_PARAM_NAME => default_class_name,
           "format" => :html,
         }
 
@@ -117,7 +117,7 @@ class MuchRails::Action::Router
           as: url_name,
           defaults:
             {
-              unit_class::ACTION_CLASS_PARAM_NAME => request_type_class_name,
+              unit_class.ACTION_CLASS_PARAM_NAME => request_type_class_name,
               "format" => :html,
             },
           constraints: request_type_proc,

data/test/unit/action/unprocessable_entity_result_tests.rb

@@ -20,7 +20,7 @@ class MuchRails::Action::UnprocessableEntityResult
     let(:controller1){ FakeController.new(params1) }
     let(:params1) do
       {
-        MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME => "Actions::Show",
+        MuchRails::Action::Router.ACTION_CLASS_PARAM_NAME => "Actions::Show",
       }
     end
     let(:errors1) do

data/test/unit/action_tests.rb

@@ -176,11 +176,7 @@ module MuchRails::Action
   class InitTests < ReceiverTests
     desc "when init"
     subject do
-      receiver_class.new(
-        params: params1,
-        current_session: current_session1,
-        request: request1,
-      )
+      receiver_class.new(params: params1, request: request1)
     end
 
     let(:receiver_class) do
@@ -218,6 +214,10 @@ module MuchRails::Action
         on_after_call do
           @after_call_called = true
         end
+
+        def action_controller_session
+          controller_session
+        end
       end
     end
 
@@ -234,16 +234,41 @@ module MuchRails::Action
         active: "true",
       }
     end
-    let(:current_session1){ "CURRENT SESSION 1" }
-    let(:request1){ "REQUEST 1" }
+    let(:request1){ FakeRequest.new }
 
-    should have_readers :params, :current_session, :request, :errors
+    should have_readers :params, :request, :errors
+    should have_writers :controller_session
     should have_imeths :on_call, :valid_action?, :successful_action?
 
     should "know its attributes" do
       assert_that(subject.params).equals(params1.with_indifferent_access)
-      assert_that(subject.current_session).equals(current_session1)
       assert_that(subject.request).equals(request1)
+      assert_that(subject.action_controller_session).is_a(FakeSession)
+
+      receiver = receiver_class.new(params: params1)
+      assert_that(receiver.action_controller_session).is_nil
+
+      controller_session = FakeRequest.new
+      receiver.controller_session = controller_session
+      assert_that(receiver.action_controller_session).is(controller_session)
+
+      receiver =
+        receiver_class.new(params: params1, request: FakeRequestWithNoEnv.new)
+      assert_that(receiver.action_controller_session).is_nil
+
+      receiver =
+        receiver_class.new(
+          params: params1,
+          request: FakeRequestWithNoControllerInstance.new,
+        )
+      assert_that(receiver.action_controller_session).is_nil
+
+      receiver =
+        receiver_class.new(
+          params: params1,
+          request: FakeRequestWithNoControllerInstance.new,
+        )
+      assert_that(receiver.action_controller_session).is_nil
     end
 
     should "return the expected Result" do
@@ -409,4 +434,31 @@ module MuchRails::Action
       assert_that(result.errors[:custom_validation]).includes("ERROR1")
     end
   end
+
+  class FakeController
+    def session
+      FakeSession.new
+    end
+  end
+
+  class FakeSession
+  end
+
+  class FakeRequest
+    def env
+      { "action_controller.instance" => FakeController.new }
+    end
+  end
+
+  class FakeRequestWithNoControllerInstance
+    def env
+      { "action_controller.instance" => nil }
+    end
+  end
+
+  class FakeRequestWithNoEnv
+    def env
+      nil
+    end
+  end
 end

data/test/unit/change_action_tests.rb

@@ -57,14 +57,7 @@ module MuchRails::ChangeAction
 
   class InitTests < ReceiverTests
     desc "when init"
-    subject{ receiver_class.new(params: {}) }
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     setup do
       Assert.stub(subject, :any_unextracted_change_result_validation_errors?) do
@@ -84,13 +77,7 @@ module MuchRails::ChangeAction
 
   class RecordErrorsWithResultExceptionTests < InitTests
     desc "with record errors and a result exception"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     setup do
       Assert.stub(subject, :any_unextracted_change_result_validation_errors?) do
@@ -118,13 +105,7 @@ module MuchRails::ChangeAction
 
   class RecordErrorsWithNoResultExceptionTests < InitTests
     desc "with record errors and no result exception"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     setup do
       Assert.stub(subject, :any_unextracted_change_result_validation_errors?) do
@@ -149,13 +130,7 @@ module MuchRails::ChangeAction
 
   class ChangeResultMethodTests < InitTests
     desc "#change_result method"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     should "memoize and return the expected Result" do
       result = subject.change_result
@@ -178,13 +153,7 @@ module MuchRails::ChangeAction
 
   class AnyUnextractedChangeResultValidationErrorsMethodTests < ReceiverTests
     desc "#any_unextracted_change_result_validation_errors? method"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     let(:receiver_class) do
       Class.new do
@@ -205,13 +174,7 @@ module MuchRails::ChangeAction
   class NoValidationErrorsTests <
           AnyUnextractedChangeResultValidationErrorsMethodTests
     desc "with no validation errors"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     let(:receiver_class) do
       Class.new do
@@ -232,13 +195,7 @@ module MuchRails::ChangeAction
   class ValidationErrorsTests <
           AnyUnextractedChangeResultValidationErrorsMethodTests
     desc "with validation errors"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     let(:receiver_class) do
       Class.new do

data/test/unit/destroy_action_tests.rb

@@ -50,13 +50,7 @@ module MuchRails::DestroyAction
 
   class InitTests < ReceiverTests
     desc "when init"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     should have_imeths :destroy_result
 

data/test/unit/save_action_tests.rb

@@ -50,13 +50,7 @@ module MuchRails::SaveAction
 
   class InitTests < ReceiverTests
     desc "when init"
-    subject do
-      receiver_class.new(
-        params: {},
-        current_session: nil,
-        request: nil,
-      )
-    end
+    subject{ receiver_class.new(params: {}, request: nil) }
 
     should have_imeths :save_result
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide