diff --git a/Gemfile b/Gemfile index f1a757f..14ad0d6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,46 +1,30 @@ -source 'http://rubygems.org' - -#gem 'rails', '3.0.9' -gem 'rails', '3.1.1' -#gem 'rinku', '~> 1.2.2', :require => 'rails_rinku' - -gem 'rinku', :require => 'rails_rinku' - - -gem 'simple_form', '1.5.1' -gem 'jquery-rails', '1.0.14' - -platform :ruby do - gem 'mysql2', '~> 0.3.7', :group => :production - #gem 'mysql2', '~> 0.2.7' - gem 'sqlite3' - gem 'unicorn' -end - -platforms :jruby do - gem 'activerecord-jdbc-adapter' - gem 'jruby-openssl' - gem 'jdbc-mysql', :require => false - gem 'jdbc-sqlite3', :require => false - gem 'trinidad' -end - - - - -# Bundle gems for the local environment. Make sure to -# put test-only gems in this group so their generators -# and rake tasks are available in development mode: -group :development, :test do - -gem 'sqlite3' , :group => :development - -#group :assets do - # gem 'sass-rails', '~> 3.1.4' - #gem 'coffee-rails', '~> 3.1.1' - # gem 'uglifier', '>= 1.0.3' -#end - - - -end +source 'http://rubygems.org' + +gem 'rails', '3.0.9' + +gem 'simple_form', '1.5.1' +gem 'jquery-rails', '1.0.14' + +platform :ruby do + gem 'mysql2', '~> 0.2.7' + gem 'sqlite3' + gem 'unicorn' +end + +platforms :jruby do + gem 'activerecord-jdbc-adapter' + gem 'jruby-openssl' + gem 'jdbc-mysql', :require => false + gem 'jdbc-sqlite3', :require => false + gem 'trinidad' +end + + + + +# Bundle gems for the local environment. Make sure to +# put test-only gems in this group so their generators +# and rake tasks are available in development mode: +group :development, :test do + +end diff --git a/Gemfile.lock b/Gemfile.lock index 76a204b..71e8a7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,112 +1,96 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.1) - actionpack (= 3.1.1) - mail (~> 2.3.0) - actionpack (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.1) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.2) - activemodel (3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activerecord-jdbc-adapter (1.2.2) - activeresource (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - activesupport (3.1.1) - multi_json (~> 1.0) - arel (2.2.3) + abstract (1.0.0) + actionmailer (3.0.9) + actionpack (= 3.0.9) + mail (~> 2.2.19) + actionpack (3.0.9) + activemodel (= 3.0.9) + activesupport (= 3.0.9) + 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.9) + activesupport (= 3.0.9) + builder (~> 2.1.2) + i18n (~> 0.5.0) + activerecord (3.0.9) + activemodel (= 3.0.9) + activesupport (= 3.0.9) + arel (~> 2.0.10) + tzinfo (~> 0.3.23) + activerecord-jdbc-adapter (1.2.0) + activeresource (3.0.9) + activemodel (= 3.0.9) + activesupport (= 3.0.9) + activesupport (3.0.9) + arel (2.0.10) bouncy-castle-java (1.5.0146.1) - builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) - i18n (0.6.0) + builder (2.1.2) + erubis (2.6.6) + abstract (>= 1.0.0) + i18n (0.5.0) jdbc-mysql (5.1.13) jdbc-sqlite3 (3.7.2) jquery-rails (1.0.14) railties (~> 3.0) thor (~> 0.14) - jruby-openssl (0.7.6.1) - bouncy-castle-java (>= 1.5.0146.1) - jruby-rack (1.1.4) - json (1.6.5) - json (1.6.5-java) - kgio (2.7.2) - mail (2.3.0) + jruby-openssl (0.7.4) + bouncy-castle-java + jruby-rack (1.0.10) + kgio (2.6.0) + mail (2.2.19) + activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) - multi_json (1.1.0) - mysql2 (0.2.18) - polyglot (0.3.3) - rack (1.3.6) - rack-cache (1.1) - rack (>= 0.4) - rack-mount (0.8.3) + mime-types (1.16) + mysql2 (0.2.13) + polyglot (0.3.2) + rack (1.2.4) + rack-mount (0.6.14) rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) + rack-test (0.5.7) rack (>= 1.0) - rails (3.1.1) - actionmailer (= 3.1.1) - actionpack (= 3.1.1) - activerecord (= 3.1.1) - activeresource (= 3.1.1) - activesupport (= 3.1.1) + rails (3.0.9) + actionmailer (= 3.0.9) + actionpack (= 3.0.9) + activerecord (= 3.0.9) + activeresource (= 3.0.9) + activesupport (= 3.0.9) bundler (~> 1.0) - railties (= 3.1.1) - railties (3.1.1) - actionpack (= 3.1.1) - activesupport (= 3.1.1) - rack-ssl (~> 1.3.2) + railties (= 3.0.9) + railties (3.0.9) + actionpack (= 3.0.9) + activesupport (= 3.0.9) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - raindrops (0.8.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - rinku (1.5.1) + thor (~> 0.14.4) + raindrops (0.7.0) + rake (0.9.2) + rdoc (3.9.4) simple_form (1.5.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.0.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - sqlite3 (1.3.5-x86-mingw32) + sqlite3 (1.3.4) thor (0.14.6) - tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - trinidad (1.3.4) - jruby-rack (>= 1.1.1) + trinidad (1.2.3) + jruby-rack (>= 1.0.9) trinidad_jars (>= 1.0.1) - trinidad_jars (1.0.2) - tzinfo (0.3.31) - unicorn (4.2.0) - kgio (~> 2.6) + trinidad_jars (1.0.1) + tzinfo (0.3.29) + unicorn (4.1.1) + kgio (~> 2.4) rack - raindrops (~> 0.7) + raindrops (~> 0.6) PLATFORMS java @@ -120,8 +104,7 @@ DEPENDENCIES jquery-rails (= 1.0.14) jruby-openssl mysql2 (~> 0.2.7) - rails (= 3.1.1) - rinku + rails (= 3.0.9) simple_form (= 1.5.1) sqlite3 trinidad diff --git a/config/environments/development.rb b/config/environments/development.rb index e4d0b5a..1b82cf1 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,26 +1,26 @@ -Listr::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the webserver when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - #config.action_view.debug_rjs = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin -end - +Listr::Application.configure do + # Settings specified here will take precedence over those in config/application.rb + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the webserver when you make code changes. + config.cache_classes = false + + # Log error messages when you accidentally call methods on nil. + config.whiny_nils = true + + # Show full error reports and disable caching + config.consider_all_requests_local = true + config.action_view.debug_rjs = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send + config.action_mailer.raise_delivery_errors = false + + # Print deprecation notices to the Rails logger + config.active_support.deprecation = :log + + # Only use best-standards-support built into browsers + config.action_dispatch.best_standards_support = :builtin +end + diff --git a/db/schema.rb b/db/schema.rb index b49daaa..746ddcf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,30 +1,29 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20110613204114) do - - create_table "lists", :force => true do |t| - t.string "name" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "tasks", :force => true do |t| - t.string "name" - t.boolean "done" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "list_id" - end - -end +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20110613204114) do + + create_table "lists", :force => true do |t| + t.string "name" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tasks", :force => true do |t| + t.string "name" + t.boolean "done" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "list_id" + end + +end