<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/views/login/login.html.erb</filename>
    </added>
    <added>
      <filename>app/views/timeline/_article.html.erb</filename>
    </added>
    <added>
      <filename>app/views/timeline/articles_for.html.erb</filename>
    </added>
    <added>
      <filename>config/initializers/feedme.rb.dist</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,4 +2,5 @@
 log/*
 tmp/**/*
 config/database.yml
+config/initializers/feedme.rb
 db/*.sqlite3
\ No newline at end of file</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -11,8 +11,12 @@ class ApplicationController &lt; ActionController::Base
   
   protected
   def ensure_logged_in
-    if not session[:user]
-      redirect_to :controller =&gt; 'login', :action =&gt; 'login'
+    if session[:user]
+      if VALID_USERS.has_key? session[:user]
+        return true
+      end
     end
+    
+    redirect_to :controller =&gt; 'login', :action =&gt; 'login'
   end
 end</diff>
      <filename>app/controllers/application.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,13 +1,24 @@
 class LoginController &lt; ApplicationController
   def login
-    session[:user_id] = nil
+    session[:user] = nil
+    
     if request.post?
+      username = params[:username]
+      password = params[:password]
       
+      if VALID_USERS.has_key? username
+        if VALID_USERS[username] == password
+          session[:user] = username
+          redirect_to :controller =&gt; 'rss_feeds'
+        end
+      end
+      
+      flash[:error] = &quot;Close but no cigar!&quot;
     end
   end
   
   def logout
-    session[:user_id] = nil
+    session[:user] = nil
     redirect_to :action =&gt; 'login'
   end
 end</diff>
      <filename>app/controllers/login_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,10 @@
 class TimelineController &lt; ApplicationController
+  def articles_for
+    @current_date = Time.now
+    @articles = RssArticle.find_by_published(@current_date)
+  end
+  
+  def articles_from
+    
+  end
 end</diff>
      <filename>app/controllers/timeline_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,4 +3,30 @@ class RssFeed &lt; ActiveRecord::Base
   
   validates_presence_of :title
   validates_presence_of :url
+  
+  def process_rss_feed(xml)
+    rss = Hpricot.XML(xml)
+    
+    (rss/:channel/:item).each do |item|
+      link = (item/:link).inner_html
+      
+      if not RssArticle.find_by_link(link)
+        rss_article = RssArticle.new
+        rss_article.title = (item/:title).inner_html
+        rss_article.link = (item/:link).inner_html
+        rss_article.author = (item/:author).inner_html
+        rss_article.content = (item/:description).inner_html
+        # rss_article.published = (item/:)
+        rss_article.save()
+      end
+    end
+  end
+  
+  def test_feed
+    f = open('/Users/daniel/Desktop/SW.xml', 'r')
+    sw = f.read
+    f.close
+    
+    process_rss_feed(sw)
+  end
 end</diff>
      <filename>app/models/rss_feed.rb</filename>
    </modified>
    <modified>
      <diff>@@ -18,6 +18,12 @@
                 &lt;/div&gt;
             &lt;/div&gt;
             
+            &lt;% if flash[:error] %&gt;
+                &lt;div id=&quot;flash&quot;&gt;
+                    &lt;%= flash[:error] %&gt;
+                &lt;/div&gt;
+            &lt;% end %&gt;
+            
             &lt;div id=&quot;navigation&quot;&gt;
                 
             &lt;/div&gt;</diff>
      <filename>app/views/layouts/application.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -32,6 +32,8 @@ ActionController::Routing::Routes.draw do |map|
   # See how all your routes lay out with &quot;rake routes&quot;
 
   # Install the default routes as the lowest priority.
+  map.root :controller =&gt; 'timeline', :action =&gt; 'articles_for'
+  map.login 'login', :controller =&gt; 'login', :action =&gt; 'login'
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end</diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff>@@ -54,24 +54,33 @@ ul, ol, dl {
 
 #header {
     border-bottom: solid 2px #333333;
-    padding-bottom: 5px;
+    margin-bottom: 10px;
+}
+
+#flash {
+    border: solid 1px #CCCCCC;
+    background-color: #F0F0F0;
+    padding: 5px 10px;
 }
 
 #navigation {
     float: left;
+    margin-top: 10px;
     width: 150px;
 }
 
 #content {
     float: left;
     margin-left: 10px;
+    margin-top: 10px;
+    min-height: 200px;
     width: 700px;
 }
 
 #footer {
     border-top: solid 1px #333333;
     clear: both;
-    margin-bottom: 20px;
-    margin-top: 20px;
+    padding-bottom: 20px;
+    padding-top: 20px;
     text-align: center;
 }
\ No newline at end of file</diff>
      <filename>public/stylesheets/feedme.css</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>public/index.html</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>c61e5c8eceef1a393a5a063ef04fd05e43a2974b</id>
    </parent>
  </parents>
  <author>
    <name>Daniel Lindsley</name>
    <email>daniel@snow-wolf.net</email>
  </author>
  <url>http://github.com/toastdriven/feedme/commit/c177de7a2ae7ddf9bf931fe0caf2a6b837386988</url>
  <id>c177de7a2ae7ddf9bf931fe0caf2a6b837386988</id>
  <committed-date>2008-03-24T05:08:27-07:00</committed-date>
  <authored-date>2008-03-24T05:08:27-07:00</authored-date>
  <message>Login working. Style updates. Working on feed import. Gotta got to work.</message>
  <tree>121e955124ac957e388d2ee836e1fc1cd9781ebd</tree>
  <committer>
    <name>Daniel Lindsley</name>
    <email>daniel@snow-wolf.net</email>
  </committer>
</commit>
