has_moderated 0.0.21 → 0.0.24

data/test/dummy/spec/factories/hjoin_tests.rb

@@ -0,0 +1,7 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :hjoin_test do
+      title "MyString"
+    end
+end

data/test/dummy/spec/factories/hmanythrough_joins.rb

@@ -0,0 +1,9 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :hmanythrough_join do
+      hmanythrough_test_id 1
+      task_id 1
+      exdata "MyString"
+    end
+end

data/test/dummy/spec/factories/hmanythrough_tests.rb

@@ -0,0 +1,7 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :hmanythrough_test do
+      title "MyString"
+    end
+end

data/test/dummy/spec/factories/hone_tests.rb

@@ -0,0 +1,7 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :hone_test do
+      task_id 1
+    end
+end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe HjoinTest do
+  it "moderates assoc on create" do
+    t = Task.new :title => "Test"
+    t.hjoin_tests.build :title => "HJoin"
+    t.save
+    
+    HjoinTest.count.should eq(0)
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    Task.first.hjoin_tests.count.should eq(1)
+    Task.first.hjoin_tests.first.title.should eq("HJoin")
+  end
+  
+  it "moderates assoc on update" do
+    t = Task.new :title => "Test"
+    t.save
+    
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    t = Task.first
+    t.hjoin_tests.create! :title => "HJoin"
+    HjoinTest.count.should eq(0)
+    
+    Moderation.last.accept
+    HjoinTest.count.should eq(1)
+    
+    Task.first.hjoin_tests.count.should eq(1)
+    Task.first.hjoin_tests.first.title.should eq("HJoin")
+  end
+end

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

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe HmanythroughTest do
+  it "moderates assoc on create" do
+    t = Task.new :title => "Test"
+    t.hmanythrough_test.build :title => "HJoin"
+    t.save
+    
+    HmanythroughTest.count.should eq(0)
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    Task.first.hmanythrough_test.count.should eq(1)
+    Task.first.hmanythrough_test.first.title.should eq("HJoin")
+  end
+  
+  it "moderates assoc on update" do
+    t = Task.new :title => "Test"
+    t.save
+    
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    t = Task.first
+    t.hmanythrough_test.create! :title => "HJoin"
+    HmanythroughTest.count.should eq(0)
+    
+    Moderation.last.accept
+    HmanythroughTest.count.should eq(1)
+    
+    Task.first.hmanythrough_test.count.should eq(1)
+    Task.first.hmanythrough_test.first.title.should eq("HJoin")
+  end
+  
+  it "moderates assoc on update (through model)" do
+    t = Task.new :title => "Test"
+    t.save
+    
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    t = Task.first
+    j = HmanythroughJoin.new :exdata => "Data"
+    j.hmanythrough_test = HmanythroughTest.new :title => "Hello"
+    t.hmanythrough_join << j
+    t.save
+    HmanythroughTest.count.should eq(0)
+    
+    Moderation.last.accept
+    HmanythroughTest.count.should eq(1)
+    
+    Task.first.hmanythrough_test.count.should eq(1)
+    Task.first.hmanythrough_test.first.title.should eq("Hello")
+    Task.first.hmanythrough_test.first.hmanythrough_join.first.exdata.should eq("Data")
+  end
+  
+  it "moderates assoc on update (through model) 2" do
+    pending("need to figure this out, hook will trigger when calling build already")
+    t = Task.new :title => "Test"
+    t.save
+    
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    t = Task.first
+    j = t.hmanythrough_join.build :exdata => "Data"
+    j.hmanythrough_test = HmanythroughTest.new :title => "Hello"
+    t.save
+    HmanythroughTest.count.should eq(0)
+    
+    raise Moderation.last.to_yaml
+    Moderation.last.accept
+    HmanythroughTest.count.should eq(1)
+    
+    Task.first.hmanythrough_test.count.should eq(1)
+    Task.first.hmanythrough_test.first.title.should eq("Hello")
+  end
+  
+  it "moderates assoc extra data on create" do
+    t = Task.new :title => "Test"
+    j = t.hmanythrough_join.build :exdata => "Data"
+    j.hmanythrough_test = HmanythroughTest.new :title => "Hello"
+    t.save
+    
+    HmanythroughTest.count.should eq(0)
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    HmanythroughTest.count.should eq(1)
+    
+    Task.first.hmanythrough_test.count.should eq(1)
+    Task.first.hmanythrough_test.first.title.should eq("Hello")
+    Task.first.hmanythrough_test.first.hmanythrough_join.first.exdata.should eq("Data")
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe HoneTest do
+  it "moderates assoc on create" do
+    t = Task.new :title => "Test"
+    t.hone_test = HoneTest.new :title => "Hone"
+    t.save
+    
+    HoneTest.count.should eq(0)
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    HoneTest.count.should eq(1)
+    
+    Task.first.hone_test.title.should eq("Hone")
+  end
+  
+  it "moderates assoc on update" do
+    t = Task.new :title => "Test"
+    t.save
+    
+    Task.count.should eq(0)
+    
+    Moderation.last.accept
+    
+    t = Task.first
+    t.association(:hone_test).build :title => "Hone"
+    t.save
+    HoneTest.count.should eq(0)
+    
+    Moderation.last.accept
+    HoneTest.count.should eq(1)
+    
+    Task.first.hone_test.title.should eq("Hone")
+  end
+end

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

@@ -1,29 +1,21 @@
 require 'spec_helper'
-require 'fileutils'
-
-def dirEmpty? dirname
-  return true unless File.directory?(dirname)
-  Dir.entries(dirname).size == 2
-end
-
-tempdir = File.expand_path("../../../public/uploads/tmp", __FILE__)
-uploaddir = "/Users/apple/rails/has_moderated/test/dummy/public/uploads/photo/photo/1"
-SAMPLE_PHOTO_URL = "http://www.arnes.si/typo3conf/ext/ag_arnes_eff_template/templates/template-index/images/logo_arnes.gif"
 
 describe PhotoHolder do
+  before(:each) do
+    FileUtils.rm_rf(TEMPDIR) # remove temp dir
+    FileUtils.rm_rf(File.expand_path("../../../public/uploads", __FILE__)) # remove uploads dir
+  end
+  
   it "should upload photo" do
-    photo = PhotoHolder.create!(:photos_attributes => { 0 => {:remote_photo_url => SAMPLE_PHOTO_URL}})
+    photo = PhotoHolder.create!(:photos_attributes => { 0 => {:photo => carrierwave_test_photo}})
     
     Photo.count.should eq(0)
-    dirEmpty?(tempdir).should be_false
+    tmpEmpty?.should be_false
     Moderation.last.accept
-    dirEmpty?(tempdir).should be_true
+    tmpEmpty?.should be_true
     
     Photo.count.should eq(1)
     photo = Photo.first
-    photo.photo.should_not be_nil
-    photo.photo.file.should_not be_nil
-    photo.photo.file.file.should_not be_nil
-    assert(Photo.first.photo.file.file =~ /photo\/1\/logo_arnes.gif\Z/)
+    assert_photo_uploaded(photo.photo)
   end
 end

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

@@ -1,43 +1,31 @@
 require 'spec_helper'
-require 'fileutils'
-
-def dirEmpty? dirname
-  return true unless File.directory?(dirname)
-  Dir.entries(dirname).size == 2
-end
-
-tempdir = File.expand_path("../../../public/uploads/tmp", __FILE__)
-uploaddir = "/Users/apple/rails/has_moderated/test/dummy/public/uploads/photo/photo/1"
-SAMPLE_PHOTO_URL = "http://www.arnes.si/typo3conf/ext/ag_arnes_eff_template/templates/template-index/images/logo_arnes.gif"
 
 describe Photo do
   before(:each) do
-    FileUtils.rm_rf(tempdir) # remove temp dir
+    FileUtils.rm_rf(TEMPDIR) # remove temp dir
     FileUtils.rm_rf(File.expand_path("../../../public/uploads", __FILE__)) # remove uploads dir
   end
   
   it "should upload photo" do
-    photo = Photo.create!(:remote_photo_url => SAMPLE_PHOTO_URL)
+    photo = Photo.create!(:photo => carrierwave_test_photo)
     
     Photo.count.should eq(0)
-    dirEmpty?(tempdir).should be_false
+    tmpEmpty?.should be_false
     Moderation.last.accept
-    dirEmpty?(tempdir).should be_true
+    tmpEmpty?.should be_true
     
     Photo.count.should eq(1)
     photo = Photo.first
-    photo.photo.should_not be_nil
-    photo.photo.file.should_not be_nil
-    photo.photo.file.file.should_not be_nil
+    assert_photo_uploaded(photo.photo)
   end
   
   it "should delete temp files if discarding a photo moderation" do
-    photo = Photo.create!(:remote_photo_url => SAMPLE_PHOTO_URL)
+    photo = Photo.create!(:photo => carrierwave_test_photo)
     
     Photo.count.should eq(0)
-    dirEmpty?(tempdir).should be_false
+    tmpEmpty?.should be_false
     Moderation.last.discard
-    dirEmpty?(tempdir).should be_true
+    tmpEmpty?.should be_true
     
     Photo.count.should eq(0)
   end
@@ -49,20 +37,19 @@ describe Photo do
     Moderation.last.accept
     
     p = Photo.first
-    p.remote_photo_url = SAMPLE_PHOTO_URL
-    dirEmpty?(uploaddir).should be_true
+    p.photo = carrierwave_test_photo
+    dirEmpty?(UPLOADDIR).should be_true
     p.save
-    dirEmpty?(uploaddir).should be_true
+    dirEmpty?(UPLOADDIR).should be_true
     
     Photo.first.photo.file.should be_nil
     Moderation.count.should eq(1)
     
-    dirEmpty?(tempdir).should be_false
+    tmpEmpty?.should be_false
     Moderation.last.accept
-    dirEmpty?(tempdir).should be_true
-    dirEmpty?(uploaddir).should be_false
-    Photo.first.photo.file.should_not be_nil
-    File.exist?(Photo.first.photo.file.file).should be_true
-    assert(Photo.first.photo.file.file =~ /photo\/1\/logo_arnes.gif\Z/)
+    tmpEmpty?.should be_true
+    dirEmpty?(UPLOADDIR).should be_false
+    photo = Photo.first
+    assert_photo_uploaded(photo.photo)
   end
 end

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

@@ -1,19 +1,15 @@
 require 'spec_helper'
 
-tempdir = File.expand_path("../../../public/uploads/tmp", __FILE__)
-uploaddir = "/Users/apple/rails/has_moderated/test/dummy/public/uploads/photo/photo/1"
-SAMPLE_PHOTO_URL = "http://www.arnes.si/typo3conf/ext/ag_arnes_eff_template/templates/template-index/images/logo_arnes.gif"
-
 describe TaskPhoto do
   before(:each) do
-    FileUtils.rm_rf(tempdir) # remove temp dir
+    FileUtils.rm_rf(TEMPDIR) # remove temp dir
     FileUtils.rm_rf(File.expand_path("../../../public/uploads", __FILE__)) # remove uploads dir
   end
   
   it "should moderate photos for task on create even if photos themselves are not moderated" do
     t = Task.new :title => "Task 1"
     p = t.task_photos.build
-    p.remote_photo_url = SAMPLE_PHOTO_URL
+    p.photo = carrierwave_test_photo
     t.save
     Moderation.count.should eq(1)
     Task.count.should eq(0)
@@ -24,8 +20,6 @@ describe TaskPhoto do
     Task.count.should eq(1)
     Task.first.title.should eq("Task 1")
     p = Task.first.task_photos.first
-    p.should_not be_nil
-    p.photo.should_not be_nil
-    p.photo.file.should_not be_nil
+    assert_photo_uploaded(p.photo)
   end
 end

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

@@ -177,7 +177,7 @@ describe Task do
     Task.count.should eq(0)
   end
 
-  it "moderates new associations on existing records" do
+  it "moderates new associations on existing records (add_associations_moderated)" do
     t = Task.create! :title => "Bye Bye"
     Moderation.last.accept
 
@@ -194,7 +194,7 @@ describe Task do
     Task.first.subtasks.first.title.should eq("Hollywood Hills")
   end
 
-  it "moderates new associations to existing records on existing records" do
+  it "moderates new associations to existing records on existing records (add_associations_moderated)" do
     sub = Subtask.create! :title => "Hollywood Hills"
     t = Task.create! :title => "Bye Bye"
     Moderation.last.accept
@@ -211,4 +211,38 @@ describe Task do
     Subtask.count.should eq(1)
     Task.first.subtasks.first.title.should eq("Hollywood Hills")
   end
+  
+  it "moderates new associations with build" do
+    Task.create! :title => "Bye Bye"
+    Moderation.last.accept
+    
+    t = Task.last
+    t.subtasks.build :title => "Jo jo"
+    # TODO
+    # Moderation.count.should eq(0)
+    t.save
+    Moderation.count.should eq(1)
+    
+    Task.last.subtasks.count.should eq(0)
+    Moderation.last.accept
+    Task.last.subtasks.first.title.should eq("Jo jo")
+  end
+  
+  it "moderates associations to existing records with <<" do
+    Task.create! :title => "Bye Bye"
+    Moderation.last.accept
+    Subtask.create! :title => "Jo jo"
+    
+    Moderation.count.should eq(0)
+    
+    t = Task.first
+    t.subtasks << Subtask.first
+    
+    Task.first.subtasks.count.should eq(0)
+    Moderation.last.accept
+    
+    st = Task.first.subtasks.first
+    st.title.should eq("Jo jo")
+    st.id.should eq(Subtask.first.id)
+  end
 end

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

@@ -0,0 +1,28 @@
+require 'fileutils'
+
+def dirEmpty? dirname
+  return true unless File.directory?(dirname)
+  Dir.entries(dirname).size == 2
+end
+
+def tmpEmpty?
+  dirEmpty?(TEMPDIR)
+end
+
+TEMPDIR = File.expand_path("../../../public/uploads/tmp", __FILE__)
+UPLOADDIR = "/Users/apple/rails/has_moderated/test/dummy/public/uploads/photo/photo/1"
+
+def carrierwave_test_photo
+  test_photo_path = File.expand_path("../../../public/test.jpg", __FILE__)
+  File.open(test_photo_path, "r")
+end
+
+def assert_photo_uploaded photo
+  photo.should_not be_nil
+  photo.file.should_not be_nil
+  photo.file.file.should_not be_nil
+  
+  filename = photo.file.file
+  File.exist?(filename)
+  assert(filename =~ /photo\/1\/test.jpg\Z/)
+end