trestle-auth 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7d72e5d295f88b10eeb2a14c1a854ba9f7cfb59617a4ec9dd4cea95d00295a
-  data.tar.gz: b4e1dfdcba7438acf673c6f36dc2cf4c81eba3c28dcd92d99403bee8f844c803
+  metadata.gz: f832127b8855a20f54f8864a8e85389953e7fa1c3ac62c6fe04f18b545ecbeeb
+  data.tar.gz: 824a202d4c14c5a6de29106d95873cb0a168dc98c13e69641b129d1be96d11e5
 SHA512:
-  metadata.gz: b2b1b76740eac08413c4e074cc2e8a530b8d428905d6fc9a48b2de814457a3cf1d1716698a14306466e93fa29afedf358258a320177cb2ac1e71e7c5b6ee24b7
-  data.tar.gz: 246cef636500c0e8337a1a0bf447923d251ee34c48a5de108becfd07b2320f8732e6b08610a0e7c1bf1e852f21d3d5818ac2eda71b4d7b71a9cb0071374be785
+  metadata.gz: 84760577a9abb2bddc4fa050b611b00236d698433b1c85f8dad72c4eab783c0315099d058fc2219cad2806d450b3d976c3a0675cda26913e13f91c50758be446
+  data.tar.gz: d22504002dc580c1a8fcfac296dff35299510d063eb10e59dab2d3e0b76b624e93650162ae8032c6f1170ee583aa6bbf7d3b90fc73a03ae1d5ae92e00bda8c6e

data/lib/generators/trestle/auth/install/install_generator.rb

@@ -52,12 +52,20 @@ module Trestle
           path = File.expand_path(find_in_source_paths(path.to_s))
           context = options.delete(:context) || instance_eval("binding")
 
-          capturable_erb = CapturableERB.new(::File.binread(path), trim_mode: "-", eoutvar: "@output_buffer")
-
-          content = capturable_erb.tap do |erb|
+          content = capturable_erb(path).tap do |erb|
             erb.filename = path
           end.result(context)
         end
+
+        def capturable_erb(path)
+          match = ERB.version.match(/(\d+\.\d+\.\d+)/)
+
+          if match && match[1] >= "2.2.0" # Ruby 2.6+
+            CapturableERB.new(::File.binread(path), trim_mode: "-", eoutvar: "@output_buffer")
+          else
+            CapturableERB.new(::File.binread(path), nil, "-", "@output_buffer")
+          end
+        end
       end
     end
   end

data/lib/trestle/auth/controller/authentication.rb

@@ -9,6 +9,9 @@ module Trestle
 
           prepend_before_action :require_authenticated_user
           prepend_before_action :authenticate_user
+
+          # Ensure that CSRF protection happens before authentication
+          protect_from_forgery prepend: true
         end
 
       protected

data/lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-auth
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle