Rails3.2

Gemfile

@@ -1,11 +1,14 @@
 source 'http://rubygems.org'
-gem 'thin'
 
-gem 'rails', '3.0.11'
+gem 'rails', '3.2.2'
 
-# gemas propias
-gem 'squeezer',"0.2.1"
-gem 'largentinas',"0.1.0"
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'therubyracer'
+  gem 'uglifier', '>= 1.0.3'
+  gem 'jquery-rails'
+end
 
 # vistas
 gem 'will_paginate', '~> 3.0'
@@ -18,24 +21,25 @@ gem 'formtastic', '~> 1.2.3'
 gem "devise", "~>1.1.rc2"
 gem "cancan"
 
+# Controllers
+gem "inherited_resources"
+
 # deprecated
 gem "paperclip"
-gem "inherited_resources"
-# also deprecated
 group :development, :test do
   gem 'dbf'
 end
 
-gem "jquery-rails"
-
-# modelos
-gem "mysql2", '~> 0.2.7'
+# Modelos
+gem "mysql2", '~> 0.3.x'
 gem "meta_search"
-gem "acts_as_versioned"
 gem 'money'
 
+# Server
+gem 'thin'
+
+# Debug
 group :development, :test do
   gem 'pry'
-  gem 'forgery'
 end
 

Gemfile.lock

@@ -2,166 +2,187 @@ GEM
   remote: http://rubygems.org/
   specs:
     Ascii85 (1.0.1)
-    abstract (1.0.0)
-    actionmailer (3.0.11)
-      actionpack (= 3.0.11)
-      mail (~> 2.2.19)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-    activesupport (3.0.11)
-    acts_as_versioned (0.6.0)
-      activerecord (~> 3.0.0.beta4)
-    arel (2.0.10)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    builder (2.1.2)
+    builder (3.0.0)
     cancan (1.6.7)
     cocaine (0.2.1)
-    coderay (0.9.8)
-    daemons (1.1.5)
-    dbf (1.7.2)
-      fastercsv (~> 1.5.4)
+    coderay (1.0.5)
+    coffee-rails (3.2.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0.beta)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
+    daemons (1.1.8)
+    dbf (1.7.3)
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     eventmachine (0.12.10)
-    fastercsv (1.5.4)
-    forgery (0.5.0)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
     formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
     haml (3.1.4)
     has_scope (0.5.1)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     inherited_resources (1.3.0)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    journey (1.0.3)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
-    json (1.6.4)
-    largentinas (0.1.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    json (1.6.5)
+    libv8 (3.3.10.4)
+    mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    meta_search (1.0.6)
-      actionpack (~> 3.0.2)
-      activerecord (~> 3.0.2)
-      activesupport (~> 3.0.2)
-      arel (~> 2.0.2)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
+    meta_search (1.1.3)
+      actionpack (~> 3.1)
+      activerecord (~> 3.1)
+      activesupport (~> 3.1)
+      polyamorous (~> 0.5.0)
+    method_source (0.7.0)
     mime-types (1.17.2)
-    money (4.0.1)
+    money (4.0.2)
       i18n (~> 0.4)
       json
-    mysql2 (0.2.18)
-    orm_adapter (0.0.5)
-    paperclip (2.4.5)
+    multi_json (1.1.0)
+    mysql2 (0.3.11)
+    orm_adapter (0.0.6)
+    paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pdf-reader (0.10.1)
+    pdf-reader (1.0.0)
       Ascii85 (~> 1.0.0)
+      ruby-rc4
+    polyamorous (0.5.0)
+      activerecord (~> 3.0)
     polyglot (0.3.3)
     prawn (0.12.0)
       pdf-reader (>= 0.9.0)
       ttfunk (~> 1.0.2)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    pry (0.9.8.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.11)
-      actionmailer (= 3.0.11)
-      actionpack (= 3.0.11)
-      activerecord (= 3.0.11)
-      activeresource (= 3.0.11)
-      activesupport (= 3.0.11)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.0.11)
-    railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    responders (0.6.4)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
-    slop (2.1.0)
-    squeezer (0.2.1)
+    responders (0.6.5)
+    ruby-rc4 (0.1.5)
+    sass (3.1.12)
+    sass-rails (3.2.3)
+      railties (~> 3.2.0.beta)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    slop (2.4.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     ttfunk (1.0.3)
-    tzinfo (0.3.31)
-    warden (1.1.0)
+    tzinfo (0.3.32)
+    uglifier (1.2.2)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    warden (1.1.1)
       rack (>= 1.0)
-    will_paginate (3.0.2)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts_as_versioned
   builder
   cancan
+  coffee-rails (~> 3.2.1)
   dbf
   devise (~> 1.1.rc2)
-  forgery
   formtastic (~> 1.2.3)
   haml
   inherited_resources
   jquery-rails
-  largentinas (= 0.1.0)
   meta_search
   money
-  mysql2 (~> 0.2.7)
+  mysql2 (~> 0.3.x)
   paperclip
   prawn
   pry
-  rails (= 3.0.11)
-  squeezer (= 0.2.1)
+  rails (= 3.2.2)
+  sass-rails (~> 3.2.3)
+  therubyracer
   thin
+  uglifier (>= 1.0.3)
   will_paginate (~> 3.0)

public/javascripts/application.js → app/assets/javascripts/application.js

@@ -1,3 +1,30 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require jqGrid
+//= require jquery.freeow.min
+//= require menu
+//= require autocompletePersona
+//= require autocomplete
+//= require jq.reservas
+//= require jq.voucher
+//= require jquery.doublesubmit
+
+
+
+
 //request = $.ajax();
   //agrega un tab con
   //model es el nombre del modelos, entidad, reserva, etc. en singular y minuscula
@@ -159,3 +186,4 @@ $(function() {
 
   skin();
   });
+