much-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf08e9a5f11a8a2597b17d7aa796d5e749fba3197e9d342b45e230d818d7fc8
-  data.tar.gz: 794522b0a10b417994189c85599f9fbd4106c1ad002b4b04d3bfe8a788bd4951
+  metadata.gz: 0172aa43ad656d16da5f3becf0dc3792488c920453799ab14d69281a6db8799c
+  data.tar.gz: e7e6d23911c2525703639b38d5f2f8974d048e4c953ddb9b8bd77e37aacbdcdf
 SHA512:
-  metadata.gz: b53df073f7f24299b154a06d16dc94ef01fce26e719065201efa523d683f52c5a65a8c2570a3542ae595e43d91a94a6d4df2d486d6fba5141d3120e9ac6e244e
-  data.tar.gz: 381f52f7be00bba2d90da5904a998d450d6077461e7f6d85fffd49fd749512d073759e9827db4f6db0ae2eaf38c1dc78044a35b69fe4a80ee550472c380fa905
+  metadata.gz: 897a07060cecba2fab179514b8aa1d116a51bef41477486dc9ca0e10a63e0cfaaf75680a2b99bcad1aa36e7670d5b5e3f678cb97a4f2bf004da0303cf918c9b5
+  data.tar.gz: ad74dbf2040de64bb85d70c89f5729635cb947ab9d6efb38dfa8249a109097c3416a08e5923dde311edf8c07373cde3e0af7502166d5449c393d973f588e09b2

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

@@ -19,6 +19,7 @@ class MuchRails::Action::BaseRouter
     @request_type_set = RequestTypeSet.new
     @url_set = URLSet.new(self)
     @definitions = []
+    @defined_urls = []
 
     @base_url = DEFAULT_BASE_URL
     instance_exec(&(block || proc{}))
@@ -28,6 +29,10 @@ class MuchRails::Action::BaseRouter
     self.class.url_class
   end
 
+  def unrouted_urls
+    @url_set.urls - @defined_urls
+  end
+
   def validate!
     definitions.each do |definition|
       definition.request_type_actions.each do |request_type_action|
@@ -240,15 +245,22 @@ class MuchRails::Action::BaseRouter
           acc
         end
 
-    Definition
-      .for_route(
+    add_definition(
+      Definition.for_route(
         http_method: http_method,
         url: url,
         default_action_class_name: default_class_name,
         request_type_actions: request_type_actions,
         called_from: called_from,
-      )
-      .tap{ |definition| @definitions << definition }
+      ),
+    )
+  end
+
+  def add_definition(definition)
+    @definitions << definition
+    @defined_urls << definition.url
+
+    definition
   end
 
   class RequestTypeSet
@@ -301,6 +313,10 @@ class MuchRails::Action::BaseRouter
       @set.empty?
     end
 
+    def urls
+      @set.values
+    end
+
     def add(name, path)
       url = @router.url_class.new(@router, path, name.to_sym)
       key = url.name
@@ -406,35 +422,40 @@ class MuchRails::Action::BaseRouter
           called_from:)
       new(
         http_method: http_method,
-        path: url.path,
-        name: url.name,
+        url: url,
         default_action_class_name: default_action_class_name,
         request_type_actions: request_type_actions,
         called_from: called_from,
       )
     end
 
-    attr_reader :http_method, :path, :name, :default_params
+    attr_reader :http_method, :url, :default_params
     attr_reader :default_action_class_name, :request_type_actions
     attr_reader :called_from
 
     def initialize(
           http_method:,
-          path:,
-          name:,
+          url:,
           default_action_class_name:,
           request_type_actions:,
           called_from:,
           default_params: nil)
       @http_method = http_method
-      @path = path
-      @name = name
+      @url = url
       @default_params = default_params || {}
       @default_action_class_name = default_action_class_name
       @request_type_actions = request_type_actions || []
       @called_from = called_from
     end
 
+    def name
+      @url.name
+    end
+
+    def path
+      @url.path
+    end
+
     def has_default_action_class_name?
       !@default_action_class_name.nil?
     end
@@ -443,8 +464,7 @@ class MuchRails::Action::BaseRouter
       return super unless other.is_a?(self.class)
 
       @http_method == other.http_method &&
-      @path == other.path &&
-      @name == other.name &&
+      @url == other.url &&
       @default_params == other.default_params &&
       @default_action_class_name ==
         other.default_action_class_name &&

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

@@ -14,12 +14,17 @@ module MuchRails::Action::Controller
   mixin_included do
     attr_reader :much_rails_action_class
 
-    before_action :require_much_rails_action_class
+    before_action(
+      :require_much_rails_action_class,
+      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_METHOD_NAME) do
+    define_method(
+      MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
+    ) do
       respond_to do |format|
         format.public_send(much_rails_action_class.format) do
           result =
@@ -33,6 +38,16 @@ module MuchRails::Action::Controller
       end
     end
 
+    define_method(
+      MuchRails::Action::Router::CONTROLLER_NOT_FOUND_METHOD_NAME,
+    ) do
+      respond_to do |format|
+        format.html do
+          head :not_found
+        end
+      end
+    end
+
     def much_rails_action_class_name
       "::#{params[MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME]}"
     end

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

@@ -7,7 +7,8 @@ module MuchRails::Action; end
 
 class MuchRails::Action::Router < MuchRails::Action::BaseRouter
   DEFAULT_CONTROLLER_NAME = "application"
-  CONTROLLER_METHOD_NAME = :much_rails_call_action
+  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.url_class
@@ -48,7 +49,8 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
   #   end
   def apply_to(application_routes_draw_scope)
     validate!
-    draw_route_to = "#{controller_name}##{CONTROLLER_METHOD_NAME}"
+    draw_url_to   = "#{controller_name}##{CONTROLLER_NOT_FOUND_METHOD_NAME}"
+    draw_route_to = "#{controller_name}##{CONTROLLER_CALL_ACTION_METHOD_NAME}"
 
     definitions.each do |definition|
       definition.request_type_actions.each do |request_type_action|
@@ -78,6 +80,12 @@ class MuchRails::Action::Router < MuchRails::Action::BaseRouter
           }),
       )
     end
+
+    # Draw each URL that doesn't have a route definition so that we can generate
+    # them using MuchRails::RailsRoutes.
+    unrouted_urls.each do |url|
+      application_routes_draw_scope.get(url.path, to: draw_url_to, as: url.name)
+    end
   end
   alias_method :draw, :apply_to
 

data/lib/much-rails/version.rb

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

data/much-rails.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = "~> 2.5"
 
   gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
-  gem.add_development_dependency("assert",           ["~> 2.19.4"])
+  gem.add_development_dependency("assert",           ["~> 2.19.5"])
   gem.add_development_dependency("rails",            ["> 5.0", "< 7.0"])
 
   gem.add_dependency("activerecord",   ["> 5.0", "< 7.0"])

data/test/support/fake_action_controller.rb

@@ -13,7 +13,7 @@ module FakeActionController
   end
 
   mixin_class_methods do
-    def before_action(method_name)
+    def before_action(method_name, **)
       before_actions << method_name
     end
 

data/test/unit/action/base_router_tests.rb

@@ -52,7 +52,7 @@ class MuchRails::Action::BaseRouter
     should have_readers :name
     should have_readers :request_type_set, :url_set, :definitions
 
-    should have_imeths :url_class, :apply_to
+    should have_imeths :url_class, :unrouted_urls, :apply_to
     should have_imeths :path_for, :url_for
     should have_imeths :request_type
     should have_imeths :base_url, :url
@@ -62,6 +62,7 @@ class MuchRails::Action::BaseRouter
       assert_that(subject.name).is_nil
       assert_that(subject.request_type_set).is_empty
       assert_that(subject.url_set).is_empty
+      assert_that(subject.unrouted_urls).is_empty
       assert_that(subject.definitions).is_empty
       assert_that(subject.base_url).equals(unit_class::DEFAULT_BASE_URL)
       assert_that(subject.url_class).equals(unit_class.url_class)
@@ -106,6 +107,7 @@ class MuchRails::Action::BaseRouter
       assert_that(subject.url_set).is_not_empty
       assert_that(url).is_kind_of(subject.url_class)
       assert_that(@url_set_add_call.args).equals([:url1, path])
+      assert_that(subject.unrouted_urls).equals([url])
 
       ex =
         assert_that{ subject.url(:url2.to_s, Factory.url) }
@@ -338,13 +340,14 @@ class MuchRails::Action::BaseRouter
 
     let(:router1){ unit_class.new }
 
-    should have_imeths :empty?, :add, :fetch, :path_for, :url_for
+    should have_imeths :empty?, :urls, :add, :fetch, :path_for, :url_for
 
     should "add URLs" do
       assert_that(subject).is_empty
 
       url = subject.add(:url1.to_s, path = Factory.url)
       assert_that(subject).is_not_empty
+      assert_that(subject.urls).equals([url])
       assert_that(url).is_kind_of(router1.url_class)
       assert_that(@url_new_call.args).equals([router1, path, :url1])
 
@@ -472,8 +475,7 @@ class MuchRails::Action::BaseRouter
       definition1 =
         definition_class.new(
           http_method: http_method1,
-          path: url_path1,
-          name: url_name1,
+          url: url1,
           default_action_class_name: default_action_class_name1,
           request_type_actions: request_type_actions1,
           called_from: caller1,
@@ -496,8 +498,7 @@ class MuchRails::Action::BaseRouter
     subject do
       definition_class.new(
         http_method: http_method1,
-        path: url_path1,
-        name: url_name1,
+        url: url1,
         default_action_class_name: default_action_class_name1,
         request_type_actions: request_type_actions1,
         default_params: default_params1,
@@ -509,19 +510,21 @@ class MuchRails::Action::BaseRouter
       { Factory.string => Factory.string }
     end
 
-    should have_readers :http_method, :path, :name, :default_params
+    should have_readers :http_method, :url, :default_params
     should have_readers :default_action_class_name, :request_type_actions
-    should have_reader :called_from
+    should have_readers :called_from
+    should have_imeths :path, :name, :has_default_action_class_name?
 
     should "know its attributes" do
       assert_that(subject.http_method).equals(http_method1)
-      assert_that(subject.path).equals(url_path1)
-      assert_that(subject.name).equals(url_name1)
+      assert_that(subject.url).equals(url1)
       assert_that(subject.default_params).equals(default_params1)
       assert_that(subject.default_action_class_name)
         .equals(default_action_class_name1)
       assert_that(subject.request_type_actions).equals(request_type_actions1)
       assert_that(subject.called_from).equals(caller1)
+      assert_that(subject.path).equals(url_path1)
+      assert_that(subject.name).equals(url_name1)
     end
   end
 end

data/test/unit/action/controller_tests.rb

@@ -44,7 +44,12 @@ module MuchRails::Action::Controller
 
     should have_readers :much_rails_action_class
 
-    should have_imeths MuchRails::Action::Router::CONTROLLER_METHOD_NAME
+    should have_imeths(
+      MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
+    )
+    should have_imeths(
+      MuchRails::Action::Router::CONTROLLER_NOT_FOUND_METHOD_NAME,
+    )
     should have_imeths :much_rails_action_class_name
     should have_imeths :much_rails_action_params
     should have_imeths :require_much_rails_action_class

data/test/unit/action/router_tests.rb

@@ -22,8 +22,10 @@ class MuchRails::Action::Router
 
     should "know its constants" do
       assert_that(subject::DEFAULT_CONTROLLER_NAME).equals("application")
-      assert_that(subject::CONTROLLER_METHOD_NAME)
+      assert_that(subject::CONTROLLER_CALL_ACTION_METHOD_NAME)
         .equals(:much_rails_call_action)
+      assert_that(subject::CONTROLLER_NOT_FOUND_METHOD_NAME)
+        .equals(:much_rails_not_found)
       assert_that(subject::ACTION_CLASS_PARAM_NAME)
         .equals(:much_rails_action_class_name)
       assert_that(subject.url_class).equals(unit_class::URL)
@@ -88,17 +90,25 @@ class MuchRails::Action::Router
       subject.patch(url_name, default_class_name)
       subject.delete(url_name, default_class_name)
 
+      url2_name = Factory.symbol
+      url2_path = Factory.url
+      subject.url(url2_name, url2_path)
+
       application_routes = FakeApplicationRoutes.new
       subject.draw(application_routes)
 
+      expected_draw_url_to =
+        "#{subject.controller_name}"\
+        "##{unit_class::CONTROLLER_NOT_FOUND_METHOD_NAME}"
       expected_draw_route_to =
-        "#{subject.controller_name}##{unit_class::CONTROLLER_METHOD_NAME}"
+        "#{subject.controller_name}"\
+        "##{unit_class::CONTROLLER_CALL_ACTION_METHOD_NAME}"
       expected_default_defaults =
         { unit_class::ACTION_CLASS_PARAM_NAME => default_class_name }
 
-      assert_that(application_routes.get_calls.size).equals(2)
-      assert_that(application_routes.get_calls.first.pargs).equals([url_path])
-      assert_that(application_routes.get_calls.first.kargs)
+      assert_that(application_routes.get_calls.size).equals(3)
+      assert_that(application_routes.get_calls[0].pargs).equals([url_path])
+      assert_that(application_routes.get_calls[0].kargs)
         .equals(
           to: expected_draw_route_to,
           as: url_name,
@@ -106,13 +116,19 @@ class MuchRails::Action::Router
             { unit_class::ACTION_CLASS_PARAM_NAME => request_type_class_name },
           constraints: request_type_proc,
         )
-      assert_that(application_routes.get_calls.last.pargs).equals([url_path])
-      assert_that(application_routes.get_calls.last.kargs)
+      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,
           defaults: expected_default_defaults,
         )
+      assert_that(application_routes.get_calls[2].pargs).equals([url2_path])
+      assert_that(application_routes.get_calls[2].kargs)
+        .equals(
+          to: expected_draw_url_to,
+          as: url2_name,
+        )
 
       assert_that(application_routes.post_calls.size).equals(1)
       assert_that(application_routes.post_calls.last.pargs).equals([url_path])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.4
+        version: 2.19.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.4
+        version: 2.19.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement