Use include instead of prepend in plugins (#31)

umbrellio · Oct 10, 2022 · 08dfc31 · 08dfc31
1 parent 5cf6d46
commit 08dfc31
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.9.0)
+    umbrellio-sequel-plugins (0.10.0)
       sequel
       symbiont-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,70 +18,72 @@ GEM
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.16.1)
+    minitest (5.16.3)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.4.3)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3.1)
+    rack (3.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+    rspec-support (3.11.1)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
-    rubocop-config-umbrellio (1.30.0.65)
-      rubocop (~> 1.30.0)
+    rubocop-config-umbrellio (1.35.0.69)
+      rubocop (~> 1.35.0)
       rubocop-performance (~> 1.14.0)
-      rubocop-rails (~> 2.14.2)
+      rubocop-rails (~> 2.15.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.11.1)
+      rubocop-rspec (~> 2.12.0)
       rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.14.2)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sequel (5.57.0)
+    sequel (5.61.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -90,9 +92,9 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     symbiont-ruby (0.7.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -110,4 +112,4 @@ DEPENDENCIES
   umbrellio-sequel-plugins!
 
 BUNDLED WITH
-   2.3.16
+   2.3.23
diff --git a/lib/sequel/plugins/attr_encrypted.rb b/lib/sequel/plugins/attr_encrypted.rb
@@ -74,7 +74,7 @@ def include_encrypted_module!
 
       @_encrypted_attributes ||= []
       @_attr_encrypted_module = Module.new
-      prepend @_attr_encrypted_module
+      include @_attr_encrypted_module
     end
   end
 

diff --git a/lib/sequel/plugins/money_accessors.rb b/lib/sequel/plugins/money_accessors.rb
@@ -62,7 +62,7 @@ def money_setter(amount_column, currency_column)
     def include_accessors_module!
       return if defined?(@_money_accessors_module)
       @_money_accessors_module = Module.new
-      prepend @_money_accessors_module
+      include @_money_accessors_module
     end
   end
 end
diff --git a/umbrellio-sequel-plugins.gemspec b/umbrellio-sequel-plugins.gemspec
@@ -4,7 +4,7 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.9.0"
+  gem_version = "0.10.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"