koujou 0.1.2 → 0.1.3

data/History.txt

@@ -2,3 +2,9 @@
 
 * 1 major enhancement:
   * Initial release
+
+=== 0.1.3 2010-05-27
+
+* 2 small fixes:
+  * fix for how Koujou deals with polymorphic associations, ensuring that it leaves polymorphic fields up to the user to populate
+  * fix to ignore the inheritance column and not generate data for it when working with STI models

data/Manifest.txt

@@ -16,6 +16,7 @@ script/generate
 test/lib/active_record_test_connector.rb
 test/lib/models/car.rb
 test/lib/models/comment.rb
+test/lib/models/invite.rb
 test/lib/models/message.rb
 test/lib/models/photo.rb
 test/lib/models/post.rb

data/koujou.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koujou}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Leung"]

data/lib/koujou.rb

@@ -11,7 +11,7 @@ require 'koujou/validation_reflection'
 require 'koujou/custom_validation'
 
 module Koujou
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 
 if ENV["RAILS_ENV"] == "test"

data/lib/koujou/builder.rb

@@ -119,6 +119,8 @@ module Koujou #:nodoc:
               # We only want to create the association if the user has required the id field. 
               # This will build the minimum valid requirements. 
               next unless has_required_id_validation?(instance, a)
+              # Skip polymorphic associations as we don't know what to build for them
+              next if a.options.keys.include?(:polymorphic) && a.options[:polymorphic] == true
               
               if a.macro == :has_one || a.macro == :belongs_to
                 # If there's a two way association here (user has_one profile, profile belongs_to user)
@@ -144,6 +146,10 @@ module Koujou #:nodoc:
           end
           
           def generate_and_set_data(instance, validation, sequenced)
+            # Don't set if it's the inheritance column
+            return if validation.name.to_s == instance.class.inheritance_column.to_s
+            # Don't set values for polymorphic association fields - if no values are supplied we'll want that to just fall through to validation errors
+            return if instance.class.reflect_on_all_associations.select { |a| a.options.keys.include?(:polymorphic) && a.options[:polymorphic] == true }.collect { |a| [:"#{a.name}_id", :"#{a.name}_type"] }.flatten.include?(validation.name)
             data_generator = DataGenerator.new(sequenced, validation)
             data_generator.required_length = get_required_length(instance, validation)
             if has_inclusion_validation?(instance, validation)

data/test/lib/active_record_test_connector.rb

@@ -49,6 +49,8 @@ class ActiveRecordTestConnector
         create_table "comments", :force => true do |t|
           t.text "bod"
           t.integer "post_id"
+          t.integer "commentable_id"
+          t.string "commentable_type"
         end
         create_table "profiles", :force => true do |t|
           t.integer "user_id"
@@ -70,6 +72,9 @@ class ActiveRecordTestConnector
           t.integer "user_id", "year"
           t.string "make", "model"
         end
+        create_table "invites", :force => true do |t|
+          t.string "type"
+        end
       end
     end
      

data/test/lib/models/comment.rb

@@ -1,7 +1,8 @@
 class Comment < ActiveRecord::Base
   validates_presence_of :bod
   validates_length_of :bod, :maximum => 200
+  validates_presence_of :commentable_id, :commentable_type
   
   belongs_to :post
-  
-end
+  belongs_to :commentable, :polymorphic => true
+end

data/test/lib/models/invite.rb

@@ -0,0 +1,9 @@
+class Invite < ActiveRecord::Base
+  validates_presence_of :type
+end
+
+class EventInvite < Invite
+end
+
+class GroupInvite < Invite
+end

data/test/test_builder.rb

@@ -71,7 +71,8 @@ class TestBuilder < Test::Unit::TestCase
     
     should 'allow me to override the model attributes' do
       comment = 'your post is epic fail'
-      c = Comment.koujou_create(:bod => comment)
+      p = Post.koujou
+      c = Comment.koujou_create(:bod => comment, :commentable_id => p.id, :commentable_type => p.class.name)
       assert_equal comment, c.bod
     end
     
@@ -80,7 +81,6 @@ class TestBuilder < Test::Unit::TestCase
       # The first digit should not be an integer.
       assert_equal 0, u.first_name[0,1].to_i
     end
-    
   end
   
   context 'on sending the koujou_build message' do
@@ -147,7 +147,33 @@ class TestBuilder < Test::Unit::TestCase
     end
     
   end
-  
+
+  context "using polymorphic associations" do
+    should "leave the association alone and not validate if no values supplied" do
+      ex = assert_raise ActiveRecord::RecordInvalid do
+        c = Comment.koujou(true, :bod => "test body")
+      end
+      assert_equal "Validation failed: Commentable can't be blank, Commentable type can't be blank", ex.message
+    end
+
+    should "work when supplying the polymorphic fields" do
+      p = Post.koujou
+      c = Comment.koujou(true, :bod => "test body", :commentable_type => p.class.name, :commentable_id => p.id)
+      assert_equal p.id, c.commentable.id
+    end
+  end
+
+  context "using STI" do
+    should "not be setting the type field to something random" do
+      @event_invite = EventInvite.koujou
+      assert_equal 1, EventInvite.all.length
+      assert_equal "EventInvite", @event_invite.reload.type
+      @group_invite = GroupInvite.koujou
+      assert_equal 1, GroupInvite.all.length
+      assert_equal "GroupInvite", @group_invite.reload.type
+      assert_equal 2, Invite.all.length
+    end
+  end
   
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Leung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +01:00
+date: 2010-05-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - test/lib/active_record_test_connector.rb
 - test/lib/models/car.rb
 - test/lib/models/comment.rb
+- test/lib/models/invite.rb
 - test/lib/models/message.rb
 - test/lib/models/photo.rb
 - test/lib/models/post.rb