mongoid_max_denormalize 0.0.4 → 0.0.5

data/lib/mongoid/max/denormalize/many_to_one.rb

@@ -22,7 +22,7 @@ module Mongoid
             klass.field "#{relation}_count", type: Integer, default: 0
           end
 
-          callback_code = <<EOM
+          klass.class_eval <<-EOM, __FILE__, __LINE__
             before_create :denormalize_from_#{relation}
 
             def denormalize_from_#{relation}(force=false)
@@ -53,14 +53,17 @@ module Mongoid
 
               nil
             end
-EOM
-          klass.class_eval callback_code
+          EOM
 
-          callback_code = <<EOM
+          meta.klass.class_eval <<-EOM, __FILE__, __LINE__
             around_save :denormalize_to_#{inverse_relation}
 
             def denormalize_to_#{inverse_relation}
-              return if !changed? && !new_record?
+              if !changed? && !new_record?
+                yield if block_given?
+                return
+              end
+
               was_new = new_record?
               was_added = false
               was_removed = false
@@ -219,8 +222,7 @@ EOM
               to_update.reject! {|k,v| v.empty?}
               #{klass}.collection.find(:_id => remote_id).update_all(to_update) unless to_update.empty?
             end
-EOM
-          meta.klass.class_eval callback_code
+          EOM
         end
 
         def allowed_options

data/lib/mongoid/max/denormalize/one_to_many.rb

@@ -11,11 +11,11 @@ module Mongoid
             klass.field "#{relation}_#{field}", type: field_meta.try(:type)
           end
 
-          callback_code = <<EOM
+          klass.class_eval <<-EOM, __FILE__, __LINE__
             before_save :denormalize_from_#{relation}
 
             def denormalize_from_#{relation}
-              return unless #{meta.key}_changed?
+              return true unless #{meta.key}_changed?
 
               fields = [#{Base.array_code_for(fields)}]
               if #{meta.key}.nil?
@@ -30,14 +30,16 @@ module Mongoid
 
               true
             end
-EOM
-          klass.class_eval callback_code
+          EOM
 
-          callback_code = <<EOM
+          meta.klass.class_eval <<-EOM, __FILE__, __LINE__
             around_save :denormalize_to_#{inverse_relation}
 
             def denormalize_to_#{inverse_relation}(force = false)
-              return unless changed? || force
+              unless changed? || force
+                yield if block_given?
+                return
+              end
 
               fields = [#{Base.array_code_for(fields)}]
               fields_only = [#{Base.array_code_for(fields_only)}]
@@ -76,10 +78,9 @@ EOM
                 to_set[:"#{relation}_\#{field}"] = nil
               end
 
-              #{inverse_relation}.update to_set
+              #{inverse_relation}.update(to_set) unless to_set.empty?
             end
-EOM
-          meta.klass.class_eval callback_code
+          EOM
         end
 
       end

data/lib/mongoid/max/denormalize/version.rb

@@ -4,7 +4,7 @@ module Mongoid
     module Denormalize
       module Version
 
-        STRING = '0.0.4'
+        STRING = '0.0.5'
 
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_max_denormalize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: