much-rails 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604eda47d3d5c2f66e52716269d3652f8799c022187829e83c2815fcf22dfd11
-  data.tar.gz: f765d10688da5b2a2aeb8827532806cf2c92a2bdf54fe8aedb2bcefc8304ffae
+  metadata.gz: 8a66a39e5898e5491c562aed8a32fb4036382a3d62485e71d45d8c946d18f622
+  data.tar.gz: ff4307e38c7d7d8115823189bd5d39d7799b3f4bcedc0fd5f3e39320215dfffe
 SHA512:
-  metadata.gz: 2170ba5582c6f6eb88011b2188bcd69f89c57b05d0df8a56ab26678ab52409cda999cac0b129d1606a70770414d067f09d3b7c8702df6e451f89c40bb9079452
-  data.tar.gz: a92cc7b6571d14e755ba60c4156c2daffe142c86c2204a60869c7d5f56130d7d265480884adc9a03dee4e90bdc07e148319593c53e900eefde62a32488c3bdf8
+  metadata.gz: 40877d371bdefb9fb77e370c5847a61becc905658ccaf2504066ed2092a4e0f3343e9fcf37e6e334e90155c14a6f13cea4bf1e0faaf7f893554e9b333f235ff7
+  data.tar.gz: 804743827c52ec702454bc5fed1999883ffaa8d7a0434c8266323f23d1fb231ed73bf2bec93b710d84797297c4cd58566209e0ba1fba09f7eb3a8cb9997a9417

data/lib/much-rails/action.rb

@@ -31,7 +31,7 @@ module MuchRails::Action
 
     add_config :much_rails_action
 
-    attr_reader :params, :current_user, :request, :errors
+    attr_reader :params, :current_session, :request, :errors
   end
 
   mixin_class_methods do
@@ -107,17 +107,14 @@ module MuchRails::Action
 
     def default_action_template_name
       @default_action_template_name ||=
-        to_s
-          .remove(/\A#{MuchRails.config.action.namespace}/)
-          .tableize
-          .singularize
+        to_s.remove(/\A#{MuchRails.config.action.namespace}/).underscore
     end
   end
 
   mixin_instance_methods do
-    def initialize(params: nil, current_user: nil, request: nil)
+    def initialize(params: nil, current_session: nil, request: nil)
       @params = params.to_h.with_indifferent_access
-      @current_user = current_user
+      @current_session = current_session
       @request = request
       @errors = Hash.new{ |hash, key| hash[key] = [] }
     end
@@ -257,6 +254,10 @@ module MuchRails::Action
           template: template || default_action_template_name,
         }.merge(**kargs)
 
+      if view_model&.respond_to?(:much_rails_action=)
+        view_model.much_rails_action = self
+      end
+
       @much_rails_action_result =
         MuchRails::Action::RenderResult.new(view_model, *args, **result_kargs)
       halt

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

@@ -149,7 +149,7 @@ class MuchRails::Action::BaseRouter
   #       get    "/new",    "Root::New"
   #       post   "/",       "Root::Create"
   #       get    "/edit",   "Root::Edit"
-  #       put    "/",       "Root::Update"
+  #       put    "/",       "Root::Upsert"
   #       patch  "/",       "Root::Update"
   #       get    "/remove", "Root::Remove"
   #       delete "/",       "Root::Destroy"
@@ -301,6 +301,14 @@ class MuchRails::Action::BaseRouter
       def constraints_lambda
         request_type.constraints_lambda
       end
+
+      def class_constant
+        @class_constant ||= class_name.constantize
+      end
+
+      def format
+        class_constant.format
+      end
     end
 
   class URLSet
@@ -460,6 +468,16 @@ class MuchRails::Action::BaseRouter
       !@default_action_class_name.nil?
     end
 
+    def default_action_class_constant
+      return unless has_default_action_class_name?
+
+      @default_action_class_constant ||= default_action_class_name.constantize
+    end
+
+    def default_action_format
+      default_action_class_constant&.format
+    end
+
     def ==(other)
       return super unless other.is_a?(self.class)
 

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

@@ -32,7 +32,7 @@ module MuchRails::Action::Controller
           result =
             much_rails_action_class.call(
               params: much_rails_action_params,
-              current_user: current_user,
+              current_session: current_session,
               request: request,
             )
           instance_exec(result, &result.execute_block)

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

@@ -52,16 +52,19 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
     draw_url_to   = "#{controller_name}##{CONTROLLER_NOT_FOUND_METHOD_NAME}"
     draw_route_to = "#{controller_name}##{CONTROLLER_CALL_ACTION_METHOD_NAME}"
 
+    definition_names = Set.new
+
     definitions.each do |definition|
       definition.request_type_actions.each do |request_type_action|
         application_routes_draw_scope.public_send(
           definition.http_method,
           definition.path,
           to: draw_route_to,
-          as: definition.name,
+          as: (definition.name if definition_names.add?(definition.name)),
           defaults:
             definition.default_params.merge({
               ACTION_CLASS_PARAM_NAME => request_type_action.class_name,
+              "format" => request_type_action.format,
             }),
           constraints: request_type_action.constraints_lambda,
         )
@@ -73,10 +76,11 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
         definition.http_method,
         definition.path,
         to: draw_route_to,
-        as: definition.name,
+        as: (definition.name if definition_names.add?(definition.name)),
         defaults:
           definition.default_params.merge({
             ACTION_CLASS_PARAM_NAME => definition.default_action_class_name,
+            "format" => definition.default_action_format,
           }),
       )
     end

data/lib/much-rails/version.rb

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

data/test/support/actions/show.rb

@@ -7,5 +7,7 @@ module Actions; end
 module Actions::Show
   include MuchRails::Action
 
+  format :html
+
   params_root :nested
 end

data/test/unit/action/base_router_tests.rb

@@ -296,20 +296,30 @@ class MuchRails::Action::BaseRouter
     desc "when init"
     subject{ request_type_action_class.new(request_type1, action_class_name1) }
 
+    setup do
+      Assert.stub(action_class_name1, :constantize){ action_class1 }
+    end
+
     let(:name1){ Factory.symbol }
     let(:constraints_lambda1){ ->(request){} }
     let(:request_type1) do
       unit_class::RequestType.new(name1, constraints_lambda1)
     end
     let(:action_class_name1){ Factory.string }
+    let(:action_class1) do
+      Struct.new(:format).new([:html, :any].sample)
+    end
 
     should have_imeths :request_type, :class_name, :constraints_lambda
+    should have_imeths :class_constant, :format
 
     should "know its attributes" do
       assert_that(subject.request_type).equals(request_type1)
       assert_that(subject.class_name).equals(action_class_name1)
       assert_that(subject.constraints_lambda)
         .equals(request_type1.constraints_lambda)
+      assert_that(subject.class_constant).equals(action_class1)
+      assert_that(subject.format).equals(subject.class_constant.format)
     end
   end
 
@@ -506,6 +516,15 @@ class MuchRails::Action::BaseRouter
       )
     end
 
+    setup do
+      Assert.stub(default_action_class_name1, :constantize) do
+        default_action_class1
+      end
+    end
+
+    let(:default_action_class1) do
+      Struct.new(:format).new([:html, :any].sample)
+    end
     let(:default_params1) do
       { Factory.string => Factory.string }
     end
@@ -514,6 +533,7 @@ class MuchRails::Action::BaseRouter
     should have_readers :default_action_class_name, :request_type_actions
     should have_readers :called_from
     should have_imeths :path, :name, :has_default_action_class_name?
+    should have_imeths :default_action_class_constant, :default_action_format
 
     should "know its attributes" do
       assert_that(subject.http_method).equals(http_method1)
@@ -525,6 +545,10 @@ class MuchRails::Action::BaseRouter
       assert_that(subject.called_from).equals(caller1)
       assert_that(subject.path).equals(url_path1)
       assert_that(subject.name).equals(url_name1)
+      assert_that(subject.default_action_class_constant)
+        .equals(default_action_class1)
+      assert_that(subject.default_action_format)
+        .equals(subject.default_action_class_constant.format)
     end
   end
 end

data/test/unit/action/controller_tests.rb

@@ -35,6 +35,10 @@ module MuchRails::Action::Controller
     desc "when init"
     subject{ receiver_class.new(params1) }
 
+    setup do
+      Assert.stub(::Actions::Show, :format){ nil }
+    end
+
     let(:params1) do
       {
         MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME => "Actions::Show",
@@ -75,10 +79,9 @@ module MuchRails::Action::Controller
 
       assert_that(subject.much_rails_action_class).equals(Actions::Show)
 
-      Actions::Show.format(:html)
+      Assert.stub(::Actions::Show, :format){ :html }
       receiver = receiver_class.new(params1)
       assert_that(receiver.much_rails_action_class_format).equals(:html)
-      Actions::Show.format(nil)
     end
   end
 

data/test/unit/action/router_tests.rb

@@ -104,7 +104,10 @@ class MuchRails::Action::Router
         "#{subject.controller_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,
+        }
 
       assert_that(application_routes.get_calls.size).equals(3)
       assert_that(application_routes.get_calls[0].pargs).equals([url_path])
@@ -113,14 +116,17 @@ class MuchRails::Action::Router
           to: expected_draw_route_to,
           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,
         )
       assert_that(application_routes.get_calls[1].pargs).equals([url_path])
       assert_that(application_routes.get_calls[1].kargs)
         .equals(
           to: expected_draw_route_to,
-          as: url_name,
+          as: nil,
           defaults: expected_default_defaults,
         )
       assert_that(application_routes.get_calls[2].pargs).equals([url2_path])
@@ -135,7 +141,7 @@ class MuchRails::Action::Router
       assert_that(application_routes.post_calls.last.kargs)
         .equals(
           to: expected_draw_route_to,
-          as: url_name,
+          as: nil,
           defaults: expected_default_defaults,
         )
 
@@ -153,7 +159,7 @@ class MuchRails::Action::Router
       assert_that(application_routes.patch_calls.last.kargs)
         .equals(
           to: expected_draw_route_to,
-          as: url_name,
+          as: nil,
           defaults: expected_default_defaults,
         )
 
@@ -162,7 +168,7 @@ class MuchRails::Action::Router
       assert_that(application_routes.delete_calls.last.kargs)
         .equals(
           to: expected_draw_route_to,
-          as: url_name,
+          as: nil,
           defaults: expected_default_defaults,
         )
     end

data/test/unit/action_tests.rb

@@ -167,7 +167,7 @@ module MuchRails::Action
       assert_that(subject.default_action_template_name)
         .equals(
           "some/namespace/for/"\
-          "#{MuchRails.config.action.namespace.tableize.singularize}"\
+          "#{MuchRails.config.action.namespace.underscore}"\
           "thing/show",
         )
     end
@@ -178,7 +178,7 @@ module MuchRails::Action
     subject do
       receiver_class.new(
         params: params1,
-        current_user: current_user1,
+        current_session: current_session1,
         request: request1,
       )
     end
@@ -234,15 +234,15 @@ module MuchRails::Action
         active: "true",
       }
     end
-    let(:current_user1){ "CURRENT USER 1" }
+    let(:current_session1){ "CURRENT SESSION 1" }
     let(:request1){ "REQUEST 1" }
 
-    should have_readers :params, :current_user, :request, :errors
+    should have_readers :params, :current_session, :request, :errors
     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_user).equals(current_user1)
+      assert_that(subject.current_session).equals(current_session1)
       assert_that(subject.request).equals(request1)
     end
 
@@ -318,6 +318,7 @@ module MuchRails::Action
           layout: false,
         )
 
+      view_model = Object.new
       receiver_class.on_call do
         render(view_model, "some/view/template", layout: false)
       end
@@ -330,18 +331,29 @@ module MuchRails::Action
           layout: false,
         )
 
+      view_model =
+        Class
+          .new{
+            def much_rails_action
+              "NOT A MUCH RAILS ACTION"
+            end
+          }
+          .new
       receiver_class.on_call do
         render(view_model, "some/view/template", template: "other/template")
       end
       action = receiver_class.new(params: params1)
       result = action.call
       assert_that(result.render_view_model).is(view_model)
+      assert_that(result.render_view_model.much_rails_action).is_not(action)
       assert_that(result.render_kargs).equals(template: "other/template")
 
+      view_model = Struct.new(:much_rails_action).new(nil)
       receiver_class.on_call{ render(view_model, template: "other/template") }
       action = receiver_class.new(params: params1)
       result = action.call
       assert_that(result.render_view_model).is(view_model)
+      assert_that(result.render_view_model.much_rails_action).is(action)
       assert_that(result.render_kargs).equals(template: "other/template")
     end
 

data/test/unit/change_action_tests.rb

@@ -61,7 +61,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -87,7 +87,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -121,7 +121,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -152,7 +152,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -181,7 +181,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -208,7 +208,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end
@@ -235,7 +235,7 @@ module MuchRails::ChangeAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end

data/test/unit/destroy_action_tests.rb

@@ -53,7 +53,7 @@ module MuchRails::DestroyAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end

data/test/unit/save_action_tests.rb

@@ -53,7 +53,7 @@ module MuchRails::SaveAction
     subject do
       receiver_class.new(
         params: {},
-        current_user: nil,
+        current_session: nil,
         request: nil,
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide