Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of http://github.com/garrensmith/sinatra-template

  • Loading branch information...
commit f66a12db9bed6c0897407dcc09cf50b7c6663a17 2 parents 2bc0004 + 61a2521
@zapnap authored
Showing with 5 additions and 4 deletions.
  1. +2 −1  .gems
  2. +1 −2  Rakefile
  3. +1 −0  environment.rb
  4. +1 −1  lib/profile.rb
View
3  .gems
@@ -1,3 +1,4 @@
-datamapper -v 0.10.2
+data_mapper -v 1.0.0
+dm-postgres-adapter
sinatra -v 1.0
View
3  Rakefile
@@ -28,8 +28,7 @@ end
namespace :gems do
desc 'Install required gems'
task :install do
- required_gems = %w{ sinatra rspec rack-test dm-core dm-validations
- dm-aggregates haml }
+ required_gems = %w{ sinatra rspec rack-test data_mapper dm-sqlite-adapter haml }
required_gems.each { |required_gem| system "sudo gem install #{required_gem}" }
end
end
View
1  environment.rb
@@ -3,6 +3,7 @@
require 'dm-timestamps'
require 'dm-validations'
require 'dm-aggregates'
+require 'dm-migrations'
require 'haml'
require 'ostruct'
View
2  lib/profile.rb
@@ -7,5 +7,5 @@ class Profile
property :created_at, DateTime
property :updated_at, DateTime
- validates_present :name
+ validates_presence_of :name
end
Please sign in to comment.
Something went wrong with that request. Please try again.