activerecord-redundancy 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e68d174487cbdb7ec2061bf60b3a39058f645fa
-  data.tar.gz: c6a6434b61bc4cd1275a1cf4529b36e19b35640b
+  metadata.gz: 2a99315b6ab5b75fa9f75e316eb1b89eaeee46ce
+  data.tar.gz: a1924f47a0babed76fc894152b49b3c20f759770
 SHA512:
-  metadata.gz: 9875b90b5647087742c36a47d6e2ed9d179afa5f428352dda99a655179d4b882e44fed248d5629941828c7a7268f01185c7ee9a4d2acaac69b0e469b9788c619
-  data.tar.gz: 918fee0e77240ed84720392af096f75d8138071606e28dd3ff49efa66466a7b796622d48f9b4bd87aac26c1dec21a8cb1e203bd97735fdb58f4e08b63a7c9469
+  metadata.gz: e28a0907c6d60ab12ec1fea777be6a0c067289074b436d3a689fe5482c9c5cb7a10001cf7b50aa611b74ec8f51f3ead6d551ccc5a73933c35d6804fb32eef1c0
+  data.tar.gz: 32ba11f593050aa82759c59ef6cc381f9f1243004ecb48838c09eb864b8898e89915a3a601309bfa99d2c6442cb37c987dbb71e257e384c899dba1c1809ca66f

data/lib/redundancy.rb

@@ -3,6 +3,19 @@ require 'redundancy/utils'
 module Redundancy
   extend ActiveSupport::Concern
 
+  def self.update_redundancies
+    ActiveRecord::Base.subclasses.each do |klass|
+      klass.try :update_redundancies
+    end
+  end
+
+  def update_redundancies
+    self.class.redundancies.each do |redundancy|
+      redundancy.force_update!(self)
+    end
+    save(validate: false)
+  end
+
   included do
     before_save :update_redundancies_before_save
     after_save :update_redundancies_after_save
@@ -22,20 +35,14 @@ module Redundancy
     end
   end
 
-  def update_redundancies
-    self.class.redundancies.each do |redundancy|
-      redundancy.force_update!(self)
-    end
-  end
-
   module ClassMethods
     def cache_column association, attribute, options = {}
-      options.assert_valid_keys(:cache_column, :inverse_of)
+      options.assert_valid_keys(:cache_column, :default)
       Utils.cache_column self, association, attribute, options
     end
 
     def cache_method association, attribute, options = {}
-      options.assert_valid_keys(:cache_column, :inverse_of)
+      options.assert_valid_keys(:cache_method)
       Utils.cache_method self, association, attribute, options
     end
 
@@ -45,9 +52,7 @@ module Redundancy
 
     def update_redundancies
       all.each do |record|
-        redundancies.each do |redundancy|
-          redundancy.force_update!(record)
-        end
+        record.update_redundancies
       end
     end
 

data/lib/redundancy/update_base.rb

@@ -2,89 +2,117 @@ module Redundancy
 
   class UpdateBase
     attr_reader :options
-    attr_reader :source, :dest, :klass
-    attr_reader :change_if, :update, :force
-    attr_reader :target, :value
+    attr_reader :klass, :source, :dest, :change_if
+    attr_reader :context
 
     def initialize options
       @options = options
-      @source, @dest = options[:source], options[:dest]
       @klass = options[:klass]
-
+      @source, @dest = options[:source], options[:dest]
       @change_if = options[:change_if]
       @update = options[:update] || false
+
+      cleanup_context
     end
 
     def force_update! record
-      @force = true
-      @update = true
-      before_save record
-      after_save record
+      set_context :force, true
     end
 
+    # ActiveRecord Hooks
     def before_save record
     end
 
     def after_save record
     end
 
-    def get_target_from_association record
-      @target = dest[:association] ? record.send(dest[:association]) : record
+    protected
+
+    # Context
+    def set_context key, value
+      @context[key] = value
+    end
+
+    def cleanup_context
+      @context = {}
+    end
+
+    def update
+      @context[:update] || @update
+    end
+
+    def force
+      @context[:force]
     end
 
-    def get_target_from_prev_id record
-      prev_id = record.send(:attribute_was, dest[:prev_id])
-      return unless prev_id
-      @target = dest[:klass].where(id: prev_id)
+    def update_method
+      @context[:update_method] || (update ? :update_attribute : :write_attribute)
     end
 
-    def get_target_from_relation_first_record
-      @target = @target.first if @target.kind_of? ActiveRecord::Relation
+    def context key
+      @context[key]
     end
 
-    def get_value_from_association record
-      @value = source[:association] ? record.send(source[:association]) : record
-      @value = value && source[:attribute] && value.send(source[:attribute])
-      @value = nil if source[:nil_unless] && !record.send(source[:nil_unless])
-      @value
+    def get_target_from_association record, key = :default
+      set_context :"target_#{key}", dest[:association] ? record.send(dest[:association]) : record
     end
 
-    def get_value_from_source record
-      @value = source
+    def get_target_from_prev_association record, key = :default
+      set_context :"target_#{key}", record.send(:attribute_was, dest[:association])
     end
 
-    def get_value_from_target record
-      @value = target && source[:attribute] && target.send(source[:attribute])
+    def get_target_from_foreign_key record, key = :default
+      id = record.send(:attribute_was, dest[:foreign_key])
+      return unless id
+      set_context :"target_#{key}", dest[:klass].where(id: id)
+    end
+
+    def get_target_from_relation_first_record key = :default
+      target = context(:"target_#{key}")
+      set_context :"target_#{key}", target.first if target.kind_of? ActiveRecord::Relation
+    end
+
+    def get_value_from_association record, key = :default
+      value = source[:association] ? record.send(source[:association]) : record
+      value = value && source[:attribute] && value.send(source[:attribute])
+      value = nil if source[:nil_unless] && !record.send(source[:nil_unless])
+      set_context :"value_#{key}", value
+    end
+
+    def get_value_from_default record, key = :default
+      set_context :"value_#{key}", source[:default]
+    end
+
+    def get_value_from_target record, key = :default
+      target = context(:"target_#{key}")
+      set_context :"value_#{key}", target && source[:attribute] && target.send(source[:attribute])
     end
 
     def raise_if_class_mismatch record
       raise ArgumentError, "record class mismatch, expected #{klass}, got #{record.class}" unless record.kind_of? klass
     end
 
-    def update_target record
+    def update_target record, key = :default
+      target = context(:"target_#{key}")
+      value = context(:"value_#{key}")
+
       case target
       when ActiveRecord::Base
         return if target.send(:read_attribute, dest[:attribute]) == value
-        log "#{ update ? "update" : "write" } #{target.class}(#{target.id})##{dest[:attribute]} with #{value.inspect}"
-        log "#{change_if}: #{record.send(change_if).inspect}, #{dest[:association]||"self"}.id: #{target.id}" if change_if
-        if update
-          target.send(:update_attribute, dest[:attribute], value)
-        else
-          target.send(:write_attribute, dest[:attribute], value)
-        end
+        log "#{update_method} #{target.class}(#{target.id})##{dest[:attribute]} with #{value.inspect}"
+        target.send(update_method, dest[:attribute], value)
       when ActiveRecord::Relation
-        log "update #{target.class}##{dest[:attribute]} with #{value.inspect}"
+        log "update_all #{target.class}##{dest[:attribute]} with #{value.inspect}"
         target.send(:update_all, dest[:attribute] => value)
       end
     end
 
-    def force_update_target record
-      @update = true
-      update_target record
+    def need_update? record
+      force || !change_if || record.send(:attribute_changed?, change_if)
     end
 
-    def need_update? record
-      @force || !change_if || record.send(:attribute_changed?, change_if)
+    def foreign_key_changed? record
+      record.send(:attribute_changed?, dest[:foreign_key])
     end
 
     # require 'colorize'

data/lib/redundancy/update_column.rb

@@ -12,6 +12,8 @@ module Redundancy
       get_value_from_association record
 
       update_target record
+    ensure
+      cleanup_context
     end
 
   end

data/lib/redundancy/update_column_with_prev.rb

@@ -0,0 +1,27 @@
+require 'redundancy/update_base'
+
+module Redundancy
+
+  class UpdateColumnWithPrev < UpdateBase
+
+    def before_save record
+      raise_if_class_mismatch record
+      return unless need_update? record
+
+      get_target_from_association record
+      get_value_from_association record
+
+      update_target record
+
+      return unless foreign_key_changed? record
+      get_target_from_foreign_key record, :prev
+      get_value_from_default record, :prev
+
+      update_target record, :prev
+    ensure
+      cleanup_context
+    end
+
+  end
+
+end

data/lib/redundancy/update_method_with_prev.rb

@@ -0,0 +1,34 @@
+require 'redundancy/update_base'
+
+module Redundancy
+
+  class UpdateMethodWithPrev < UpdateBase
+
+    def before_save record
+      raise_if_class_mismatch record
+      return unless foreign_key_changed? record
+
+      get_target_from_foreign_key record, :prev
+      get_target_from_relation_first_record :prev
+    end
+
+    def after_save record
+      return unless need_update? record
+      set_context :update_method, :update_column
+
+      get_target_from_association record
+      get_value_from_target record
+
+      update_target record
+
+      return unless context(:"target_prev")
+
+      get_value_from_target record, :prev
+      update_target record, :prev
+    ensure
+      cleanup_context
+    end
+
+  end
+
+end

data/lib/redundancy/utils.rb

@@ -1,7 +1,6 @@
 require 'redundancy/update_column'
-require 'redundancy/update_prev_column'
-require 'redundancy/update_method'
-require 'redundancy/update_prev_method'
+require 'redundancy/update_column_with_prev'
+require 'redundancy/update_method_with_prev'
 
 module Redundancy
 
@@ -17,7 +16,7 @@ module Redundancy
       foreign_key = reflection.foreign_key
       remote_klass = reflection.klass
 
-      inverse_association = get_inverse_association local_klass, remote_klass, options
+      inverse_association = get_inverse_association local_klass, remote_klass, reflection.options
 
       cache_column = options[:cache_column] || :"#{association}_#{attribute}"
 
@@ -30,17 +29,44 @@ module Redundancy
         )
 
       when :has_one
-        remote_klass.redundancies << UpdateColumn.new(
-          source: { association: nil, attribute: attribute, nil_unless: foreign_key },
-          dest: { association: inverse_association, attribute: cache_column },
-          change_if: foreign_key, klass: remote_klass
-        )
-
-        remote_klass.redundancies << UpdatePrevColumn.new(
-          source: options[:default],
-          dest: { klass: local_klass, prev_id: foreign_key, attribute: cache_column },
-          change_if: foreign_key, klass: remote_klass
-        )
+        if reflection.through_reflection
+
+          through_reflection = reflection.through_reflection
+          if through_reflection.through_reflection
+            raise ArgumentError, "Multi level has_one through reflection is not support yet!"
+          end
+
+          through_foreign_key = through_reflection.foreign_key
+          through_remote_klass = through_reflection.klass
+          through_association = reflection.source_reflection_name
+          through_inverse_association = get_inverse_association local_klass, through_remote_klass
+
+          case through_reflection.macro
+          when :belongs_to
+            local_klass.redundancies << UpdateColumn.new(
+              source: { association: association, attribute: attribute },
+              dest: { association: nil, attribute: cache_column },
+              change_if: through_foreign_key, klass: local_klass
+            )
+
+          when :has_one
+            raise ArgumentError, "has_one through has_one reflection is not support yet!"
+          end
+
+          through_remote_klass.redundancies << UpdateColumn.new(
+            source: { association: through_association, attribute: attribute },
+            dest: { association: through_inverse_association, attribute: cache_column },
+            change_if: foreign_key, klass: through_remote_klass
+          )
+
+        else
+          remote_klass.redundancies << UpdateColumnWithPrev.new(
+            source: { association: nil, attribute: attribute, nil_unless: foreign_key, default: options[:default] },
+            dest: { klass: local_klass, foreign_key: foreign_key, association: inverse_association, attribute: cache_column },
+            change_if: foreign_key, klass: remote_klass
+          )
+
+        end
 
       end
 
@@ -51,7 +77,7 @@ module Redundancy
       )
     end
 
-    def self.cache_method klass, association, attribute, options
+    def self.cache_method klass, association, attribute, options = {}
       local_klass = klass
 
       reflection = get_reflection local_klass, association
@@ -63,27 +89,23 @@ module Redundancy
 
       cache_method = options[:cache_method] || :"raw_#{attribute}"
 
-      local_klass.redundancies << UpdateMethod.new(
-        source: { attribute: cache_method },
-        dest: { association: association, attribute: attribute },
-        change_if: options[:change_if], klass: local_klass
-      )
-
-      local_klass.redundancies << UpdatePrevMethod.new(
+      local_klass.redundancies << UpdateMethodWithPrev.new(
         source: { attribute: cache_method },
-        dest: { klass: remote_klass, prev_id: foreign_key, attribute: attribute },
-        change_if: foreign_key, klass: local_klass
+        dest: { klass: remote_klass, foreign_key: foreign_key, association: association, attribute: attribute },
+        change_if: nil, klass: local_klass
       )
 
     end
 
+    private
+
     def self.get_reflection klass, association
       reflection = klass.reflect_on_association(association)
       raise ArgumentError, "Unknown association :#{association}" unless reflection
       reflection
     end
 
-    def self.get_inverse_association klass, reflection_klass, options
+    def self.get_inverse_association klass, reflection_klass, options = {}
       model_name = klass.model_name
       inverse_associations = options[:inverse_of]
       inverse_associations ||= [model_name.plural, model_name.singular].map(&:to_sym)
@@ -96,7 +118,6 @@ module Redundancy
       inverse_association
     end
 
-
   end
 
 end

data/lib/redundancy/version.rb

@@ -1,3 +1,3 @@
 module Redundancy
-  VERSION = "0.3.3"
+  VERSION = "0.4.1"
 end

data/test/cache_column/has_many_belongs_to_association_test.rb

@@ -54,7 +54,7 @@ class HasManyBelongsToAssociationTest < ActiveSupport::TestCase
     assert_equal user.name, post.user_name
 
     user.update_attribute(:name, "Other Name")
-    user.posts.each do |post|
+    user.posts.reload.each do |post|
       assert_equal user.name, post.user_name
     end
     assert_equal user.name, post.reload.user_name

data/test/cache_column/has_one_through_belongs_to_association_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class HasOneThroughBelongsToAssociationTest < ActiveSupport::TestCase
+
+  # has_one:through:belongs_to association
+  test "should update post.account_email when create post" do
+    account = accounts(:one)
+    user = users(:one)
+    post = Post.create(title: 'title', content: 'content', user: user)
+    assert_equal account.email, post.account_email
+  end
+
+  test "should update post.account_email when update post.user" do
+    account = accounts(:one)
+    user = users(:one)
+    post = posts(:two)
+    assert_not_equal account.email, post.account_email
+
+    post.update_attribute(:user, user)
+    assert_equal account.email, post.account_email
+    assert_equal account.email, post.reload.account_email
+  end
+
+  test "should update post.account_email when update user.account" do
+    account = accounts(:one)
+    user = users(:two)
+    post = posts(:two)
+    assert_not_equal account.email, post.account_email
+
+    user.update_attribute(:account, account)
+    assert_equal account.email, post.reload.account_email
+  end
+
+  test "should update post.account_email when update account.email" do
+    account = accounts(:one)
+    user = users(:one)
+    post = posts(:one)
+    assert_equal account.email, post.account_email
+
+    account.update_attribute(:email, "other@email.com")
+    assert_equal account.email, post.reload.account_email
+  end
+
+end

data/test/cache_column/options_test.rb

@@ -6,7 +6,7 @@ class OptionsTest < ActiveSupport::TestCase
   test "should update post.username when create post" do
     user = users(:one)
     post = Post.create(title: 'title', content: 'content', user: user)
-    assert_equal post.username, user.name
+    assert_equal user.name, post.username
   end
 
-end
+end

data/test/fixtures/posts.yml

@@ -7,6 +7,7 @@ one:
   user_id: 1
   user_name: Name 1
   username: Name 1
+  account_email: one@one.com
   star: 3
 
 two:
@@ -16,4 +17,5 @@ two:
   user_id: 2
   user_name: Name 2
   username: Name 2
+  account_email: two@two.com
   star: 5

data/test/support/environment.rb

@@ -12,16 +12,34 @@ ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define do
 
   create_table "accounts", force: true do |t|
-    t.string   "user_name"
     t.string   "email"
+    t.string   "user_name"
+    t.string   "session_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", force: true do |t|
+    t.integer  "account_id"
+    t.string   "account_email"
+    t.string   "session_name"
+    t.integer  "posts_count"
+    t.integer  "posts_star"
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table "sessions", force: true do |t|
+    t.integer  "user_id"
+    t.string   "name"
+  end
+
   create_table "posts", force: true do |t|
     t.integer  "user_id"
     t.string   "user_name"
     t.string   "username"
+    t.string   "account_email"
     t.integer  "star"
     t.string   "title"
     t.text     "content"
@@ -31,16 +49,6 @@ ActiveRecord::Schema.define do
 
   add_index "posts", ["user_id"], name: "index_posts_on_user_id"
 
-  create_table "users", force: true do |t|
-    t.integer  "account_id"
-    t.string   "account_email"
-    t.integer  "posts_count"
-    t.integer  "posts_star"
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
 end
 
 autoload :Account, 'support/models/account'

data/test/support/models/account.rb

@@ -1,5 +1,7 @@
 class Account < ActiveRecord::Base
   has_one :user
+  has_one :session, through: :user
+  has_many :posts, through: :user
 
   cache_column :user, :name
 end

data/test/support/models/post.rb

@@ -1,5 +1,8 @@
 class Post < ActiveRecord::Base
   belongs_to :user
+  has_one :account, through: :user
+
+  cache_column :account, :email
 
   cache_column :user, :name
   cache_column :user, :name, cache_column: :username

data/test/support/models/session.rb

@@ -0,0 +1,3 @@
+class Session < ActiveRecord::Base
+  belongs_to :user
+end

data/test/support/models/user.rb

@@ -1,6 +1,7 @@
 class User < ActiveRecord::Base
-  has_many :posts
   belongs_to :account
+  has_one :session
+  has_many :posts
 
   cache_column :account, :email
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-redundancy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Theo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +127,14 @@ files:
 - lib/redundancy.rb
 - lib/redundancy/update_base.rb
 - lib/redundancy/update_column.rb
-- lib/redundancy/update_method.rb
-- lib/redundancy/update_prev_column.rb
-- lib/redundancy/update_prev_method.rb
+- lib/redundancy/update_column_with_prev.rb
+- lib/redundancy/update_method_with_prev.rb
 - lib/redundancy/utils.rb
 - lib/redundancy/version.rb
 - test/cache_column/belongs_to_has_one_association_test.rb
 - test/cache_column/has_many_belongs_to_association_test.rb
 - test/cache_column/has_one_belongs_to_association_test.rb
+- test/cache_column/has_one_through_belongs_to_association_test.rb
 - test/cache_column/options_test.rb
 - test/cache_method/has_many_belongs_to_association_test.rb
 - test/fixtures/accounts.yml
@@ -115,6 +143,7 @@ files:
 - test/support/environment.rb
 - test/support/models/account.rb
 - test/support/models/post.rb
+- test/support/models/session.rb
 - test/support/models/user.rb
 - test/test_helper.rb
 homepage: https://github.com/bbtfr/activerecord-redundancy
@@ -137,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redundancy for better performance, non painful
@@ -145,6 +174,7 @@ test_files:
 - test/cache_column/belongs_to_has_one_association_test.rb
 - test/cache_column/has_many_belongs_to_association_test.rb
 - test/cache_column/has_one_belongs_to_association_test.rb
+- test/cache_column/has_one_through_belongs_to_association_test.rb
 - test/cache_column/options_test.rb
 - test/cache_method/has_many_belongs_to_association_test.rb
 - test/fixtures/accounts.yml
@@ -153,6 +183,6 @@ test_files:
 - test/support/environment.rb
 - test/support/models/account.rb
 - test/support/models/post.rb
+- test/support/models/session.rb
 - test/support/models/user.rb
 - test/test_helper.rb
-has_rdoc: 

data/lib/redundancy/update_method.rb

@@ -1,19 +0,0 @@
-require 'redundancy/update_base'
-
-module Redundancy
-
-  class UpdateMethod < UpdateBase
-
-    def after_save record
-      raise_if_class_mismatch record
-      return unless need_update? record
-
-      get_target_from_association record
-      get_value_from_target record
-
-      force_update_target record
-    end
-
-  end
-
-end

data/lib/redundancy/update_prev_column.rb

@@ -1,19 +0,0 @@
-require 'redundancy/update_base'
-
-module Redundancy
-
-  class UpdatePrevColumn < UpdateBase
-
-    def before_save record
-      raise_if_class_mismatch record
-      return unless need_update? record
-
-      get_target_from_prev_id record
-      get_value_from_source record
-
-      update_target record
-    end
-
-  end
-
-end

data/lib/redundancy/update_prev_method.rb

@@ -1,24 +0,0 @@
-require 'redundancy/update_base'
-
-module Redundancy
-
-  class UpdatePrevMethod < UpdateBase
-
-    def before_save record
-      raise_if_class_mismatch record
-      return unless need_update? record
-
-      get_target_from_prev_id record
-      get_target_from_relation_first_record
-    end
-
-    def after_save record
-      return unless target
-
-      get_value_from_target record
-      force_update_target record
-    end
-
-  end
-
-end