much-rails 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0172aa43ad656d16da5f3becf0dc3792488c920453799ab14d69281a6db8799c
-  data.tar.gz: e7e6d23911c2525703639b38d5f2f8974d048e4c953ddb9b8bd77e37aacbdcdf
+  metadata.gz: 65f11e22f8ed34e4bd1e940584390a1487e1c69d2c35d6641fb6352fc6179d4f
+  data.tar.gz: 1824ade309dee8f599074986d52b120d3fcecc79ba302f725500177d353274bd
 SHA512:
-  metadata.gz: 897a07060cecba2fab179514b8aa1d116a51bef41477486dc9ca0e10a63e0cfaaf75680a2b99bcad1aa36e7670d5b5e3f678cb97a4f2bf004da0303cf918c9b5
-  data.tar.gz: ad74dbf2040de64bb85d70c89f5729635cb947ab9d6efb38dfa8249a109097c3416a08e5923dde311edf8c07373cde3e0af7502166d5449c393d973f588e09b2
+  metadata.gz: c0c4c70fbaeec9574a8b66465fbf11668242a521d9693a52f8f7f737558e28ed04a77047c6d634ebed576266fc5f5b4c065dd729a02108cadb07bce05f87bb86
+  data.tar.gz: 630142f5702e5ad4694a758ded2c8eff9487a19acc0c8611075fd606f0ada5e0d8e486ef7ff0003e28b128d8ce0e8ce80bbe26d4e0cf89dd630b6b780a6114cc

data/lib/much-rails.rb

@@ -46,6 +46,14 @@ module MuchRails
     add_instance_config :action, method_name: :action
     add_instance_config :layout, method_name: :layout
 
+    def add_save_service_validation_error(exception_class, &block)
+      MuchRails::SaveService::ValidationErrors.add(exception_class, &block)
+    end
+
+    def add_destroy_service_validation_error(exception_class, &block)
+      MuchRails::DestroyService::ValidationErrors.add(exception_class, &block)
+    end
+
     class ActionConfig
       attr_accessor :namespace
       attr_accessor :sanitized_exception_classes

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

@@ -9,6 +9,8 @@ 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
 
   mixin_included do
@@ -26,7 +28,7 @@ module MuchRails::Action::Controller
       MuchRails::Action::Router::CONTROLLER_CALL_ACTION_METHOD_NAME,
     ) do
       respond_to do |format|
-        format.public_send(much_rails_action_class.format) do
+        format.public_send(much_rails_action_class_format) do
           result =
             much_rails_action_class.call(
               params: much_rails_action_params,
@@ -52,6 +54,10 @@ module MuchRails::Action::Controller
       "::#{params[MuchRails::Action::Router::ACTION_CLASS_PARAM_NAME]}"
     end
 
+    def much_rails_action_class_format
+      much_rails_action_class.format || DEFAULT_ACTION_CLASS_FORMAT
+    end
+
     def much_rails_action_params
       # If a `params_root` value is specified, pull the params from that key and
       # merge them into the base params.

data/lib/much-rails/assets.rb

@@ -12,20 +12,16 @@ end
 module MuchRails::Assets
   def self.configure_for_rails(rails)
     MuchRails::Assets.configure do |config|
-      # Cache fingerprints in memory for performance gains.
-      config.fingerprint_cache MuchRails::Assets::MemCache.new
-
-      # Cache compiled content in memory in development/test for performance
-      # gains since we aren't caching to the file system. Otherwise, don't
-      # cache in memory as we are caching to the file system and won't benefit
-      # from the in memory cache.
-      much_rails_content_cache =
-        if rails.env.development? || rails.env.test?
-          MuchRails::Assets::MemCache.new
-        else
-          MuchRails::Assets::NoCache.new
-        end
-      config.content_cache much_rails_content_cache
+      # Cache fingerprints/content in memory in non-development for performance
+      # gains. Don't cache in memory in developlemnt so changes are reflected
+      # without restarting the server.
+      if !rails.env.development?
+        config.fingerprint_cache MuchRails::Assets::MemCache.new
+        config.content_cache MuchRails::Assets::MemCache.new
+      else
+        config.fingerprint_cache MuchRails::Assets::NoCache.new
+        config.content_cache MuchRails::Assets::NoCache.new
+      end
 
       # Cache out compiled file content to the public folder in non
       # development/test environments.
@@ -33,21 +29,40 @@ module MuchRails::Assets
         config.file_store rails.root.join("public")
       end
 
-      # Look for asset files in the app/assets folder. Support ERB processing
-      # on all .js and .scss files. Support compilation of .scss files.
-      config.source rails.root.join("app", "assets") do |s|
+      # Look for asset files in the app/assets/css folder. Support ERB
+      # on all .scss files. Support compilation of .scss files.
+      config.source rails.root.join("app", "assets", "css") do |s|
+        s.base_path "css"
+
         # Reject SCSS partials
         s.filter do |paths|
           paths.reject{ |p| File.basename(p) =~ /^_.*\.scss$/ }
         end
 
-        s.engine "js",   MuchRails::Assets::Erubi::Engine
         s.engine "scss", MuchRails::Assets::Erubi::Engine
         s.engine "scss", MuchRails::Assets::Sass::Engine, {
           syntax: "scss",
           output_style: "compressed",
         }
       end
+
+      # Look for asset files in the app/assets/img folder.
+      config.source rails.root.join("app", "assets", "img") do |s|
+        s.base_path "img"
+      end
+
+      # Look for asset files in the app/assets/js folder. Support ERB
+      # on all .js files.
+      config.source rails.root.join("app", "assets", "js") do |s|
+        s.base_path "js"
+
+        s.engine "js", MuchRails::Assets::Erubi::Engine
+      end
+
+      # Look for asset files in the app/assets/vendor folder
+      config.source rails.root.join("app", "assets", "vendor") do |s|
+        s.base_path "vendor"
+      end
     end
     MuchRails::Assets.init
   end

data/lib/much-rails/destroy_service.rb

@@ -18,12 +18,49 @@ module MuchRails::DestroyService
 
     around_call do |receiver|
       receiver.call
-    rescue MuchRails::Records::ValidateDestroy::DestructionInvalid => ex
+    rescue *MuchRails::DestroyService::ValidationErrors.exception_classes => ex
       set_the_return_value_for_the_call_method(
-        MuchRails::Result.failure(
-          exception: ex,
-          validation_errors: ex&.destruction_errors.to_h,
-        ),
+        MuchRails::DestroyService::ValidationErrors.result_for(ex),
+      )
+    end
+  end
+
+  module ValidationErrors
+    def self.add(exception_class, &block)
+      service_validation_errors.add(exception_class, &block)
+    end
+
+    def self.exception_classes
+      service_validation_errors.exception_classes
+    end
+
+    def self.result_for(ex)
+      service_validation_errors.result_for(ex)
+    end
+
+    def self.service_validation_errors
+      @service_validation_errors ||=
+        MuchRails::ServiceValidationErrors
+          .new
+          .tap do |e|
+            e.add(MuchRails::Records::DestructionInvalid) do |ex|
+              MuchRails::DestroyService::FailureResult.new(
+                record: ex.record,
+                exception: ex,
+                validation_errors: ex.errors.to_h,
+                validation_error_messages: ex.error_full_messages.to_a,
+              )
+            end
+          end
+    end
+  end
+
+  module FailureResult
+    def self.new(exception:, validation_errors:, **kargs)
+      MuchResult.failure(
+        exception: exception,
+        validation_errors: validation_errors,
+        **kargs,
       )
     end
   end

data/lib/much-rails/layout.rb

@@ -50,6 +50,14 @@ module MuchRails::Layout
       @javascripts ||= []
     end
 
+    def head_link(url, **attributes)
+      head_links << HeadLink.new(url, **attributes)
+    end
+
+    def head_links
+      @head_links ||= []
+    end
+
     def layout(value)
       layouts << value
     end
@@ -104,12 +112,31 @@ module MuchRails::Layout
       @javascripts ||= self.class.javascripts.map(&:call)
     end
 
-    def any_breadcrumbs?
-      breadcrumbs.any?
+    def head_links
+      @head_links ||= self.class.head_links
     end
 
     def layouts
       self.class.layouts
     end
+
+    def any_breadcrumbs?
+      breadcrumbs.any?
+    end
+  end
+
+  class HeadLink
+    attr_reader :href, :attributes
+
+    def initialize(href, **attributes)
+      @href = href
+      @attributes = attributes
+    end
+
+    def ==(other)
+      super unless other.is_a?(self.class)
+
+      href == other.href && attributes == other.attributes
+    end
   end
 end

data/lib/much-rails/records/validate_destroy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_model/error"
 require "much-rails/mixin"
 
 module MuchRails; end
@@ -33,7 +34,7 @@ module MuchRails::Records::ValidateDestroy
 
     def destroy!(as: :base, validate: true)
       if validate && !destroyable?
-        raise DestructionInvalid.new(self, field_name: as)
+        raise MuchRails::Records::DestructionInvalid.new(self, field_name: as)
       end
 
       # `_raise_record_not_destroyed` is from ActiveRecord. This logic was
@@ -61,22 +62,31 @@ module MuchRails::Records::ValidateDestroy
       raise NotImplementedError
     end
   end
+end
+
+class MuchRails::Records::DestructionInvalid < StandardError
+  attr_reader :record, :errors, :error_full_messages
 
-  class DestructionInvalid < StandardError
-    attr_reader :record, :destruction_errors
+  def initialize(record = nil, field_name: :base)
+    super(record&.destruction_error_messages.to_a.join("\n"))
 
-    def initialize(record = nil, field_name: :base)
-      super(record&.destruction_error_messages.to_a.join("\n"))
+    @record = record
 
-      @record = record
+    messages = record&.destruction_error_messages.to_a
+    @errors =
+      if messages.any?
+        { field_name.to_sym => messages }
+      else
+        {}
+      end
 
-      messages = record&.destruction_error_messages.to_a
-      @destruction_errors =
-        if messages.any?
-          { field_name.to_sym => messages }
-        else
-          {}
+    @error_full_messages =
+      if field_name == :base
+        messages
+      else
+        messages.map do |m|
+          ActiveModel::Error.new(@record, field_name, m).full_message
         end
-    end
+      end
   end
 end

data/lib/much-rails/save_service.rb

@@ -4,6 +4,7 @@ require "active_record"
 require "much-rails/mixin"
 require "much-rails/result"
 require "much-rails/service"
+require "much-rails/service_validation_errors"
 
 module MuchRails; end
 
@@ -17,14 +18,50 @@ module MuchRails::SaveService
 
     around_call do |receiver|
       receiver.call
-    rescue ActiveRecord::RecordInvalid => ex
+    rescue *MuchRails::SaveService::ValidationErrors.exception_classes => ex
       set_the_return_value_for_the_call_method(
-        MuchRails::Result.failure(
-          record: ex.record,
-          exception: ex,
-          validation_errors: ex.record&.errors.to_h,
-          validation_error_messages: ex.record&.errors&.full_messages.to_a,
-        ),
+        MuchRails::SaveService::ValidationErrors.result_for(ex),
+      )
+    end
+  end
+
+  module ValidationErrors
+    def self.add(exception_class, &block)
+      service_validation_errors.add(exception_class, &block)
+    end
+
+    def self.exception_classes
+      service_validation_errors.exception_classes
+    end
+
+    def self.result_for(ex)
+      service_validation_errors.result_for(ex)
+    end
+
+    def self.service_validation_errors
+      @service_validation_errors ||=
+        MuchRails::ServiceValidationErrors
+          .new
+          .tap do |e|
+            e.add(ActiveRecord::RecordInvalid) do |ex|
+              MuchRails::SaveService::FailureResult.new(
+                record: ex.record,
+                exception: ex,
+                validation_errors: ex.record&.errors.to_h,
+                validation_error_messages:
+                  ex.record&.errors&.full_messages.to_a,
+              )
+            end
+          end
+    end
+  end
+
+  module FailureResult
+    def self.new(exception:, validation_errors:, **kargs)
+      MuchResult.failure(
+        exception: exception,
+        validation_errors: validation_errors,
+        **kargs,
       )
     end
   end

data/lib/much-rails/service_validation_errors.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module MuchRails; end
+
+class MuchRails::ServiceValidationErrors
+  attr_reader :hash
+
+  def initialize
+    @hash = {}
+  end
+
+  def add(exception_class, &block)
+    unless exception_class && exception_class < Exception
+      raise(ArgumentError, "#{exception_class} is not an Exception")
+    end
+
+    @hash[exception_class] = block
+  end
+
+  def exception_classes
+    @hash.keys
+  end
+
+  def result_for(ex)
+    result_proc = nil
+    exception_class = ex.class
+    loop do
+      result_proc = @hash[exception_class]
+      break unless result_proc.nil?
+
+      exception_class =
+        if exception_class.superclass.nil?
+          raise ArgumentError, "#{ex.class} hasn't been configured"
+        else
+          exception_class.superclass
+        end
+    end
+
+    result_proc.call(ex)
+  end
+end

data/lib/much-rails/version.rb

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

data/much-rails.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activerecord",   ["> 5.0", "< 7.0"])
   gem.add_dependency("activesupport",  ["> 5.0", "< 7.0"])
-  gem.add_dependency("dassets",        ["~> 0.15.1"])
+  gem.add_dependency("dassets",        ["~> 0.15.2"])
   gem.add_dependency("dassets-erubi",  ["~> 0.1.1"])
   gem.add_dependency("dassets-sass",   ["~> 0.5.1"])
   gem.add_dependency("much-boolean",   ["~> 0.2.1"])

data/test/unit/action/controller_tests.rb

@@ -16,6 +16,10 @@ module MuchRails::Action::Controller
     should "include MuchRails::Mixin" do
       assert_that(subject).includes(MuchRails::Mixin)
     end
+
+    should "know its constants" do
+      assert_that(subject::DEFAULT_ACTION_CLASS_FORMAT).equals(:any)
+    end
   end
 
   class ReceiverTests < UnitTests
@@ -51,6 +55,7 @@ module MuchRails::Action::Controller
       MuchRails::Action::Router::CONTROLLER_NOT_FOUND_METHOD_NAME,
     )
     should have_imeths :much_rails_action_class_name
+    should have_imeths :much_rails_action_class_format
     should have_imeths :much_rails_action_params
     should have_imeths :require_much_rails_action_class
     should have_imeths :permit_all_much_rails_action_params
@@ -59,6 +64,9 @@ module MuchRails::Action::Controller
       assert_that(subject.much_rails_action_class_name)
         .equals("::Actions::Show")
 
+      assert_that(subject.much_rails_action_class_format)
+        .equals(unit_module::DEFAULT_ACTION_CLASS_FORMAT)
+
       assert_that(subject.much_rails_action_params)
         .equals(
           nested: { value: "VALUE 1" },
@@ -66,6 +74,11 @@ module MuchRails::Action::Controller
         )
 
       assert_that(subject.much_rails_action_class).equals(Actions::Show)
+
+      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
 
@@ -94,49 +107,4 @@ module MuchRails::Action::Controller
         .raises(MuchRails::Action::ActionError)
     end
   end
-
-  class FakeController
-    def self.before_action(method_name)
-      before_actions << method_name
-    end
-
-    def self.before_actions
-      @before_actions ||= []
-    end
-
-    attr_reader :params, :head_called_with
-
-    def initialize(params)
-      @params = FakeParams.new(params)
-      self.class.before_actions.each do |before_action|
-        public_send(before_action)
-      end
-    end
-
-    def head(*args)
-      @head_called_with = args
-      self
-    end
-  end
-
-  class FakeParams
-    def initialize(params)
-      @params = params
-    end
-
-    def permit!
-      @permit_called = true
-      self
-    end
-
-    def [](key)
-      @params[key]
-    end
-
-    def to_h
-      raise "params haven't been permitted" unless @permit_called
-
-      @params
-    end
-  end
 end