From bff4107ec90c2ef3b852adf71050c6d2ec579c9b Mon Sep 17 00:00:00 2001
From: magnolia-fan <magnolia_fan@me.com>
Date: Thu, 20 Oct 2011 20:14:17 +0400
Subject: [PATCH] Using jquery-rails, rack 1.3.5, organized gemfile

---
 Gemfile                                 | 17 ++++++++++++-----
 Gemfile.lock                            | 14 +++++++++-----
 app/assets/javascripts/application.js   |  2 ++
 app/views/layouts/application.html.haml |  2 --
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 10e83c7..2efbce0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,23 +1,30 @@
 source 'http://rubygems.org'
 
+# Rails & server stuff
 gem 'rails', '3.1.0'
 gem 'unicorn'
+gem 'delayed_job'
 
+# Rails 3.1 support gems
+gem 'therubyracer', :require => false
+
+# Data parse utils
 gem 'json'
 gem 'nokogiri'
 
+# JS & CSS
 gem 'haml'
 gem 'sass'
 gem 'coffee-script'
+gem 'jquery-rails'
 
-gem 'therubyracer', :require => false
-
-gem 'awesome_print', :require => 'ap'
-gem 'delayed_job'
+# Music related stuff
 gem 'lastfm-client', :git => 'http://github.com/pch/lastfm-client.git'
-gem 'musicbrainz'
+gem 'musicbrainz', :require => 'musicbrainz'
 
+# Misc utils
 gem 'bitmask_attributes'
+gem 'awesome_print', :require => 'ap'
 
 group :development do
 	gem 'mysql2', '0.3.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 51a4d38..7b8fd73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,6 +57,9 @@ GEM
     haml (3.1.3)
     hike (1.2.1)
     i18n (0.6.0)
+    jquery-rails (1.0.16)
+      railties (~> 3.0)
+      thor (~> 0.14)
     json (1.6.1)
     kgio (2.6.0)
     libv8 (3.3.10.2)
@@ -72,7 +75,7 @@ GEM
     nokogiri (1.5.0)
     pg (0.11.0)
     polyglot (0.3.2)
-    rack (1.3.4)
+    rack (1.3.5)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -96,12 +99,12 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    raindrops (0.7.0)
+    raindrops (0.8.0)
     rake (0.9.2)
-    rdoc (3.10)
+    rdoc (3.11)
       json (~> 1.4)
     sass (3.1.10)
-    sprockets (2.0.2)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -113,7 +116,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.30)
-    uglifier (1.0.3)
+    uglifier (1.0.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     unicorn (4.1.1)
@@ -130,6 +133,7 @@ DEPENDENCIES
   coffee-script
   delayed_job
   haml
+  jquery-rails
   json
   lastfm-client!
   musicbrainz
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9e94172..69b8e33 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,3 +1,5 @@
+//= require jquery
+//= require jquery-ui
 //= require jquery/jquery.autocomplete
 //= require jquery/jplayer/jquery.jplayer.min
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index aa54d49..5c83439 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -5,8 +5,6 @@
     %meta{ :charset => "utf-8" }
     %link{ :rel => "shortcut icon", :href => "/favicon.ico" }
     = stylesheet_link_tag "application"
-    = javascript_include_tag "http://code.jquery.com/jquery.min.js"
-    = javascript_include_tag "http://code.jquery.com/ui/1.8.14/jquery-ui.min.js"
     = javascript_include_tag "application"
   %body