secondary_actor => secondary_subject

jamesgolick · Feb 19, 2009 · e044441 · e044441
1 parent 36d722a
commit e044441
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/generators/timeline_event/templates/model.rb b/generators/timeline_event/templates/model.rb
diff --git a/generators/timeline_event/USAGE → generators/timeline_fu/USAGE b/generators/timeline_event/USAGE → generators/timeline_fu/USAGE
diff --git a/...ors/timeline_event/templates/migration.rb → ...rators/timeline_fu/templates/migration.rb b/...ors/timeline_event/templates/migration.rb → ...rators/timeline_fu/templates/migration.rb
@@ -1,8 +1,8 @@
 class CreateTimelineEvents < ActiveRecord::Migration
   def self.up
     create_table :timeline_events do |t|
-      t.string   :event_type, :subject_type,  :actor_type,  :secondary_actor_type
-      t.integer               :subject_id,    :actor_id,    :secondary_actor_id
+      t.string   :event_type, :subject_type,  :actor_type,  :secondary_subject_type
+      t.integer               :subject_id,    :actor_id,    :secondary_subject_id
       t.timestamps
     end
   end

diff --git a/generators/timeline_fu/templates/model.rb b/generators/timeline_fu/templates/model.rb
@@ -0,0 +1,5 @@
+class TimelineEvent < ActiveRecord::Base
+  belongs_to :subject,            :polymorphic => true
+  belongs_to :actor,              :polymorphic => true
+  belongs_to :secondary_subject,  :polymorphic => true
+end
diff --git a/...imeline_event/timeline_event_generator.rb → ...s/timeline_fu/timeline_event_generator.rb b/...imeline_event/timeline_event_generator.rb → ...s/timeline_fu/timeline_event_generator.rb
diff --git a/lib/timeline_fu/fires.rb b/lib/timeline_fu/fires.rb
@@ -15,7 +15,7 @@ def fires(event_type, opts)
         raise MissingOnArgument.new(opts) unless opts.has_key?(:on)
         method_name = :"fire_#{event_type}_after_#{opts[:on]}"
         define_method(method_name) do
-          create_options = [:subject, :actor, :secondary_actor].inject({}) do |memo, sym|
+          create_options = [:actor, :subject, :secondary_subject].inject({}) do |memo, sym|
             memo[sym] = send(opts[sym]) if opts[sym]
             memo
           end