has_moderated 1.0.rc4 → 1.0.rc5

data/test/dummy/spec/models/photo_spec.rb

@@ -1,5 +1,10 @@
 require File.expand_path('../../spec_helper', __FILE__)
-require File.expand_path('../../support/photos', __FILE__)
+
+def reload_models
+  crazy_models.reset
+  crazy_models.with_helpers &block if block_given?
+  crazy_models
+end
 
 describe Photo do
   before(:each) do
@@ -9,11 +14,12 @@ describe Photo do
   
   context "create moderated:" do
     before do
-      Object.send(:remove_const, 'Photo')
-      load 'photo.rb'
-      Photo.has_moderated_create
-      Photo.send :include, HasModerated::CarrierWave
-      Photo.has_moderated_carrierwave_field :avatar
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        has_moderated_create
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+      }
     end
     
     it "should upload photo" do
@@ -34,8 +40,9 @@ describe Photo do
 
   context "not moderated:" do
     before do
-      Object.send(:remove_const, 'Photo')
-      load 'photo.rb'
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+      }
     end
     
     it "should upload photo" do
@@ -52,11 +59,12 @@ describe Photo do
   
   context "update moderated:" do
     before do
-      Object.send(:remove_const, 'Photo')
-      load 'photo.rb'
-      Photo.send :include, HasModerated::CarrierWave
-      Photo.has_moderated_carrierwave_field :avatar
-      Photo.has_moderated :avatar
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+        has_moderated :avatar
+      }
     end
 
     it "should moderate photo (on create)" do
@@ -92,4 +100,55 @@ describe Photo do
       assert_photo_uploaded(photo.avatar)
     end
   end
+  
+  context "moderated as association to has_moderated_create:" do
+    before do
+      reload_models.task {
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_many :photos, :class_name => photo_class_name, :foreign_key => "parentable_id"
+        has_moderated_create :with_associations => [:photos, :renamed_subtasks]
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name
+      }.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+        belongs_to :task, :class_name => task_class_name, :foreign_key => "parentable_id"
+      }
+      
+    end
+    
+    it "should upload photo" do
+      task = Task.new :title => "Task 1"
+      task.photos.build :avatar => carrierwave_test_photo
+      task.save
+
+      Task.count.should eq(0)
+      Photo.count.should eq(0)
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      Moderation.last.accept
+      tmpEmpty?.should be_true
+      uploadEmpty?.should be_false
+
+      Task.first.photos.count.should eq(1)
+      photo = Task.first.photos.first
+      assert_photo_uploaded(photo.avatar)
+    end
+    
+    it "should not add any photos if none were added" do
+      task = Task.new :title => "Task 1"
+      task.renamed_subtasks.build :title => "Subtask 1"
+      task.save
+      
+      Moderation.last.parsed_data[:create][:associations][:photos].should be_nil
+
+      Task.count.should eq(0)
+      Photo.count.should eq(0)
+      Moderation.last.accept
+
+      Task.first.photos.count.should eq(0)
+      Photo.count.should eq(0)
+    end
+  end
 end

data/test/dummy/spec/models/task_spec.rb

@@ -1,10 +1,9 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-def reload_task_subtask
-  Object.send(:remove_const, 'Task') if defined? Task
-  load 'task.rb'
-  Object.send(:remove_const, 'Subtask') if defined? Subtask
-  load 'subtask.rb'
+def reload_models &block
+  crazy_models.reset
+  crazy_models.with_helpers &block if block_given?
+  crazy_models
 end
 
 describe Task do
@@ -16,9 +15,12 @@ describe Task do
   
   context "has_many association:" do
     before do
-      reload_task_subtask
-      Task.has_many :renamed_subtasks, :class_name => "Subtask"
-      Task.has_moderated_association :renamed_subtasks
+      reload_models.task {
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_moderated_association :renamed_subtasks
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name, :foreign_key => task_fk
+      }
     end
     
     it "creates and associates subtask (create)" do
@@ -125,10 +127,12 @@ describe Task do
   
   context "has_many polymorphic association:" do
     before do
-      reload_task_subtask
-      Task.has_many :renamed_subtasks, :class_name => "Subtask", :as => :parentable
-      Subtask.belongs_to :parentable, :polymorphic => true
-      Task.has_moderated_association :renamed_subtasks
+      reload_models.task {
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :as => :parentable
+        has_moderated_association :renamed_subtasks
+      }.subtask {  
+        belongs_to :parentable, :class_name => task_class_name, :polymorphic => true
+      }
     end
     
     it "creates and associates subtask (create)" do
@@ -145,7 +149,7 @@ describe Task do
       
       subtask = Task.first.renamed_subtasks.first
       subtask.title.should eq("Subtask 1")
-      subtask.parentable_type.should eq("Task")
+      subtask.parentable.should eq(Task.first)
     end
   end
 
@@ -156,10 +160,12 @@ describe Task do
   
   context "has_one polymorphic association:" do
     before do
-      reload_task_subtask
-      Task.has_one :renamed_subtask, :class_name => "Subtask", :as => :parentable
-      Subtask.belongs_to :parentable, :polymorphic => true
-      Task.has_moderated_association :renamed_subtask
+      reload_models.task {
+        has_one :renamed_subtask, :class_name => subtask_class_name, :as => :parentable
+        has_moderated_association :renamed_subtask
+      }.subtask {  
+        belongs_to :parentable, :class_name => task_class_name, :polymorphic => true
+      }
     end
     
     it "creates and associates subtask (create)" do
@@ -177,7 +183,7 @@ describe Task do
       
       subtask = Task.first.renamed_subtask
       subtask.title.should eq("Subtask 1")
-      subtask.parentable_type.should eq("Task")
+      subtask.parentable.should eq(Task.first)
     end
   end
   
@@ -188,10 +194,12 @@ describe Task do
   
   context "has_and_belongs_to_many association:" do
     before do
-      reload_task_subtask
-      Task.has_and_belongs_to_many :renamed_subtasks, :class_name => "Subtask", :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
-      Subtask.has_and_belongs_to_many :renamed_tasks, :class_name => "Task", :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
-      Task.has_moderated_association :renamed_subtasks
+      reload_models.task {
+        has_and_belongs_to_many :renamed_subtasks, :class_name => subtask_class_name, :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
+        has_moderated_association :renamed_subtasks
+      }.subtask {
+        has_and_belongs_to_many :renamed_tasks, :class_name => task_class_name, :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
+      }
     end
     
     it "creates and associates a new subtask" do
@@ -228,12 +236,15 @@ describe Task do
       subtask.title.should eq("Subtask 1")
     end
   end
+  
   context "has_and_belongs_to_many association (create moderation):" do
     before :each do # important that we do this before EACH
-      reload_task_subtask
-      Task.has_moderated_create :with_associations => [:renamed_subtasks]
-      Task.has_and_belongs_to_many :renamed_subtasks, :class_name => "Subtask", :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
-      Subtask.has_and_belongs_to_many :renamed_tasks, :class_name => "Task", :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
+      reload_models.task {
+        has_moderated_create :with_associations => [:renamed_subtasks]
+        has_and_belongs_to_many :renamed_subtasks, :class_name => subtask_class_name, :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
+      }.subtask {
+        has_and_belongs_to_many :renamed_tasks, :class_name => task_class_name, :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
+      }
     end
     
     it "associates an existing subtask on create 1" do
@@ -283,13 +294,18 @@ describe Task do
   
   context "has_many :through association:" do
     before do
-      reload_task_subtask
-      Task.has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m1_id"
-      Task.has_many :renamed_subtasks, :class_name => "Subtask", :through => :renamed_connections, :source => :renamed_subtask
-      Subtask.has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m2_id"
-      Subtask.has_many :renamed_tasks, :class_name => "Task", :through => :renamed_connections, :source => :renamed_task
-      Task.has_moderated_association :renamed_subtasks
-      Task.has_moderated_association :renamed_connections
+      reload_models.task {
+        has_many :renamed_connections, :class_name => task_connection_class_name, :foreign_key => "m1_id"
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :through => :renamed_connections, :source => :renamed_subtask
+        has_moderated_association :renamed_subtasks
+        has_moderated_association :renamed_connections
+      }.subtask {
+        has_many :renamed_connections, :class_name => task_connection_class_name, :foreign_key => "m2_id"
+        has_many :renamed_tasks, :class_name => task_class_name, :through => :renamed_connections, :source => :renamed_task
+      }.task_connection {
+        belongs_to :renamed_task, :class_name => task_class_name, :foreign_key => "m1_id"
+        belongs_to :renamed_subtask, :class_name => subtask_class_name, :foreign_key => "m2_id"
+      }
     end
     
     it "associates subtask 1 (update)" do
@@ -373,9 +389,12 @@ describe Task do
   
   context "has_one association:" do
     before do
-      reload_task_subtask
-      Task.has_one :renamed_subtask, :class_name => "Subtask"
-      Task.has_moderated_association :renamed_subtask
+      reload_models.task {
+        has_one :renamed_subtask, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_moderated_association :renamed_subtask
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name
+      }
     end
     
     it "creates and associates subtask (= new, task save)" do
@@ -430,15 +449,72 @@ describe Task do
     end
   end
   
+  context "has_one association (create moderation):" do
+    before :each do
+      reload_models.task {
+        has_one :renamed_subtask, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_moderated_create :with_associations => [:renamed_subtask]
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name
+      }
+    end
+    
+    it "associates an existing subtask on create 1" do
+      Task.has_moderated_association :renamed_subtask
+      Subtask.create! :title => "Subtask 1"
+      Subtask.count.should eq(1)
+      Moderation.count.should eq(0)
+
+      task = Task.new :title => "Task 1"
+      task.renamed_subtask = Subtask.first
+      task.save
+      
+      Subtask.first.task_id.should be_nil
+
+      Task.count.should eq(0)
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+      Subtask.first.task_id.should_not be_nil
+
+      subtask = Task.first.renamed_subtask
+      subtask.title.should eq("Subtask 1")
+    end
+    
+    it "associates an existing subtask on create 2" do
+      Subtask.create! :title => "Subtask 1"
+      Subtask.count.should eq(1)
+      Moderation.count.should eq(0)
+
+      task = Task.new :title => "Task 1"
+      task.renamed_subtask = Subtask.first
+      task.save
+      
+      Subtask.first.task_id.should be_nil
+
+      Task.count.should eq(0)
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+      Subtask.first.task_id.should_not be_nil
+
+      subtask = Task.first.renamed_subtask
+      subtask.title.should eq("Subtask 1")
+    end
+  end
+  
   #
   # has_moderated_create
   #
   
   context "create moderation with association:" do
     before do
-      reload_task_subtask
-      Task.has_many :renamed_subtasks, :class_name => "Subtask"
-      Task.has_moderated_create :with_associations => [:renamed_subtasks]
+      reload_models.task {
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_moderated_create :with_associations => [:renamed_subtasks]
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name
+      }
     end
     
     it "moderates create" do
@@ -462,6 +538,13 @@ describe Task do
       Task.last.renamed_subtasks.count.should eq(1)
       Task.last.renamed_subtasks.first.title.should eq("Subtask 1")
     end
+    
+    it "doesn't create anything if nothing was created" do
+      task = Task.create! :title => "Task 1"
+      Moderation.last.accept
+      
+      Task.first.renamed_subtasks.count.should eq(0)
+    end
   end
   
   #
@@ -470,8 +553,9 @@ describe Task do
   
   context "destroy moderation:" do
     before do
-      reload_task_subtask
-      Task.has_moderated_destroy
+      reload_models.task {
+        has_moderated_destroy
+      }
     end
     
     it "moderates destroy" do
@@ -490,8 +574,9 @@ describe Task do
   
   context "moderates attributes:" do
     before do
-      reload_task_subtask
-      Task.has_moderated :title
+      reload_models.task {
+        has_moderated :title
+      }
     end
     
     it "moderates an attribute" do
@@ -513,13 +598,14 @@ describe Task do
   
   context "common features:" do
     it "get_moderation_attributes can be overriden in model" do
-      reload_task_subtask
-      Task.has_moderated_create
-      Task.class_eval do
-        def get_moderation_attributes
-          { :test => "ok" }
+      reload_models.task {
+        has_moderated_create
+        self.class_eval do
+          def get_moderation_attributes
+            { :test => "ok" }
+          end
         end
-      end
+      }
       Task.create! :title => "Task 1"
       data = YAML::load(Moderation.last.data)[:create][:attributes]
       data.should_not be_blank
@@ -529,8 +615,9 @@ describe Task do
     end
     
     it "knows if it's a create moderation" do
-      reload_task_subtask
-      Task.has_moderated_create
+      reload_models.task {
+        has_moderated_create
+      }
       
       Task.create! :title => "Task 1"
       
@@ -540,8 +627,9 @@ describe Task do
     end
     
     it "knows if it's a destroy moderation" do
-      reload_task_subtask
-      Task.has_moderated_destroy
+      reload_models.task {
+        has_moderated_destroy
+      }
       
       Task.create! :title => "Task 1"
       Task.last.destroy
@@ -554,11 +642,12 @@ describe Task do
   
   context "hooks:" do
     before do
-      reload_task_subtask
-      Task.has_moderated :title
-      Task.moderation_creating do |moderation|
-        moderation.data = "Test!"
-      end
+      reload_models.task {
+        has_moderated :title
+        moderation_creating do |moderation|
+          moderation.data = "Test!"
+        end
+      }
     end
     
     it "handles a creating hook properly" do
@@ -569,18 +658,110 @@ describe Task do
   end
   
   context "preview:" do
-    before do
-      reload_task_subtask
-      Task.has_moderated :title
+    it "shows a live preview of changed attributes" do
+      reload_models.task {
+        has_moderated :title
+      }
+      
+      Task.create! :title => "Task 1"
+      Task.last.title.should be_blank
+      
+      last_task_id = Task.last.id
+      Moderation.last.live_preview do |preview|
+        preview.title.should eq("Task 1")
+        preview.id.should eq(last_task_id)
+      end
+      
+      Task.last.title.should be_blank
     end
     
-    it "shows a preview of changed attributes" do
-      Task.create! :title => "Task 1"
+    it "shows a saved preview of changed attributes" do
+      reload_models.task {
+        has_moderated :title
+      }
+      
+      task = Task.create! :title => "Task 1"
       Task.last.title.should be_blank
       
       preview = Moderation.last.preview
       preview.title.should eq("Task 1")
       preview.id.should eq(Task.last.id)
+      Task.last.title.should be_blank
+    end
+    
+    it "supports dirty tracking for the saved preview" do
+      reload_models.task {
+        has_moderated :title
+      }
+      
+      task = Task.create! :title => "Task 1"
+      Task.last.title.should be_blank
+      
+      preview = Moderation.last.preview
+      preview.title_changed?.should be_true
+      preview.title_change.should eq([nil, "Task 1"])
+    end
+    
+    it "shows a saved preview of has_many association" do
+      reload_models.task {
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :foreign_key => task_fk
+        has_moderated_association :renamed_subtasks
+      }.subtask {
+        belongs_to :task, :class_name => task_class_name
+      }
+      
+      task = Task.create! :title => "Task 1"
+      
+      task.renamed_subtasks.create! :title => "Subtask 1"
+      preview = Moderation.last.preview
+      subtask = preview.renamed_subtasks.first
+      subtask.title.should eq("Subtask 1")
+      subtask.id.should_not be_blank
+      subtask.task.should_not be_blank
+      
+      Task.last.renamed_subtasks.count.should eq(0)
+      Subtask.count.should eq(0)
+    end
+    
+    it "shows a saved preview of has_many :through association" do
+      reload_models.task {
+        attr_accessible :title, :desc
+        has_many :renamed_connections, :class_name => task_connection_class_name, :foreign_key => "m1_id"
+        has_many :renamed_subtasks, :class_name => subtask_class_name, :through => :renamed_connections, :source => :renamed_subtask
+        has_moderated_association :renamed_subtasks
+        has_moderated_association :renamed_connections
+      }.subtask {
+        attr_accessible :title, :desc
+        belongs_to :task
+        has_many :renamed_connections, :class_name => task_connection_class_name, :foreign_key => "m2_id"
+        has_many :renamed_tasks, :class_name => task_class_name, :through => :renamed_connections, :source => :renamed_task
+      }.task_connection {
+        belongs_to :renamed_task, :class_name => task_class_name, :foreign_key => "m1_id"
+        belongs_to :renamed_subtask, :class_name => subtask_class_name, :foreign_key => "m2_id"
+      }
+
+      task = Task.create! :title => "Task 1"
+      conn = TaskConnection.new :title => "Connection 1"
+      conn.renamed_subtask = Subtask.new :title => "Subtask 1"
+      task.renamed_connections << conn
+      task.save
+      
+      TaskConnection.count.should eq(0)
+      Subtask.count.should eq(0)
+      
+      task = Moderation.last.preview
+      
+      TaskConnection.count.should eq(0)
+      Subtask.count.should eq(0)
+      Moderation.count.should eq(1)
+      
+      subtask = task.renamed_subtasks.first
+      subtask.title.should eq("Subtask 1")
+      subtask.renamed_connections.first.should be_present
+      conn = task.renamed_connections.first
+      conn.title.should eq("Connection 1")
+      conn.renamed_subtask.title.should eq("Subtask 1")
+      conn.renamed_task.title.should eq("Task 1")
     end
   end
 end

data/test/dummy/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spork'
+require 'pry'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 

data/test/dummy/spec/support/crazy_models.rb

@@ -0,0 +1,85 @@
+# This is crazy and ugly and a hack! But it works and I don't want to have 100 different model files in models/
+# Please do not use this code for your stuff, it's not optimal in any way. I will probably do this more properly when
+# I have the time.
+
+def crazy_model_classes
+  [:Task, :Subtask, :TaskConnection, :Photo]
+end
+
+def crazy_models
+  $crazy_models ||= CrazyModels.new
+end
+
+class CrazyModels
+  module SetupHelpers
+    crazy_model_classes.each do |name|
+      self.send(:define_method, "#{name.to_s.underscore}_class_name") do
+        crazy_models.get_klass(name).to_s
+      end
+      self.send(:define_method, "#{name.to_s.underscore}_fk") do
+        name.to_s.underscore + "_id"
+      end
+    end
+  end
+  
+  class SetupHelperHolder
+    extend SetupHelpers
+  end
+  
+  def initialize
+    @counter = 0
+    @current_models = Hash.new
+  end
+  
+  def with_helpers &block
+    SetupHelperHolder.class_eval &block
+  end
+  
+  crazy_model_classes.each do |name|
+    self.send(:define_method, name.to_s.underscore) do |&block|
+      @current_models[name].class_eval(&block)
+      self
+    end
+  end
+  
+  def reset
+    @counter += 1
+    crazy_model_classes.each do |name|
+      klass_name = "#{name}#{@counter}"
+      table_name = name.to_s.underscore.pluralize
+      klass = Class.new(ActiveRecord::Base) do
+        self.table_name = table_name
+        extend SetupHelpers
+        self
+      end
+      klass = Object.const_set(klass_name, klass)
+      @current_models[name] = klass
+    end
+    self
+  end
+  
+  def get_klass model_name
+    @current_models[model_name]
+  end
+  
+  def access model_name, method, *args, &block
+    @current_models[model_name].send(method, *args, &block) if @current_models[model_name]
+  end
+end
+
+# This part is especially ugly and unncessary, but I'm lazy...
+crazy_model_classes.each do |name|
+  begin
+    Object.instance_eval{ remove_const name }
+  rescue ; end
+  # proxy module, proxies to current AR model
+  m = Module.new do
+    def self.method_missing(m, *args, &block)
+      $crazy_models.access(name.to_sym, m, *args, &block)
+    end
+  end
+  Object.const_set name.to_s, m
+end
+
+# initialize
+crazy_models.reset

data/test/dummy/spec/support/photos.rb

@@ -10,11 +10,12 @@ def tmpEmpty?
 end
 
 def uploadEmpty?
-  dirEmpty?(UPLOADDIR)
+  photoModel = crazy_models.get_klass(:Photo)
+  dir = File.expand_path("../../../public/uploads/#{photoModel.to_s.underscore}/avatar", __FILE__)
+  dirEmpty?(dir)
 end
 
 TEMPDIR = File.expand_path("../../../public/uploads/tmp", __FILE__)
-UPLOADDIR = File.expand_path("../../../public/uploads/photo/avatar/1", __FILE__)
 
 def carrierwave_test_photo
   test_photo_path = File.expand_path("../../../public/test.jpg", __FILE__)