Skip to content

Commit

Permalink
Added bootstrap gem, haml is now default, created the Welcome controller
Browse files Browse the repository at this point in the history
  • Loading branch information
mamarjan committed Mar 4, 2012
1 parent 0d1d6c3 commit acf73e6
Show file tree
Hide file tree
Showing 16 changed files with 78 additions and 268 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ gem 'rails', '3.2.1'
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'sqlite3'
gem 'haml-rails'


# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'bootstrap-sass', '2.0.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer'
Expand Down
9 changes: 9 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
bootstrap-sass (2.0.1)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
Expand Down Expand Up @@ -64,6 +65,12 @@ GEM
ffi (1.0.11)
gherkin (2.9.0)
json (>= 1.4.6)
haml (3.1.4)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
Expand Down Expand Up @@ -153,10 +160,12 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (= 2.0.1)
capybara (= 1.1.2)
coffee-rails (~> 3.2.1)
cucumber-rails (= 1.3.0)
database_cleaner (= 0.7.1)
haml-rails
jquery-rails
rails (= 3.2.1)
rspec-rails (= 2.8.1)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/welcome.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
13 changes: 0 additions & 13 deletions app/assets/stylesheets/application.css

This file was deleted.

8 changes: 8 additions & 0 deletions app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
*/

@import "bootstrap";
@import "welcome.css.scss";
3 changes: 3 additions & 0 deletions app/assets/stylesheets/welcome.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the welcome controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
4 changes: 4 additions & 0 deletions app/controllers/welcome_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class WelcomeController < ApplicationController
def index
end
end
2 changes: 2 additions & 0 deletions app/helpers/welcome_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module WelcomeHelper
end
14 changes: 0 additions & 14 deletions app/views/layouts/application.html.erb

This file was deleted.

10 changes: 10 additions & 0 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
!!! 5
%html
%head
%title BioRuby
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"
= csrf_meta_tags
%body
= yield

2 changes: 2 additions & 0 deletions app/views/welcome/index.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%h1 Welcome#index
%p Find me in app/views/welcome/index.html.haml
3 changes: 3 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
NABiorubyOrg::Application.routes.draw do

root :to => 'welcome#index'

# The priority is based upon order of creation:
# first created -> highest priority.

Expand Down
241 changes: 0 additions & 241 deletions public/index.html

This file was deleted.

12 changes: 12 additions & 0 deletions spec/controllers/welcome_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require 'spec_helper'

describe WelcomeController do

describe "GET 'index'" do
it "returns http success" do
get 'index'
response.should be_success
end
end

end
15 changes: 15 additions & 0 deletions spec/helpers/welcome_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'spec_helper'

# Specs in this file have access to a helper object that includes
# the WelcomeHelper. For example:
#
# describe WelcomeHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that"
# end
# end
# end
describe WelcomeHelper do
pending "add some examples to (or delete) #{__FILE__}"
end
Loading

0 comments on commit acf73e6

Please sign in to comment.