has_moderated 1.0.rc3 → 1.0.rc4

data/lib/has_moderated/active_record/active_record_helpers.rb

@@ -0,0 +1,107 @@
+# everything that does with activerecord should be here.
+# use a wrapper that calls stuff from here, so that impl. can be switched eg with mongomapper
+# also write test that if one attr is moderated and one is not, the unmoderated one must still save immediately!
+
+module HasModerated
+  module ActiveRecordHelpers
+    # AR specific
+    def self.foreign_key(reflection)
+      if reflection.respond_to?(:foreign_key)
+        reflection.foreign_key
+      else # Rails < v3.1
+        reflection.primary_key_name
+      end
+    end
+    
+    # General
+    def self.add_moderations_association(klass)
+      klass.class_eval do
+        has_many :moderations, :as => :moderatable, :dependent => :destroy
+      end
+    end
+    
+    def self.get_default_moderation_attributes(record)
+      record.attributes
+    end
+    
+    def self.hashize_association(from_record, assoc_name, m)
+      # todo
+      through_assocs = {}
+      from_record.class.reflections.keys.each do |assoc|
+        join_model = from_record.class.reflections[assoc.to_sym].options[:through]
+        if join_model
+          join_model = join_model.to_sym
+          through_assocs[join_model] ||= []
+          through_assocs[join_model].push(assoc)
+        end
+      end
+      
+      assoc = nil
+      if m.class == Fixnum
+        assoc = m
+      elsif m.kind_of? Hash  # already a hash (for has_many :through association)
+        assoc = m
+      elsif m.respond_to?(:get_moderation_attributes) && m.new_record?
+        assoc = m.get_moderation_attributes
+      elsif m.respond_to?(:get_moderation_attributes)
+        assoc = m.id
+      else
+        raise "don't know how to convert #{m.class} to hash"
+      end
+      
+      if through_assocs[assoc_name.to_sym] # TODO !
+        assoc[:associations] = get_assocs_for_moderation(:all, m)
+      end
+      assoc
+    end
+    
+    def self.get_assocs_for_moderation assocs, from_record = nil
+      from_record ||= self
+      return if assocs.blank?
+
+      if assocs == :all
+        assocs = from_record.class.reflections.keys.reject do |r|
+          r == :moderations
+        end
+      end
+
+      assocs = [assocs] unless assocs.respond_to?("[]")
+
+      # check for through assocs
+      assocs = assocs.dup
+      through_assocs = {}
+      assocs.each do |assoc|
+        join_model = from_record.class.reflections[assoc.to_sym].options[:through]
+        if join_model
+          join_model = join_model.to_sym
+          through_assocs[join_model] ||= []
+          through_assocs[join_model].push(assoc)
+          assocs.push(join_model) unless assocs.include?(join_model)
+          #assocs.delete(assoc)
+        end
+      end
+
+      assoc_attrs = {}
+      assocs.each do |assoc|
+        one_assoc = []
+        assoc_value = from_record.send(assoc)
+        # if it's has_one it won't be an array
+        assoc_value = [assoc_value] if assoc_value && assoc_value.class != Array
+        assoc_value ||= []
+        assoc_value.each do |m|
+          if m.new_record?
+            one_assoc.push(m.get_moderation_attributes)
+          else
+            one_assoc.push(m.id)
+          end
+          if through_assocs[assoc.to_sym]
+            one_assoc.last[:associations] = get_assocs_for_moderation(:all, m)
+          end
+        end
+        assoc_attrs[assoc] = one_assoc unless one_assoc.empty?
+      end
+
+      assoc_attrs
+    end
+  end
+end

data/lib/has_moderated/associations/base.rb

@@ -71,7 +71,7 @@ module HasModerated
       
         def self.apply_add_association(to, reflection, attrs)
           klass = reflection.class_name.constantize
-          fk = HasModerated::Adapters::ActiveRecord::foreign_key(reflection)
+          fk = HasModerated::ActiveRecordHelpers::foreign_key(reflection)
         
           attrs = HashWithIndifferentAccess.new(attrs) if attrs.kind_of? Hash
           
@@ -107,7 +107,8 @@ module HasModerated
                 # TODO: validations? sup?
               end
               if reflection.collection?
-                rec.send(reflection.name.to_s) << arec unless rec.send(reflection.name.to_s).include?(arec)
+                rec = rec.reload
+                #rec.send(reflection.name.to_s) << arec unless rec.send(reflection.name.to_s).include?(arec)
               else
                 rec.send(reflection.name.to_s + "=", arec)
               end
@@ -118,7 +119,7 @@ module HasModerated
         def self.apply_delete_association(to, reflection, attrs)
           m = reflection.class_name.constantize
 
-          fk = HasModerated::Adapters::ActiveRecord::foreign_key(reflection)
+          fk = HasModerated::ActiveRecordHelpers::foreign_key(reflection)
 
           return if attrs.blank?
           return if attrs.class != Fixnum

data/lib/has_moderated/associations/collection.rb

@@ -85,14 +85,14 @@ module HasModerated
         end
 
         def self.add_assoc_to_record_hm(to, record, reflection)
-          fk = HasModerated::Adapters::ActiveRecord::foreign_key(reflection).try(:to_s)
+          fk = HasModerated::ActiveRecordHelpers::foreign_key(reflection).try(:to_s)
           field = if !reflection.options[:as].blank?
             reflection.options[:as].to_s
           elsif !fk.blank?
             all_keys = []
             results = record.class.reflections.reject do |assoc_name, assoc|
-              all_keys.push(HasModerated::Adapters::ActiveRecord::foreign_key(assoc).try(:to_s))
-              !(HasModerated::Adapters::ActiveRecord::foreign_key(assoc).try(:to_s) == fk)
+              all_keys.push(HasModerated::ActiveRecordHelpers::foreign_key(assoc).try(:to_s))
+              !(HasModerated::ActiveRecordHelpers::foreign_key(assoc).try(:to_s) == fk)
             end
             if results.blank?
               raise "Please set foreign_key for both belongs_to and has_one/has_many! fk: #{fk}, keys: #{all_keys.to_yaml}"

data/lib/has_moderated/common.rb

@@ -10,7 +10,7 @@ module HasModerated
           attr_accessor :moderation_disabled
           @@moderation_disabled = false
         end  
-        HasModerated::Adapters::Proxy::add_moderations_association klass
+        HasModerated::ActiveRecordHelpers::add_moderations_association klass
       end
     end
     
@@ -42,7 +42,7 @@ module HasModerated
       end
       
       def get_moderation_attributes
-        HasModerated::Adapters::Proxy::get_default_moderation_attributes(self)
+        HasModerated::ActiveRecordHelpers::get_default_moderation_attributes(self)
       end
       
       def create_moderation_with_hooks!(*args)
@@ -68,7 +68,7 @@ module HasModerated
           assocs_processed[assoc_name] = []
           assoc_data_array.each do |assoc_data|
             # convert assoc data to either ID or, if it's a new record, hash of its attributes
-            pdata = HasModerated::Adapters::Proxy::hashize_association(self, assoc_name, assoc_data)
+            pdata = HasModerated::ActiveRecordHelpers::hashize_association(self, assoc_name, assoc_data)
             assocs_processed[assoc_name].push(pdata)
           end
         end

data/lib/has_moderated/moderated_create.rb

@@ -44,7 +44,7 @@ module HasModerated
 
       def to_moderation_created
         options = self.class.moderated_create_options
-        assoc_attrs = HasModerated::Adapters::ActiveRecord::get_assocs_for_moderation(options[:with_associations], self)
+        assoc_attrs = HasModerated::ActiveRecordHelpers::get_assocs_for_moderation(options[:with_associations], self)
 
         create_moderation_with_hooks!(:create => {
           :attributes => get_moderation_attributes,

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "1.0.rc3"
+  VERSION = "1.0.rc4"
 end

data/lib/has_moderated.rb

@@ -2,8 +2,7 @@ require 'has_moderated/common'
 require 'has_moderated/user_hooks'
 require 'has_moderated/moderation_model'
 
-require 'has_moderated/adapters/proxy'
-require 'has_moderated/adapters/active_record'
+require 'has_moderated/active_record/active_record_helpers'
 require 'has_moderated/associations/base'
 require 'has_moderated/associations/has_one'
 require 'has_moderated/associations/collection'

data/test/dummy/app/models/subtask.rb

@@ -1,3 +1,4 @@
 class Subtask < ActiveRecord::Base
+  attr_accessible :title, :desc
   belongs_to :task
 end

data/test/dummy/app/models/task.rb

@@ -1,3 +1,3 @@
 class Task < ActiveRecord::Base
-  attr_accessible :title
+  attr_accessible :title, :desc
 end

data/test/dummy/config/environments/test.rb

@@ -5,7 +5,7 @@ Dummy::Application.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true