Merge pull request #75 from abhirao/rails3

steveklabnik · steveklabnik · commit cc95348d7e3b · 2011-09-02T08:16:20.000-07:00
Adding question creation, Q&amp;A link on main page
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -149,19 +149,17 @@ GEM
     rake (0.9.2)
     rdoc (3.9.4)
     responders (0.6.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    rspec-rails (2.0.0.beta.19)
+      rspec (= 2.0.0.beta.19)
+      webrat (>= 0.7.2.beta.1)
     rubyzip (0.9.4)
     sass (3.1.7)
     sass-rails (3.1.0.rc.6)
@@ -197,6 +195,10 @@ GEM
       raindrops (~> 0.6)
     warden (1.0.5)
       rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss
@@ -1,3 +1,8 @@
 // Place all the styles related to the Questions controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+.flash{
+  color: red;
+  padding: 2px;
+  font-size: 12x;
+}
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -1,2 +1,10 @@
 class QuestionsController < InheritedController
+
+  def index
+    @question = Question.new
+  end
+
+  def create
+    create!(:notice => "Question Asked!"){collection_url}
+  end
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -8,4 +8,5 @@
     = csrf_meta_tags
   %body
     = render "shared/menu/user"
-    = yield
+    .flash #{flash[:notice]}
+    = yield
diff --git a/app/views/questions/_form.html.haml b/app/views/questions/_form.html.haml
@@ -6,4 +6,4 @@
     = f.input :description
 
   .actions
-    = f.button :submit
+    = f.button :submit , 'Ask Everyone'
diff --git a/app/views/questions/index.html.haml b/app/views/questions/index.html.haml
@@ -1,3 +1,11 @@
+:javascript
+  $(document).ready(function(){
+    $('#ask_button').click(
+      function(){
+        $('#the_form').show();
+        $('#ask_button').remove();
+      });
+  });
 - content_for :title do
   Questions
   
@@ -14,4 +22,8 @@
     %th
     %th
   
-  = render :partial => "list", :collection => collection
+  = render :partial => "list", :collection => collection
+%div#the_form{:style=>'display:none'}
+  = render "form"
+- if current_user
+  %h3#ask_button Ask a question
diff --git a/app/views/static/root.html.haml b/app/views/static/root.html.haml
@@ -1 +1,2 @@
 %h1 Home!
+%a(href="/questions") Q&A
diff --git a/spec/views/root.html.haml_spec.rb b/spec/views/root.html.haml_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "static/root" do
+  
+  it "links to questions" do
+    render
+    rendered.should have_selector('a', :href => '/questions')
+  end
+  
+end

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`%h1 Home!`
	`2`	`+%a(href="/questions") Q&A`