diff --git a/Gemfile b/Gemfile index 6412d7a..2d3581d 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gem 'pg' gem 'puma' gem 'propshaft' -gem 'rails_extend', github: 'work-design/rails_extend' gem 'rails_com', github: 'work-design/rails_com' gem 'rails_design', github: 'work-design/rails_design' diff --git a/Gemfile.lock b/Gemfile.lock index 905958b..4ac696e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,30 @@ GIT remote: https://github.com/work-design/rails_com.git - revision: e091734eb5322b06e3e38791d1457004a14b4d86 + revision: d4beb93fb735ec64322650dd48d25c713705447c specs: rails_com (1.3.0) acme-client - acts_as_list (>= 1.0) closure_tree (>= 7.3) default_where (~> 2.2) http-form_data (~> 2.3) httpx kaminari money-rails (~> 1.15) + mutex_m net-http + net-pop + ostruct + positioning rails (~> 7.0) - rails_extend turbo-rails GIT remote: https://github.com/work-design/rails_design.git - revision: 819240dedcd082fd1acee2faf9f3ebfb016be09d + revision: ac09f6f45788c2f14725bbaee1eec4b757dba0b8 specs: rails_design (0.0.1) rails -GIT - remote: https://github.com/work-design/rails_extend.git - revision: 063f67134799ad388a89ef254f6bb212ec420a68 - specs: - rails_extend (1.0.1) - rails (>= 5.0) - PATH remote: . specs: @@ -39,7 +34,7 @@ PATH GEM remote: https://rubygems.org/ specs: - acme-client (2.0.17) + acme-client (2.0.18) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) actioncable (7.1.3.2) @@ -116,11 +111,9 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - acts_as_list (1.1.0) - activerecord (>= 4.2) - amazing_print (1.5.0) + amazing_print (1.6.0) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) builder (3.2.4) closure_tree (7.4.0) activerecord (>= 4.2.10) @@ -129,31 +122,31 @@ GEM connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - debug (1.9.1) + debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) default_where (2.2.0) activerecord (>= 4.0.0) drb (2.2.1) erubi (1.12.0) - faraday (2.9.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) + logger + faraday-net_http (3.1.1) net-http - faraday-retry (2.2.0) + faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.16.3) globalid (1.2.1) activesupport (>= 6.1) - http-2-next (1.0.3) + http-2 (1.0.0) http-form_data (2.3.0) - httpx (1.2.3) - http-2-next (>= 1.0.3) - i18n (1.14.3) + httpx (1.3.0) + http-2 (>= 1.0.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) - racc (~> 1.7) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) kaminari (1.2.2) @@ -171,6 +164,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -182,7 +176,7 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.22.2) + minitest (5.22.3) monetize (1.13.0) money (~> 6.12) money (6.19.0) @@ -202,13 +196,17 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.2) + nio4r (2.7.1) + nokogiri (1.16.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) + ostruct (0.6.0) pg (1.5.6) + positioning (0.2.3) + activerecord (>= 6.1) + activesupport (>= 6.1) propshaft (0.8.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) @@ -219,7 +217,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (3.0.9.1) + rack (3.0.10) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -256,20 +254,20 @@ GEM rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) - rake (13.1.0) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) - reline (0.4.3) + reline (0.5.0) io-console (~> 0.5) sdoc (2.6.1) rdoc (>= 5.0) stringio (3.1.0) thor (1.3.1) timeout (0.4.1) - turbo-rails (2.0.4) + turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -298,7 +296,6 @@ DEPENDENCIES rails rails_com! rails_design! - rails_extend! rails_growth! sdoc diff --git a/app/models/growth/model/praise_user.rb b/app/models/growth/model/praise_user.rb index cf3c610..5afa24f 100644 --- a/app/models/growth/model/praise_user.rb +++ b/app/models/growth/model/praise_user.rb @@ -20,7 +20,7 @@ module Model::PraiseUser end after_commit :reset_position, if: -> { saved_change_to_amount? } - acts_as_list scope: [:entity_type, :entity_id] + positioned on: [:entity_type, :entity_id] end def compute_amount