Updated gems and files.

virgild · Aug 18, 2012 · eb7980f · eb7980f
1 parent 0ade6a2
commit eb7980f
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,7 @@ gem 'capistrano'
 gem 'memcached'
 gem 'redis'
 gem 'resque'
+gem 'mobylette'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -24,4 +25,5 @@ end
 
 group :development do
   gem 'debugger'
+  gem 'thin'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,6 +45,7 @@ GEM
       execjs
     coffee-script-source (1.3.3)
     columnize (0.3.6)
+    daemons (1.1.9)
     debugger (1.2.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
@@ -53,6 +54,7 @@ GEM
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.3)
     erubis (2.7.0)
+    eventmachine (0.12.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
     haml (3.1.4)
@@ -72,6 +74,8 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.3)
     mime-types (1.19)
+    mobylette (3.1)
+      actionpack (>= 3.0)
     multi_json (1.3.6)
     mysql2 (0.3.11)
     net-scp (1.0.4)
@@ -134,6 +138,10 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
+    thin (1.4.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -161,6 +169,7 @@ DEPENDENCIES
   haml (= 3.1.4)
   jquery-rails
   memcached
+  mobylette
   mysql2
   oj
   rails (= 3.2.8)
@@ -169,5 +178,6 @@ DEPENDENCIES
   sass
   sass-rails (~> 3.2.3)
   therubyracer
+  thin
   uglifier (>= 1.0.3)
   unicorn
diff --git a/app/assets/stylesheets/sass/main.sass b/app/assets/stylesheets/sass/main.sass
@@ -0,0 +1,4 @@
+body
+  font-family: Helvetica
+  font-size: 12px
+
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,3 +1,9 @@
 class ApplicationController < ActionController::Base
+  include Mobylette::RespondToMobileRequests
   protect_from_forgery
+
+  def current_user
+
+  end
+
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -0,0 +1,18 @@
+class UsersController < ApplicationController
+
+  def dashboard
+
+  end
+
+  def login
+  end
+
+  def index
+
+  end
+
+  def new
+
+  end
+
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -0,0 +1,4 @@
+class User < ActiveRecord::Base
+
+
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -0,0 +1,11 @@
+!!! 5
+
+%html
+  %head
+    %title Little One
+    = stylesheet_link_tag "application", :media => "all"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+
+  %body
+    = yield
diff --git a/app/views/users/dashboard.html.haml b/app/views/users/dashboard.html.haml
@@ -0,0 +1 @@
+%h1 Dashboard
diff --git a/app/views/users/login.html.haml b/app/views/users/login.html.haml
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
@@ -0,0 +1 @@
+%h1 Users
diff --git a/config/database.yml b/config/database.yml
@@ -12,7 +12,7 @@ development:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: littleone_development
+  database: littleone_dev
   pool: 5
   username: root
   password:

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,7 @@
 Littleone::Application.routes.draw do
+
+  root :to => "users#dashboard"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.