rails-htmx 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf1ba0777f644cc1577a23b47865f1d1f8b1481914f6a61b8c3f53931aa6cfd
-  data.tar.gz: 73221159830c691fa47b2d2c7fd34a732b9c5ad34aaac627b75c44a750a2f761
+  metadata.gz: 7295c9a2742bf97af36ef648262f112f14f65b2e43a4c9ab72249a40976bd601
+  data.tar.gz: 7f88f12f68cb993fdfb49dbf851ec7e1033a04e7c54b79e68cc051928d2e8111
 SHA512:
-  metadata.gz: 19e4ed44df5466faf76b2c414f4ec51842843b305556ff6dc0589c55edf989e7730d10168969c8210d50f0ca789eac38485b0f7270cfc6cb5970cdb0f38ebfe3
-  data.tar.gz: ec76045f03acf587dae8efe26889f2149eef3c31aa9c64e3ce1bdd883a3fc2cb2b3189a6cb72821dc16c158c5ab6859205b61247bdeba0134f7e3e4245162a33
+  metadata.gz: e8e76850f31a4a81784b626fb4d13fb0ac31d6a76bed0d2dc0c3e23e7dec654c25bab677b4fa1e39279e067db9aa2c8da3c9e973127c15bbc9b704cd0240cfed
+  data.tar.gz: 69181e0aea3ee8232480780d05d4688f82f08669794f57f361bc8c2f4eabcfeb9f4827ad78e904e1901a0b90d1a6a7d81f4ea60fd080bc250eb98a5b9264684c

data/lib/rails-htmx/controller.rb

@@ -0,0 +1,53 @@
+module Rails
+  module Htmx
+    class Error < StandardError; end
+
+    class Unsupported < Error; end
+
+    module Controller
+      extend ActiveSupport::Concern
+
+      included do
+        layout proc { |c| htmx_request? ? htmx_layout : nil }
+        helper_method :htmx_request?
+
+        rescue_from Rails::Htmx::Unsupported, with: :htmx_unsupported
+      end
+
+      # The templates for new generated Rails 7.0+ apps use 303 for redirects:
+      # https://github.com/rails/rails/commit/5ed37b35d666b833a
+      # https://github.com/rails/rails/commit/d6715c72c50255ccc
+      #
+      # We might be able to remove this method in the future.
+      def redirect_to(url_options = {}, response_status = {})
+        return_value = super
+
+        # Return 303 to make sure a GET request will be used to display the redirect.
+        # Ref: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/303
+        self.status = 303 if htmx_request? && !request.get? && !request.post?
+
+        return_value
+      end
+
+      protected
+
+      def htmx_request?
+        request.env["HTTP_HX_REQUEST"].present?
+      end
+
+      def htmx_layout
+        false
+      end
+
+      def htmx_unsupported
+        response.headers["HX-Redirect"] = request.url
+
+        head :no_content
+      end
+
+      def prevent_htmx!
+        raise Rails::Htmx::Unsupported if htmx_request?
+      end
+    end
+  end
+end

data/lib/rails-htmx/helpers.rb

@@ -1,38 +1,12 @@
 module Rails
   module Htmx
-    class Error < StandardError; end
-
-    class Unsupported < Error; end
-
     module Helpers
-      extend ActiveSupport::Concern
-
-      included do
-        layout proc { |c| htmx_request? ? htmx_layout : nil }
-        helper_method :htmx_request?
-
-        rescue_from Rails::Htmx::Unsupported, with: :htmx_unsupported
-      end
-
-      protected
-
-      def htmx_request?
-        request.env["HTTP_HX_REQUEST"].present?
-      end
-
-      def htmx_layout
-        false
-      end
-
-      def htmx_unsupported
-        response.headers["HX-Redirect"] = request.url
-
-        head :no_content
-      end
-
-      def prevent_htmx!
-        raise Rails::Htmx::Unsupported if htmx_request?
+      def htmx_attributes(attributes = {})
+        return attributes if attributes.blank?
+        attributes.transform_keys! { |key| "hx-#{key}" }
+        attributes
       end
+      alias_method :hx, :htmx_attributes
     end
   end
 end

data/lib/rails-htmx.rb

@@ -1,3 +1,4 @@
+require "rails-htmx/controller"
 require "rails-htmx/helpers"
 
 module Rails
@@ -5,7 +6,13 @@ module Rails
     class Engine < ::Rails::Engine
       initializer "rails-htmx.add_controller" do
         ActiveSupport.on_load :action_controller do
-          ActionController::Base.send :include, Rails::Htmx::Helpers
+          ActionController::Base.send :include, Rails::Htmx::Controller
+        end
+      end
+
+      initializer "rails-htmx.add_helpers" do
+        ActiveSupport.on_load :action_view do
+          ActionView::Base.send :include, Rails::Htmx::Helpers
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-htmx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Guillermo Iguaran
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -87,6 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rails-htmx.rb
+- lib/rails-htmx/controller.rb
 - lib/rails-htmx/helpers.rb
 homepage: https://github.com/guilleiguaran/rails-htmx
 licenses: