messages now show up in the app itself

steveklabnik · steveklabnik · commit 601ddc1b7136 · 2009-12-19T19:58:52.000-05:00
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -9,13 +9,19 @@ class ApplicationController < ActionController::Base
   # Scrub sensitive parameters from your log
   # filter_parameter_logging :password
 	helper_method :current_user
+  helper_method :current_user=
+
+	def current_user=(user)
+		@current_user = user
+	end  
 
 	private
 	def current_user_session
 		return @current_user_session if defined?(@current_user_session)  
 		@current_user_session = UserSession.find  
 	end  
 
+
 	def current_user  
 		@current_user = current_user_session && current_user_session.record  
 	end  
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -1,10 +1,21 @@
 class MessagesController < ApplicationController
+
+  prepend_around_filter ApiAuthorizedFilter.new
+
   def index
     @messages = Message.find(:all, :conditions => ["recipient_id == ?", current_user.id])
+    respond_to do |format|
+      format.html
+      format.yaml {require 'yaml'; render :text => (Hash.from_xml(@messages.to_xml)).to_yaml}
+    end
   end
 
   def show
     @message = Message.find(params[:id])
+    respond_to do |format|
+      format.html
+      format.yaml {require 'yaml'; render :text => (Hash.from_xml(@message.to_xml)).to_yaml}
+    end
   end
 
   def new
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -1,4 +1,17 @@
 class Message < ActiveRecord::Base
 	belongs_to :sender, :class_name => "User"
 	belongs_to :recipient, :class_name => "User"
+
+  after_save :from
+
+  attr_accessor :from
+
+  def from
+    @from = @attributes["from"] = sender.username unless sender.nil?
+  end
+
+  def after_initialize
+    from
+  end
+
 end
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
@@ -7,6 +7,10 @@
     <td><%= f.label :recipient_id %></td>
     <td><%= f.collection_select(:recipient_id, User.find(:all, :order => :username) - [current_user], :id, :username) %></td>
   </tr>
+  <tr>
+    <td><%= f.label :subject %></td>
+    <td><%= f.text_field :subject %></td>
+  </tr>
   <tr>
     <td><%= f.label :text %></td>
     <td><%= f.text_area :text %></td>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
@@ -17,6 +17,10 @@
    <td><%= form.label :password_confirmation, "Confirm Password" %></td>
    <td><%= form.password_field :password_confirmation %></td>
 </tr>
+<tr>
+   <td><%= form.label :api_key, "Secret Key" %></td>
+   <td><%= @user.api_key %></td>
+</tr>
 <tr>
    <td><%= form.label :link %></td>
    <td><%= form.text_field :link %></td>
diff --git a/db/migrate/20091220000337_add_read_to_messages.rb b/db/migrate/20091220000337_add_read_to_messages.rb
@@ -0,0 +1,9 @@
+class AddReadToMessages < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :read, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :messages, :read
+  end
+end
diff --git a/db/migrate/20091220000641_add_subject_to_messages.rb b/db/migrate/20091220000641_add_subject_to_messages.rb
@@ -0,0 +1,9 @@
+class AddSubjectToMessages < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :subject, :string
+  end
+
+  def self.down
+    remove_column :messages, :subject
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091219143931) do
+ActiveRecord::Schema.define(:version => 20091220000641) do
 
   create_table "comments", :force => true do |t|
     t.integer  "user_id"
@@ -25,6 +25,8 @@
     t.text     "text"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "read",         :default => false
+    t.string   "subject"
   end
 
   create_table "programs", :force => true do |t|
diff --git a/lib/api_authorized_filter.rb b/lib/api_authorized_filter.rb
@@ -0,0 +1,19 @@
+# Use this filter as an around_filter around actions that can be
+# accessed via the API.
+#
+# Example:
+#   class ItemsController < ApplicationController
+#     prepend_around_filter ApiAuthorizedFilter.new, :only => [:create]
+#   end
+#
+class ApiAuthorizedFilter
+  def before(controller)
+    return true unless controller.params[:api_key]
+    controller.current_user = User.find_by_api_key(controller.params[:api_key])
+  end
+
+  def after(controller)
+    controller.current_user = nil
+  end
+end
+
