trestle-auth-otp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95cb244f303570eefb067e81a3635c1163b3b936ffd61814efa67e97284395e4
-  data.tar.gz: da9db1ad06e17624ce6dce2f27828f2df80beb1598715665f93602af9d13b4c2
+  metadata.gz: 374cc9fd85767e3b8e4137bad18c289e815c290eb5f471eb9158f14152a37fd2
+  data.tar.gz: bfa8672bcad7a75447cf23a79f9fb932f57ed216129296e9bf55626bc9acbe9b
 SHA512:
-  metadata.gz: dfb1d34e02658de3b3762ecb77aca0d14536c968dfd4dfed7656c87b8cb310366512194cfbd4e23b71b2fa729d6922782c688488101478bad3b27dda3ed6c32c
-  data.tar.gz: 372bc30f44390299e2321b74b72dc15646e97023ffe8f7a3180ba2863403b5013893694cb4a9d1d2acbd9170187b6f2d6d10c8c8e764bea2072dfe5dcfa7eece
+  metadata.gz: 79e36721c09d0714a1f27a48227e14d6934ffbbb832d3097d082fbd65b9ce9d3b3418971bc66a7928c3e2e476ef24c62bfc80642da5d7b13e718a0995629d8b7
+  data.tar.gz: 03fbbb8896f81d8f8eb0082956a666f35df20c0b98ea30157cf8b5fe6f32e4f3c66ab976db2ff13258bc3929f9fbb8d810741b421006c824fe6852e3e24da4c7

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

@@ -35,9 +35,13 @@ module Trestle
           end
 
           def generate_migration
+            filename = 'migration.rb'
+            path = File.expand_path(find_in_source_paths(filename.to_s))
+            text = File.read(path)
+            content = text.gsub('[]', "[#{ActiveRecord::Migration.current_version}]")
+            File.open(path, "w") { |file| file << content }
 
-            migration_template("migration.rb", "db/migrate/add_otp_fields.rb")
-
+            migration_template(filename, "db/migrate/add_otp_fields.rb")
           end
 
           def devise?
@@ -58,14 +62,22 @@ 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
   end
-end
+end

data/lib/generators/trestle/auth/otp/install/templates/migration.rb

@@ -1,4 +1,4 @@
-class AddOtpFields < ActiveRecord::Migration[6.0]
+class AddOtpFields < ActiveRecord::Migration[]
   def up
     add_column :administrators, :otp_secret_key, :string
     add_column :administrators, :otp_module, :boolean, default: false
@@ -8,4 +8,4 @@ class AddOtpFields < ActiveRecord::Migration[6.0]
     remove_column :administrators, :otp_module
     remove_column :administrators, :otp_secret_key
   end
-end
+end

data/lib/trestle/auth/otp/version.rb

@@ -1,7 +1,7 @@
 module Trestle
   module Auth
     module Otp
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

data/trestle-auth-otp.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "trestle", "~> 0.9.0"
   spec.add_dependency "trestle-auth",  "~> 0.4.0"
   spec.add_dependency "active_model_otp", "~> 2.0"
-  spec.add_dependency "rqrcode", "~> 1.1"
+  spec.add_dependency "rqrcode", "~> 2.0"
 
   spec.add_development_dependency "rspec-rails",         "~> 3.0"
   spec.add_development_dependency "show_me_the_cookies", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-auth-otp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Emanuele Barban
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +108,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -148,7 +148,7 @@ licenses:
 metadata:
   homepage_uri: https://www.trestle.io
   source_code_uri: https://github.com/McRipper/trestle-auth-otp
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -163,8 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: One Time Password plugin for the Trestle admin framework
 test_files: []