has_moderated 1.2.2 → 1.2.3

data/Rakefile

@@ -25,7 +25,7 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = %w(--color)
-  spec.pattern = 'test/dummy/spec{,/*/**}/*_spec.rb'
+  spec.pattern = 'spec{,/*/**}/*_spec.rb'
 end
 
 task :prepare_test_env do

data/lib/has_moderated.rb

@@ -14,4 +14,4 @@ require 'has_moderated/moderated_create'
 require 'has_moderated/moderated_destroy'
 
 require 'has_moderated/carrier_wave'
-require 'has_moderated/railtie' if defined?(Rails)
+require 'has_moderated/railtie' if defined?(::Rails)

data/lib/has_moderated/associations/base.rb

@@ -100,7 +100,12 @@ module HasModerated
                 arec.send(key.to_s+"=", val)
               end
               # recursive, used for has_many :through
-              apply(arec, attrs, save_opts, preview_mode) if attrs[:associations].present?
+              if attrs[:associations].present?
+                Moderation.without_moderation do
+                  arec.save(save_opts)
+                end
+                apply(arec, attrs, save_opts, preview_mode)
+              end
             else
               raise "don't know how to parse #{attrs.class}"
             end
@@ -114,6 +119,7 @@ module HasModerated
                 #rec.send(reflection.name.to_s) << arec unless rec.send(reflection.name.to_s).include?(arec)
               else
                 rec.send(reflection.name.to_s + "=", arec)
+                rec.save(save_opts)
               end
             end
           end

data/lib/has_moderated/moderation_model.rb

@@ -102,7 +102,9 @@ module HasModerated
       live_preview do |record|
         fake_record = HasModerated::Preview::from_live(record, self, options[:saveable])
       end
-      fake_record
+      # Ruby 1.8 will unfreeze when doing ActiveRecord::Rollback
+      # Only necessary to re-freeze for 1.8, associations stay frozen as normal
+      fake_record.freeze
     end
 
     def create?

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/has_moderated/associations_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe "associations" do
+  it "can handle nested associations (issue #17 and #18)" do
+    dynamic_models.task {
+      has_many :subtasks
+      has_moderated_create :with_associations => [:subtasks]
+    }.subtask {
+      belongs_to :task_connection, :foreign_key => "parentable_id"
+      belongs_to :task
+      has_many :photos, :as => :parentable
+      has_moderated :title
+    }.photo {
+      belongs_to :parentable, :polymorphic => true
+    }.task_connection {
+      has_many :things, :as => :parentable
+    }
+
+    tconn = TaskConnection.create! :title => "TC"
+    data = {
+      :create => {
+        :attributes => { "id" => nil, "title" => "Task" },
+        :associations => {
+          :subtasks => 
+            [
+              {"id" => nil, "title" => "Subtask",
+                :associations => {
+                  :photos => [{"id" => nil, "title" => "Photo"}],
+                  :task_connection => [tconn.id]
+                }
+              }
+            ]
+        }
+      }
+    }
+    Moderation.create! :moderatable_type => "Task", :data => data.to_yaml
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+    (t = Task.last).title.should eq("Task")
+    (s = t.subtasks.last).title.should eq("Subtask")
+    s.photos.last.title.should eq("Photo")
+    s.task_connection.title.should eq("TC")
+  end
+end

data/spec/has_moderated/attributes_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "moderates attributes:" do
+  it "moderates an attribute" do
+    dynamic_models.task {
+      has_moderated :title
+    }
+    Task.create! :title => "Task 1", :desc => "Description"
+    Task.first.title.should be_blank
+    Task.first.desc.should eq("Description")
+    Moderation.last.accept
+    Task.first.title.should eq("Task 1")
+    Task.first.update_attribute(:title, "Task 2")
+    Task.first.title.should eq("Task 1")
+    Moderation.last.accept
+    Task.first.title.should eq("Task 2")
+  end
+
+  it "validates uniqueness properly" do
+    dynamic_models.task {
+      has_moderated :title
+      validates_uniqueness_of :title
+    }
+    Task.create! :title => "Task 1"
+    Task.create! :title => "Task 1"
+    Moderation.first.accept
+    expect { Task.create! :title => "Task 1" }.to raise_error
+    Moderation.first.accept.should be_false
+    expect { Moderation.first.accept! }.to raise_error
+  end
+end

data/spec/has_moderated/common_features_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe "common features:" do
+  it "get_moderation_attributes can be overriden in model" do
+    dynamic_models.task {
+      has_moderated_create
+      self.class_eval do
+        def get_moderation_attributes
+          { :test => "ok" }
+        end
+      end
+    }
+    Task.create! :title => "Task 1"
+    data = YAML::load(Moderation.last.data)[:create][:attributes]
+    data.should_not be_blank
+    data[:test].should_not be_blank
+    data[:test].should eq("ok")
+    data.keys.count.should eq(1)
+  end
+
+  it "knows if it's a create moderation" do
+    dynamic_models.task {
+      has_moderated_create
+    }
+
+    Task.create! :title => "Task 1"
+
+    Moderation.last.create?.should be_true
+    Moderation.last.destroy?.should be_false
+    Moderation.last.update?.should be_false
+  end
+
+  it "knows if it's a destroy moderation" do
+    dynamic_models.task {
+      has_moderated_destroy
+    }
+
+    Task.create! :title => "Task 1"
+    Task.last.destroy
+
+    Moderation.last.destroy?.should be_true
+    Moderation.last.create?.should be_false
+    Moderation.last.update?.should be_false
+  end
+
+  it "calls moderation callbacks on destroy" do
+    dynamic_models.task {
+      has_moderated_create
+      def self.moderatable_discard(m, opts)
+        raise "moderatable_discard"
+      end
+    }
+    Task.create!
+    expect { Moderation.last.destroy }.to raise_error("moderatable_discard")
+  end
+end

data/spec/has_moderated/has_and_belongs_to_many_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe "has_and_belongs_to_many" do
+  context "has_and_belongs_to_many association:" do
+    before do
+      dynamic_models.task {
+        has_and_belongs_to_many :renamed_subtasks, :class_name => "Subtask", :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", :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
+      }
+    end
+
+    it "creates and associates a new subtask" do
+      task = Task.create! :title => "Task 1"
+      Moderation.count.should eq(0)
+      task.renamed_subtasks.create! :title => "Subtask 1"
+
+      Subtask.count.should eq(0)
+      task = Task.first
+      task.renamed_subtasks.count.should eq(0)
+
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+
+      subtask = Task.first.renamed_subtasks.first
+      subtask.title.should eq("Subtask 1")
+    end
+
+    it "associates an existing subtask" do
+      task = Task.create! :title => "Task 1"
+      Subtask.create! :title => "Subtask 1"
+      Task.first.renamed_subtasks.count.should eq(0)
+      Subtask.count.should eq(1)
+      Moderation.count.should eq(0)
+      task.renamed_subtasks << Subtask.first
+
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+
+      Task.first.renamed_subtasks.count.should eq(1)
+      subtask = Task.first.renamed_subtasks.first
+      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
+      dynamic_models.task {
+        has_moderated_create :with_associations => [:renamed_subtasks]
+        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"
+      }
+    end
+
+    it "associates an existing subtask on create 1" do
+      Task.has_moderated_association :renamed_subtasks  # important difference (had different behavior based
+                                                        # on presence of this line, need to test with and without)
+      Subtask.create! :title => "Subtask 1"
+      Subtask.count.should eq(1)
+      Moderation.count.should eq(0)
+
+      task = Task.new :title => "Task 1"
+      task.renamed_subtasks << Subtask.first
+      task.save
+
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+
+      Task.first.renamed_subtasks.count.should eq(1)
+      subtask = Task.first.renamed_subtasks.first
+      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_subtasks << Subtask.first
+      task.save
+
+      Task.count.should eq(0)
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+
+      Task.last.renamed_subtasks.count.should eq(1)
+      subtask = Task.first.renamed_subtasks.first
+      subtask.title.should eq("Subtask 1")
+    end
+  end
+end

data/spec/has_moderated/has_many_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe "has_many association:" do
+  before do
+    dynamic_models.task {
+      has_many :renamed_subtasks, :class_name => "Subtask", :foreign_key => "task_id"
+      has_moderated_association :renamed_subtasks
+    }.subtask {
+      belongs_to :task, :foreign_key => "task_id"
+    }
+  end
+
+  it "creates and associates subtask (create)" do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+    task.renamed_subtasks.create! :title => "Subtask 1"
+
+    task = Task.first
+    task.renamed_subtasks.count.should eq(0)
+
+    Moderation.count.should eq(1)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "creates and associates subtask (build, save task)" do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+    task.renamed_subtasks.build :title => "Subtask 1"
+    task.save
+
+    task = Task.first
+    task.renamed_subtasks.count.should eq(0)
+
+    Moderation.count.should eq(1)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "creates and associates subtask (build, save subtask)", :broken => true do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+    subtask = task.renamed_subtasks.build :title => "Subtask 1"
+    subtask.save
+
+    task = Task.first
+    task.renamed_subtasks.count.should eq(0)
+
+    Moderation.count.should eq(1)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "associates (<<) existing subtask" do
+    task = Task.create! :title => "Task 1"
+    Subtask.create! :title => "Subtask 1"
+    Moderation.count.should eq(0)
+    task.renamed_subtasks << Subtask.first
+
+    task = Task.first
+    task.renamed_subtasks.count.should eq(0)
+
+    Moderation.count.should eq(1)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "associates (push) existing subtask" do
+    task = Task.create! :title => "Task 1"
+    Subtask.create! :title => "Subtask 1"
+    Moderation.count.should eq(0)
+    task.renamed_subtasks.push Subtask.first
+
+    task = Task.first
+    task.renamed_subtasks.count.should eq(0)
+
+    Moderation.count.should eq(1)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "moderates deleting association" do
+    task = Task.create! :title => "Task 1"
+    task.renamed_subtasks.create! :title => "Subtask 1"
+    Moderation.last.accept
+
+    Task.last.renamed_subtasks.delete(Task.last.renamed_subtasks.last)
+    Task.last.renamed_subtasks.count.should eq(1)
+
+    Moderation.last.accept
+    Task.last.renamed_subtasks.count.should eq(0)
+  end
+end

data/spec/has_moderated/has_many_through_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe "has_many :through association:" do
+  before do
+    dynamic_models.task {
+      has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m1_id"
+      has_many :renamed_subtasks, :class_name => "Subtask", :through => :renamed_connections, :source => :renamed_subtask
+      has_moderated_association :renamed_subtasks
+      has_moderated_association :renamed_connections
+    }.subtask {
+      has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m2_id"
+      has_many :renamed_tasks, :through => :renamed_connections, :source => :renamed_task
+    }.task_connection {
+      belongs_to :renamed_task, :class_name => "Task", :foreign_key => "m1_id"
+      belongs_to :renamed_subtask, :class_name => "Subtask", :foreign_key => "m2_id"
+    }
+  end
+
+  it "associates subtask 1 (update)" do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+
+    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)
+
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+    conn = Subtask.first.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
+
+  it "associates subtask 2 (update)" do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+
+    task.renamed_subtasks.build :title => "Subtask 1"
+    task.save
+
+    TaskConnection.count.should eq(0)
+    Subtask.count.should eq(0)
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+    Subtask.count.should eq(1)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "associates subtask 3 (update)" do
+    task = Task.create! :title => "Task 1"
+    Moderation.count.should eq(0)
+
+    task.renamed_subtasks.create! :title => "Subtask 1"
+
+    TaskConnection.count.should eq(0)
+    Subtask.count.should eq(0)
+
+    Moderation.last.accept
+    Moderation.count.should eq(0)
+    Subtask.count.should eq(1)
+
+    subtask = Task.first.renamed_subtasks.first
+    subtask.title.should eq("Subtask 1")
+  end
+
+  it "associates subtask 1 (create)" do
+    t = Task.new :title => "Task 1"
+    t.renamed_subtasks.build :title => "Subtask 1"
+    t.save
+
+    Subtask.count.should eq(0)
+    Task.first.title.should eq("Task 1")
+    Task.first.renamed_subtasks.count.should eq(0)
+    Task.count.should eq(1)
+
+    Moderation.last.accept
+
+    Task.first.renamed_subtasks.count.should eq(1)
+    Task.first.renamed_subtasks.first.title.should eq("Subtask 1")
+  end
+end