Merge pull request #42 from doctolib/refacto-activemodel-attribute

Refacto activemodel attribute
Mapotempo · Sep 15, 2022 · 27cdb71 · 27cdb71
2 parents b40a02c + 9cb5b05
commit 27cdb71
Show file tree

Hide file tree

Showing 26 changed files with 674 additions and 223 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,19 +13,19 @@ jobs:
         include:
           - ruby: '3.0'
             gemfile: '7.0.0'
-            couchbase: '6.6.5'           
+            couchbase: '6.6.5'
           - ruby: '3.0'
             gemfile: '7.0.0'
             couchbase: '7.1.0'
           - ruby: '2.7'
             gemfile: '7.0.0'
             couchbase: '7.1.0'
           - ruby: '2.6'
-            gemfile: '5.1.7'
+            gemfile: '5.2.8.1'
             couchbase: '7.1.0'
       fail-fast: false
     runs-on: ubuntu-20.04
-    name: ${{ matrix.ruby }} rails-${{ matrix.gemfile }}  couchbase-${{ matrix.couchbase }} 
+    name: ${{ matrix.ruby }} rails-${{ matrix.gemfile }}  couchbase-${{ matrix.couchbase }}
     steps:
     - uses: actions/checkout@v2
     - run: sudo apt-get update && sudo apt-get install libevent-dev libev-dev python-httplib2

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.sw?
 .DS_Store
+.rbenv-vars
 coverage
 rdoc
 html

diff --git a/couchbase-orm.gemspec b/couchbase-orm.gemspec
@@ -13,14 +13,17 @@ Gem::Specification.new do |gem|
     gem.required_ruby_version = '>= 2.1.0'
     gem.require_paths = ["lib"]
 
-    gem.add_runtime_dependency     'activemodel',  ENV["ACTIVE_MODEL_VERSION"] || '>= 5.0'
+    gem.add_runtime_dependency     'activemodel',   ENV["ACTIVE_MODEL_VERSION"] || '>= 5.2'
+    gem.add_runtime_dependency     'activerecord',  ENV["ACTIVE_MODEL_VERSION"] || '>= 5.2'
+
     gem.add_runtime_dependency     'couchbase'
     gem.add_runtime_dependency     'radix',        '~> 2.2' # converting numbers to and from any base
 
     gem.add_development_dependency 'rake',         '~> 12.2'
     gem.add_development_dependency 'rspec',        '~> 3.7'
     gem.add_development_dependency 'yard',         '~> 0.9'
     gem.add_development_dependency 'pry'
+    gem.add_development_dependency 'pry-stack_explorer'
     gem.add_development_dependency 'simplecov'
 
     gem.files         = `git ls-files`.split("\n")

diff --git a/lib/couchbase-orm.rb b/lib/couchbase-orm.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
+require "active_support/lazy_load_hooks"
+ActiveSupport.on_load(:i18n) do
+    I18n.load_path << File.expand_path("couchbase-orm/locale/en.yml", __dir__)
+end
+
 module CouchbaseOrm
     autoload :Error,       'couchbase-orm/error'
     autoload :Connection,  'couchbase-orm/connection'
@@ -8,7 +13,7 @@ module CouchbaseOrm
     autoload :HasMany,     'couchbase-orm/utilities/has_many'
 
     def self.logger
-        @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+        @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT).tap { |l| l.level = Logger::INFO unless ENV["COUCHBASE_ORM_DEBUG"] }
     end
 
     def self.logger=(logger)

diff --git a/lib/couchbase-orm/associations.rb b/lib/couchbase-orm/associations.rb
@@ -114,9 +114,8 @@ def has_and_belongs_to_many(name, **options)
                     old, new = previous_changes[ref]
                     adds = (new || []) - (old || [])
                     subs = (old || []) - (new || [])
-
-                    update_has_and_belongs_to_many_reverse_association(assoc, adds, true, **options)
-                    update_has_and_belongs_to_many_reverse_association(assoc, subs, false, **options)
+                    update_has_and_belongs_to_many_reverse_association(assoc, adds, true, **options) if adds.any?
+                    update_has_and_belongs_to_many_reverse_association(assoc, subs, false, **options) if subs.any?
                 end
 
                 after_create save_method
@@ -167,9 +166,11 @@ def update_has_and_belongs_to_many_reverse_association(assoc, keys, is_add, **op
                 elsif !is_add && index
                     tab = tab.dup
                     tab.delete_at(index)
+                else
+                    next
                 end
-                v.__send__(:"#{remote_method}=", tab)
-                v.__send__(:save!)
+                v[remote_method] = tab
+                v.save!
             end
         end