user scoped programs

dominic · dominic · commit 315fc46db6cd · 2011-10-13T23:09:48.000-04:00
diff --git a/app/controllers/programs_controller.rb b/app/controllers/programs_controller.rb
@@ -1,9 +1,10 @@
 class ProgramsController < InheritedController
   load_and_authorize_resource
+
   belongs_to :user, :optional => true
 
   def show
-    @program = Program.find_by_slug(params[:slug])
+    # @program = Program.find_by_slug(params[:slug])
     show!
   end
 
diff --git a/app/models/program.rb b/app/models/program.rb
@@ -6,6 +6,8 @@ class Program
   key :title, String
   key :source_code, String
 
+  scope :by_username,  lambda { |username| where(:author_username => username) }
+
   def to_param
     slug
   end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -12,6 +12,10 @@ class User
   many :questions
   many :answers
   
+  def programs
+    Program.by_username self.username
+  end
+  
   #the list of hackers this hacker is following
   key :following_ids, Array
   many :following, :in => :following_ids, :class_name => 'User'
diff --git a/app/views/programs/index.html.haml b/app/views/programs/index.html.haml
@@ -19,4 +19,4 @@ Here it is: every single program we've got. Check them out!
 
 %ul
   - @programs.each do |program|
-    %li= link_to program.title, program_path(program.author_username, program)
+    %li= link_to program.title, user_program_path(User.find_by_username(program.author_username).id, program.id)
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -16,6 +16,8 @@
   %h2= "About #{resource.username}"
   %h4= resource.about
   %hr
+  %p 
+    = link_to "Programs", user_programs_path(resource)
   %p 
     Following:
     =link_to resource.following.count, resource_path(resource) + "/following"
diff --git a/config/routes.rb b/config/routes.rb
@@ -4,7 +4,7 @@
     resources :answers
   end
 
-  resources :programs, :only => [:index]
+  resources :programs, :only => [:index, :show]
 
   constraints(ApiConstraint) do
     match '/' => 'static#api_root'
@@ -25,10 +25,12 @@
     get "followers" => "users#followers", :as => :followers
     post "follow" => "users#follow", :as => :follow
     post "unfollow" => "users#unfollow", :as => :unfollow
+
+    resources :programs
   end
 
-  root :to => "static#root"
+  # match ':user_id/:slug', :to => "programs#show", :as => :program
 
-  match ':user_id/:slug', :to => "programs#show", :as => :program
+  root :to => "static#root"
 
 end
