Permalink
Browse files

merge with remote master

  • Loading branch information...
2 parents b3049b9 + dabd202 commit 8b794ff26cec2270f6979e4e39f1c70b3dd4c957 @douglasrodrigo douglasrodrigo committed Nov 6, 2012
Showing with 34 additions and 1 deletion.
  1. +1 −1 Gemfile
  2. +4 −0 Gemfile.lock
  3. +3 −0 app/models/driver.rb
  4. +10 −0 db/migrate/20121106211900_create_drivers.rb
  5. +9 −0 test/fixtures/drivers.yml
  6. +7 −0 test/unit/driver_test.rb
View
2 Gemfile
@@ -15,7 +15,7 @@ group :assets do
gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
- # gem 'therubyracer', :platforms => :ruby
+ gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3'
end
View
4 Gemfile.lock
@@ -48,6 +48,7 @@ GEM
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
+ libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -103,6 +104,8 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
+ therubyracer (0.10.1)
+ libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
@@ -123,4 +126,5 @@ DEPENDENCIES
rspec-rails
sass-rails (~> 3.2.3)
sqlite3
+ therubyracer
uglifier (>= 1.0.3)
View
3 app/models/driver.rb
@@ -0,0 +1,3 @@
+class Driver < ActiveRecord::Base
+ attr_accessible :email, :name
+end
View
10 db/migrate/20121106211900_create_drivers.rb
@@ -0,0 +1,10 @@
+class CreateDrivers < ActiveRecord::Migration
+ def change
+ create_table :drivers do |t|
+ t.string :name
+ t.string :email
+
+ t.timestamps
+ end
+ end
+end
View
9 test/fixtures/drivers.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+ name: MyString
+ email: MyString
+
+two:
+ name: MyString
+ email: MyString
View
7 test/unit/driver_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class DriverTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end

0 comments on commit 8b794ff

Please sign in to comment.