has_moderated 0.0.34 → 1.0.alpha

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_moderated
 version: !ruby/object:Gem::Version 
-  hash: 91
-  prerelease: 
+  hash: -1851332122
+  prerelease: 4
   segments: 
+  - 1
   - 0
-  - 0
-  - 34
-  version: 0.0.34
+  - alpha
+  version: 1.0.alpha
 platform: ruby
 authors: 
 - Jan Berdajs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -61,9 +61,14 @@ files:
 - lib/generators/has_moderated/install/templates/migration.rb
 - lib/generators/has_moderated/install/templates/moderation.rb
 - lib/generators/USAGE
+- lib/has_moderated/adapters/active_record.rb
+- lib/has_moderated/adapters/proxy.rb
+- lib/has_moderated/associations/base.rb
+- lib/has_moderated/associations/collection.rb
+- lib/has_moderated/associations/has_many.rb
+- lib/has_moderated/associations/has_one.rb
 - lib/has_moderated/carrier_wave.rb
 - lib/has_moderated/common.rb
-- lib/has_moderated/moderated_associations.rb
 - lib/has_moderated/moderated_attributes.rb
 - lib/has_moderated/moderated_create.rb
 - lib/has_moderated/moderated_destroy.rb
@@ -79,22 +84,10 @@ files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/habtm_name_test.rb
-- test/dummy/app/models/hjoin_test.rb
-- test/dummy/app/models/hmany_fk_test.rb
-- test/dummy/app/models/hmanythrough_join.rb
-- test/dummy/app/models/hmanythrough_test.rb
-- test/dummy/app/models/hone_as_test.rb
-- test/dummy/app/models/hone_test.rb
-- test/dummy/app/models/hook_test.rb
 - test/dummy/app/models/moderation.rb
-- test/dummy/app/models/photo.rb
-- test/dummy/app/models/photo_holder.rb
-- test/dummy/app/models/photo_related.rb
 - test/dummy/app/models/subtask.rb
 - test/dummy/app/models/task.rb
-- test/dummy/app/models/task_all.rb
-- test/dummy/app/models/task_photo.rb
+- test/dummy/app/models/task_connection.rb
 - test/dummy/app/uploaders/generic_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
@@ -133,6 +126,9 @@ files:
 - test/dummy/db/migrate/20111018174319_create_hmany_fk_tests.rb
 - test/dummy/db/migrate/20111018180207_create_habtm_name_tests.rb
 - test/dummy/db/migrate/20120209045206_create_photo_relateds.rb
+- test/dummy/db/migrate/20120515155730_create_moderations2.rb
+- test/dummy/db/migrate/20120515174306_prepare_for_new_tests.rb
+- test/dummy/db/migrate/20120515175621_remove_photo_relateds.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -159,16 +155,6 @@ files:
 - test/dummy/spec/factories/photos.rb
 - test/dummy/spec/factories/task_alls.rb
 - test/dummy/spec/factories/task_photos.rb
-- test/dummy/spec/models/habtm_name_test_spec.rb
-- test/dummy/spec/models/hjoin_test_spec.rb
-- test/dummy/spec/models/hmany_fk_test_spec.rb
-- test/dummy/spec/models/hmanythrough_test_spec.rb
-- test/dummy/spec/models/hone_as_test_spec.rb
-- test/dummy/spec/models/hone_test_spec.rb
-- test/dummy/spec/models/hooks_spec.rb
-- test/dummy/spec/models/photo_holder_spec.rb
-- test/dummy/spec/models/photo_spec.rb
-- test/dummy/spec/models/task_photo_spec.rb
 - test/dummy/spec/models/task_spec.rb
 - test/dummy/spec/spec_helper.rb
 - test/dummy/spec/support/photos.rb
@@ -192,12 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -210,22 +198,10 @@ test_files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/habtm_name_test.rb
-- test/dummy/app/models/hjoin_test.rb
-- test/dummy/app/models/hmany_fk_test.rb
-- test/dummy/app/models/hmanythrough_join.rb
-- test/dummy/app/models/hmanythrough_test.rb
-- test/dummy/app/models/hone_as_test.rb
-- test/dummy/app/models/hone_test.rb
-- test/dummy/app/models/hook_test.rb
 - test/dummy/app/models/moderation.rb
-- test/dummy/app/models/photo.rb
-- test/dummy/app/models/photo_holder.rb
-- test/dummy/app/models/photo_related.rb
 - test/dummy/app/models/subtask.rb
 - test/dummy/app/models/task.rb
-- test/dummy/app/models/task_all.rb
-- test/dummy/app/models/task_photo.rb
+- test/dummy/app/models/task_connection.rb
 - test/dummy/app/uploaders/generic_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
@@ -264,6 +240,9 @@ test_files:
 - test/dummy/db/migrate/20111018174319_create_hmany_fk_tests.rb
 - test/dummy/db/migrate/20111018180207_create_habtm_name_tests.rb
 - test/dummy/db/migrate/20120209045206_create_photo_relateds.rb
+- test/dummy/db/migrate/20120515155730_create_moderations2.rb
+- test/dummy/db/migrate/20120515174306_prepare_for_new_tests.rb
+- test/dummy/db/migrate/20120515175621_remove_photo_relateds.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -290,16 +269,6 @@ test_files:
 - test/dummy/spec/factories/photos.rb
 - test/dummy/spec/factories/task_alls.rb
 - test/dummy/spec/factories/task_photos.rb
-- test/dummy/spec/models/habtm_name_test_spec.rb
-- test/dummy/spec/models/hjoin_test_spec.rb
-- test/dummy/spec/models/hmany_fk_test_spec.rb
-- test/dummy/spec/models/hmanythrough_test_spec.rb
-- test/dummy/spec/models/hone_as_test_spec.rb
-- test/dummy/spec/models/hone_test_spec.rb
-- test/dummy/spec/models/hooks_spec.rb
-- test/dummy/spec/models/photo_holder_spec.rb
-- test/dummy/spec/models/photo_spec.rb
-- test/dummy/spec/models/task_photo_spec.rb
 - test/dummy/spec/models/task_spec.rb
 - test/dummy/spec/spec_helper.rb
 - test/dummy/spec/support/photos.rb

data/lib/has_moderated/moderated_associations.rb

@@ -1,69 +0,0 @@
-module HasModerated
-  module ModeratedAssociations
-    module ClassMethods
-      def has_moderated_association *args
-        assocs = []
-
-        unless args.blank?
-          if args == [:all]
-            assocs = self.reflections.keys.reject do |r|
-              r == :moderations
-            end
-          else
-            assocs = args
-            assocs = [assocs] unless assocs.respond_to?("[]")
-          end
-        end
-
-        #TODO: should add to some class var and clean duplicates
-
-        after_initialize do
-          assocs.each do |assoc_name|
-            assoc = self.association(assoc_name)
-            if assoc.reflection.collection?
-              def assoc.add_to_target_with_moderation record
-                if !owner.new_record? && !owner.has_moderated_updating
-                  #TODO: add moderation
-                  owner.add_associations_moderated(self.reflection.name => [record])
-                  record
-                else
-                  add_to_target_without_moderation record
-                end
-              end
-              def assoc.delete_records_with_moderation(records, method) # method comes from :dependent => :destroy
-                if !owner.new_record? && !owner.has_moderated_updating
-                  #todo only care for records which are already in database
-                  record_ids = records.map(&:id)
-                  owner.delete_associations_moderated(self.reflection.name => record_ids)
-                else
-                  delete_records_without_moderation(records, method)
-                end
-              end
-              assoc.class_eval do
-                alias_method_chain :add_to_target, :moderation
-                alias_method_chain :delete_records, :moderation
-              end
-            else
-              def assoc.replace_with_moderation(record, save = true)
-                if !owner.new_record? && !owner.has_moderated_updating
-                  #TODO: add moderation
-                  owner.add_associations_moderated(self.reflection.name => [record])
-                  record
-                else
-                  replace_without_moderation record
-                end
-              end
-              assoc.class_eval do
-                alias_method_chain :replace, :moderation
-              end
-            end
-          end
-        end
-      end
-    end
-    
-    module InstanceMethods
-      
-    end
-  end
-end

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

@@ -1,3 +0,0 @@
-class HabtmNameTest < ActiveRecord::Base
-  has_and_belongs_to_many :owners, :class_name => "Task"
-end

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

@@ -1,3 +0,0 @@
-class HjoinTest < ActiveRecord::Base
-  has_and_belongs_to_many :tasks
-end

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

@@ -1,3 +0,0 @@
-class HmanyFkTest < ActiveRecord::Base
-  belongs_to :bla, :class_name => "Task", :foreign_key => "something_id"
-end

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

@@ -1,4 +0,0 @@
-class HmanythroughJoin < ActiveRecord::Base
-  belongs_to :task
-  belongs_to :hmanythrough_test
-end

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

@@ -1,4 +0,0 @@
-class HmanythroughTest < ActiveRecord::Base
-  has_many :hmanythrough_join
-  has_many :tasks, :through => :hmanythrough_join
-end

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

@@ -1,3 +0,0 @@
-class HoneAsTest < ActiveRecord::Base
-  belongs_to :testable, :polymorphic => true
-end

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

@@ -1,3 +0,0 @@
-class HoneTest < ActiveRecord::Base
-  belongs_to :task
-end

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

@@ -1,9 +0,0 @@
-class HookTest < ActiveRecord::Base
-  has_moderated_create
-  has_moderated :title
-  
-  moderation_creating do |m|
-    # use title for checking the scope of self here
-    m.attr_value = self.title + m.attr_value # just add 2 spaces
-  end
-end

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

@@ -1,8 +0,0 @@
-class Photo < ActiveRecord::Base
-  belongs_to :photo_holder
-  mount_uploader :photo, GenericUploader
-  has_moderated_create
-  has_moderated :carrierwave_photo
-  include HasModerated::CarrierWave
-  has_many :photo_relateds
-end

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

@@ -1,4 +0,0 @@
-class PhotoHolder < ActiveRecord::Base
-  has_many :photos
-  accepts_nested_attributes_for :photos
-end

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

@@ -1,3 +0,0 @@
-class PhotoRelated < ActiveRecord::Base
-  belongs_to :photo
-end

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

@@ -1,4 +0,0 @@
-class TaskAll < ActiveRecord::Base
-  has_moderated_create :with_associations => :all
-  has_many :subtasks
-end

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

@@ -1,5 +0,0 @@
-class TaskPhoto < ActiveRecord::Base
-  belongs_to :task
-  mount_uploader :photo, GenericUploader
-  include HasModerated::CarrierWave
-end

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

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe HabtmNameTest do
-  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.habtms.create! :title => "HJoin"
-    HabtmNameTest.count.should eq(0)
-    
-    Moderation.last.accept
-    HabtmNameTest.count.should eq(1)
-    
-    Task.first.habtms.count.should eq(1)
-    Task.first.habtms.first.title.should eq("HJoin")
-  end
-end

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

@@ -1,54 +0,0 @@
-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
-  
-  it "moderates assoc to existing" do
-    t = Task.new :title => "Test"
-    t.save
-    Moderation.last.accept
-    
-    hjt = HjoinTest.create! :title => "Existing"
-    HjoinTest.count.should eq(1)
-    
-    t = Task.first
-    t.hjoin_tests << hjt
-    Task.first.hjoin_tests.count.should eq(0)
-    
-    Moderation.last.accept
-        
-    Task.first.hjoin_tests.count.should eq(1)
-    Task.first.hjoin_tests.first.title.should eq("Existing")
-  end
-end

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

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe HmanyFkTest do
-  it "moderates assoc on create" do
-    t = Task.new :title => "Test"
-    t.lalas.build :title => "HJoin"
-    t.save
-    
-    HmanyFkTest.count.should eq(0)
-    Task.count.should eq(0)
-    
-    Moderation.last.accept
-    
-    Task.first.lalas.count.should eq(1)
-    Task.first.lalas.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.lalas.create! :title => "HJoin"
-    HmanyFkTest.count.should eq(0)
-    
-    Moderation.last.accept
-    HmanyFkTest.count.should eq(1)
-    
-    Task.first.lalas.count.should eq(1)
-    Task.first.lalas.first.title.should eq("HJoin")
-  end
-end

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

@@ -1,99 +0,0 @@
-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_as_test_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe HoneAsTest do
-  it "moderates assoc on create" do
-    t = Task.new :title => "Test"
-    t.hone_as_test = HoneAsTest.new :title => "Hone"
-    t.save
-    
-    HoneAsTest.count.should eq(0)
-    Task.count.should eq(0)
-    
-    Moderation.last.accept
-    HoneAsTest.count.should eq(1)
-    
-    Task.first.hone_as_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_as_test).build :title => "Hone"
-    t.save
-    HoneAsTest.count.should eq(0)
-    
-    Moderation.last.accept
-    HoneAsTest.count.should eq(1)
-    
-    Task.first.hone_as_test.title.should eq("Hone")
-  end
-end

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

@@ -1,36 +0,0 @@
-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/hooks_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe HookTest do
-  it "should trigger on creating hook when creating a moderation (create moderation)" do
-    HookTest.create!(:title => "TEST")
-    val = Moderation.last.attr_value
-    val = val[0, 4]
-    val.should eq("TEST") # this behavior is defined by the HookTest model
-  end
-  
-  it "should trigger on creating hook when creating a moderation (attribute change moderation)" do
-    HookTest.create!(:title => "") # use blank title because of our hook, so moderation is valid
-    Moderation.last.accept
-    
-    HookTest.first.update_attributes :title => "TEST"
-    
-    val = Moderation.last.attr_value
-    val = val[0, 4]
-    val.should eq("TEST") # this behavior is defined by the HookTest model
-  end
-  
-  # control test
-  it "should not have these testing spaces for other models" do
-    Task.create!(:title => "TEST")
-    
-    val = Moderation.last.attr_value
-    val = val[0, 4]
-    val.should_not eq("TEST")
-  end
-end

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

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-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 => {:photo => carrierwave_test_photo}})
-    
-    Photo.count.should eq(0)
-    tmpEmpty?.should be_false
-    Moderation.last.accept
-    tmpEmpty?.should be_true
-    
-    Photo.count.should eq(1)
-    photo = Photo.first
-    assert_photo_uploaded(photo.photo)
-  end
-end