steel_wheel 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97743adea6bbab71134f9a054bc620921c0791816c18b730d33f33f8cbe858ce
-  data.tar.gz: 3cdd1575f2d13535581b6799ff713eaab0b6f6c5b90c6c917586beac05ea17a0
+  metadata.gz: 63187c69f05601bdc4504a3b85244d9ecd14c7ed882434ae3c87526f39e57b9a
+  data.tar.gz: 5c7734353306c7f214b370a35206cc71f3eb903a1b79b0b3331cba999afca3a0
 SHA512:
-  metadata.gz: 74f1564ac63d3e4e6cdf41c47396fdcc68e4b5b6e8c9b1ef7aa249454b7ba9b86b3791010d7568108965cb2193b6614fbf4126ad5cbc6432fc1a1bcb44bfcfa7
-  data.tar.gz: a520494b4cb761251a38935627b64b7ee8d9be00c427c53be3e8cf71b4e5083236b012e4ec8e5842c4c428a23b2207e7bc7fc781852f264560bea26c747a1a58
+  metadata.gz: ac0acddfa4074ac236e3f2bc1b2693d6cf58fb99f0da6c06bd8c409c53d625da91fdc384ec629cb7646edd0c82fe3ce4107338156fb068f4574772ca572d97ef
+  data.tar.gz: 81f1ff20c703273f06f683e836c6fc5966f5d1ed308f7ab0b45714b05bdae01ea2778116826a4c8cb3ecdbb1b4b9ec2e4db9b98ede03eb403b08a2011e5996ec

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    steel_wheel (0.7.0)
-      action_form (~> 0.2)
-      easy_params (~> 0.7)
+    steel_wheel (0.8.0)
+      action_form (~> 0.6.6)
+      easy_params (~> 0.9.1)
       memery (~> 1)
       railties (>= 3.2, < 9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    action_form (0.2.0)
-      easy_params (~> 0.7)
+    action_form (0.6.6)
+      easy_params (~> 0.9.1)
       phlex (>= 2)
       railties (>= 6.0.0)
-    actionpack (8.0.3)
-      actionview (= 8.0.3)
-      activesupport (= 8.0.3)
+    actionpack (8.1.1)
+      actionview (= 8.1.1)
+      activesupport (= 8.1.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -24,22 +24,22 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (8.0.3)
-      activesupport (= 8.0.3)
+    actionview (8.1.1)
+      activesupport (= 8.1.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (8.0.3)
-      activesupport (= 8.0.3)
-    activesupport (8.0.3)
+    activemodel (8.1.1)
+      activesupport (= 8.1.1)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -47,29 +47,28 @@ GEM
       uri (>= 0.13.1)
     ast (2.4.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    bigdecimal (3.3.1)
     builder (3.3.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     crass (1.0.6)
-    date (3.4.1)
+    date (3.5.0)
     diff-lcs (1.6.2)
     docile (1.4.1)
     drb (2.2.3)
-    easy_params (0.7.0)
+    easy_params (0.9.1)
       activemodel (>= 3.2)
-    erb (5.1.1)
+    erb (6.0.0)
     erubi (1.13.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.8.1)
-    irb (1.15.2)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.13.1)
+    json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -79,14 +78,14 @@ GEM
     memery (1.8.0)
     method_source (1.1.0)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
+    minitest (5.26.1)
     nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri (1.18.1-arm64-darwin)
       racc (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     phlex (2.3.1)
@@ -94,7 +93,7 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.6.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -102,7 +101,7 @@ GEM
       date
       stringio
     racc (1.8.1)
-    rack (3.2.1)
+    rack (3.2.4)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -117,9 +116,9 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.3)
-      actionpack (= 8.0.3)
-      activesupport (= 8.0.3)
+    railties (8.1.1)
+      actionpack (= 8.1.1)
+      activesupport (= 8.1.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -127,30 +126,30 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
-    rdoc (6.15.0)
+    rake (13.3.1)
+    rdoc (6.15.1)
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.10.0)
-    reline (0.6.2)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
       io-console (~> 0.5)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
+    rspec-support (3.13.6)
     rspec_vars_helper (0.1.0)
       rspec (>= 2.4)
-    rubocop (1.79.0)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -158,11 +157,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      tsort (>= 0.2.0)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
@@ -173,15 +171,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    stringio (3.1.7)
+    stringio (3.1.8)
     thor (1.4.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.1.1)
     useragent (0.16.11)
     zeitwerk (2.7.3)
 

data/lib/generators/steel_wheel/application_handler/templates/handler_template.rb

@@ -4,5 +4,6 @@ class ApplicationHandler < SteelWheel::Handler
   url_params do
     string :controller
     string :action
+    string :format
   end
 end

data/lib/generators/steel_wheel/scaffold_controller/templates/index.rb

@@ -1,6 +1,6 @@
 class <%= controller_class_name %>::IndexHandler < ApplicationHandler
   def form_attributes
-    { method: :get, action: helpers.<%= index_helper %>_path, params: form_params }
+    { method: :get, action: helpers.<%= index_helper %>_path }
   end
 
   form <%= controller_class_name %>::SearchForm

data/lib/steel_wheel/components.rb

@@ -14,6 +14,10 @@ module SteelWheel
         @url_params_definition ||= Class.new(SteelWheel::Params)
       end
 
+      def form_params_definition
+        @form_params_definition ||= form_definition.params_definition
+      end
+
       def form_definition
         @form_definition ||= Class.new(ActionForm::Rails::Base)
       end
@@ -35,15 +39,29 @@ module SteelWheel
       end
 
       def form_params
-        @form_params ||= if @form_scope
-                           self.class.form_definition.params_definition.schema[@form_scope].class.new(form_input)
-                         else
-                           self.class.form_definition.params_definition.new(form_input)
-                         end
+        @form_params ||= self.class.form_params_definition.new(form_input)
       end
 
       def form(attrs = form_attributes)
-        @form ||= self.class.form_definition.new(**attrs)
+        @form ||= create_form(attrs)
+      end
+
+      private
+
+      def create_form(attrs)
+        if form_input.present?
+          create_form_from_form_params
+        else
+          create_form_from_definition(attrs)
+        end
+      end
+
+      def create_form_from_definition(attrs)
+        self.class.form_definition.new(owner: self, **attrs)
+      end
+
+      def create_form_from_form_params
+        form_params&.create_form(owner: self, method: owner_request.request_method, action: owner_request.path)
       end
 
       def form_attributes

data/lib/steel_wheel/composition.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module SteelWheel
+  # Provides host–guest association helpers for ActionForm components.
+  # When included, it exposes `host_object` and `host_association_name` accessors
+  # and delegates `host_*` method calls to the associated host via `method_missing`.
+  module Composition
+    def self.included(base)
+      base.attr_accessor :owner
+      base.include(InstanceMethods)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods # rubocop:disable Style/Documentation
+      def part_of(owner_name)
+        @owner_name = owner_name
+        alias_method owner_name, :owner
+      end
+    end
+
+    module InstanceMethods # rubocop:disable Style/Documentation
+      def method_missing(name, *attrs, **kwargs, &block)
+        return super unless name.to_s.start_with?('owner_')
+
+        owner_method = name.to_s.sub('owner_', '').to_sym
+        return super unless (handler = owners_chain.detect { |o| o.respond_to?(owner_method) })
+
+        handler.public_send(owner_method, *attrs, **kwargs, &block)
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        return super unless method_name.to_s.start_with?('owner_')
+
+        owners_chain.any? { |o| o.respond_to?(method_name.to_s.sub('owner_', '').to_sym, include_private) }
+      end
+
+      private
+
+      def owners_chain
+        @owners_chain ||= Enumerator.new do |y|
+          obj = self
+          y << obj = obj.owner while obj.respond_to?(:owner)
+        end.lazy
+      end
+    end
+  end
+end

data/lib/steel_wheel/handler.rb

@@ -14,6 +14,7 @@ module SteelWheel
     include SteelWheel::Shortcuts
     include SteelWheel::Callbacks
     include SteelWheel::Preconditions
+    include SteelWheel::Composition
 
     attr_reader :input, :form_input
     attr_accessor :http_status, :helpers
@@ -76,12 +77,12 @@ module SteelWheel
       errors.map(&:type).first
     end
 
-    private
-
     def current_action
       ActiveSupport::StringInquirer.new(url_params.action)
     end
 
+    private
+
     def prepare_params(params)
       normalized_params = normalize_params(params)
       @form_scope = self.class.form_definition.scope
@@ -90,7 +91,7 @@ module SteelWheel
         @form_input = normalized_params.delete(@form_scope)
         @validate_form = @form_input.present?
       else
-        @form_input = normalized_params
+        @form_input = normalized_params.except(*self.class.url_params_definition.schema.keys)
       end
       @input = normalized_params
     end

data/lib/steel_wheel/preconditions.rb

@@ -23,7 +23,7 @@ module SteelWheel
 
     def failure_form
       self.http_status = :unprocessable_entity
-      @form = form.with_params(form_params)
+      @form = create_form_from_form_params
       failure_callback
     end
 

data/lib/steel_wheel/railtie.rb

@@ -13,6 +13,7 @@ module SteelWheel # rubocop:disable Style/Documentation
         define_method(action_name) do
           handler_klass = handler_class_for(handler)
           handler_klass.handle(params) do |handler_instance|
+            handler_instance.owner = self
             handler_instance.helpers = view_context
             instance_exec(handler_instance, &block)
             failure_callbacks(handler_instance)

data/lib/steel_wheel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SteelWheel
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/steel_wheel.rb

@@ -4,6 +4,7 @@ require 'easy_params'
 require 'active_model'
 require 'memery'
 require 'action_form'
+require 'steel_wheel/composition'
 require 'steel_wheel/skip_active_model_errors_keys'
 require 'steel_wheel/params'
 require 'steel_wheel/filters'

data/steel_wheel.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'railties', version_string
 
-  spec.add_dependency 'action_form', '~> 0.2'
-  spec.add_dependency 'easy_params', '~> 0.7'
+  spec.add_dependency 'action_form', '~> 0.6.6'
+  spec.add_dependency 'easy_params', '~> 0.9.1'
   spec.add_dependency 'memery', '~> 1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steel_wheel
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrii Baran
@@ -35,28 +35,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: easy_params
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: memery
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ files:
 - lib/steel_wheel.rb
 - lib/steel_wheel/callbacks.rb
 - lib/steel_wheel/components.rb
+- lib/steel_wheel/composition.rb
 - lib/steel_wheel/filters.rb
 - lib/steel_wheel/handler.rb
 - lib/steel_wheel/params.rb