Cleanup and additional checks

lib/logidze/model.rb

@@ -138,9 +138,11 @@ def switch_to!(version, append: Logidze.append_on_undo)
     def association(name)
       association = super
 
-      unless logidze_past? && association.klass.respond_to?(:has_logidze?)
-        return association
-      end
+      should_appply_logidze = logidze_past? &&
+        association.klass.respond_to?(:has_logidze?) &&
+        !association.singleton_class.include?(Logidze::VersionedAssociation)
+
+      return association unless should_appply_logidze
 
       association.singleton_class.prepend Logidze::VersionedAssociation
 
@@ -164,9 +166,7 @@ def apply_diff(version, diff)
     def logidze_past?
       return false unless @logidze_requested_ts
 
-      time = @logidze_requested_ts
-
-      time < Time.now.to_i * TIME_FACTOR
+      @logidze_requested_ts < Time.now.to_i * TIME_FACTOR
     end
 
     def parse_time(ts)

lib/logidze/versioned_association.rb

@@ -32,17 +32,19 @@ def logidze_stale?
 
       return false if target.empty?
 
-      owner.logidze_requested_ts != target.first.logidze_requested_ts
+      target.any? do |object|
+        owner.logidze_requested_ts != object.logidze_requested_ts
+      end
     end
 
     module CollectionAssociation
       def ids_reader
-        reload
+        reload unless loaded?
         super
       end
 
       def empty?
-        reload
+        reload unless loaded?
         super
       end
     end

spec/dummy/app/models/article.rb

@@ -1,20 +1,6 @@
 class Article < ActiveRecord::Base
-  # attr_accessor :errored
-
-  # validate :is_errored
-
   has_logidze
 
   belongs_to :user
   has_many :comments
-
-  # def reload
-  #   self.errored = nil
-  #   super
-  # end
-
-  # def is_errored
-  #   return unless errored
-  #   errors.add(:base, 'Errored')
-  # end
 end