Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating to edge rails

  • Loading branch information...
commit 00060de9c162ac2aa05f3dbf362268f583ec3753 1 parent 51f9225
Eric Schwartz authored
View
4 Gemfile
@@ -3,6 +3,8 @@ source 'http://rubygems.org'
# gem 'rails', '3.0.10'
# Bundle edge Rails instead:
+gem 'arel', :git => 'git://github.com/rails/arel.git'
+gem "rack", "~> 1.5.2"
gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql2'
@@ -23,5 +25,5 @@ end
# gem 'capistrano'
# To use debugger
-gem 'ruby-debug'
+gem 'debugger'
View
192 Gemfile.lock
@@ -1,126 +1,126 @@
GIT
+ remote: git://github.com/rails/arel.git
+ revision: 6c2e2ac6c77051c4e1d3e70f197f85df53935e76
+ specs:
+ arel (4.0.0.beta1.20130225132415)
+
+GIT
remote: git://github.com/rails/rails.git
- revision: 2f88743c30ef3dcc7616a6cf18331b84372172b8
+ revision: ee169329a898d993f0d024af6cce83649fb2f733
specs:
- actionmailer (3.2.0.beta)
- actionpack (= 3.2.0.beta)
- mail (~> 2.3.0)
- actionpack (3.2.0.beta)
- activemodel (= 3.2.0.beta)
- activesupport (= 3.2.0.beta)
- builder (~> 3.0.0)
+ actionmailer (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ mail (~> 2.5.3)
+ actionpack (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.2)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.14)
- activemodel (3.2.0.beta)
- activesupport (= 3.2.0.beta)
- bcrypt-ruby (~> 2.1.4)
- builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.2.0.beta)
- activemodel (= 3.2.0.beta)
- activesupport (= 3.2.0.beta)
- arel (~> 2.2.1)
- tzinfo (~> 0.3.29)
- activeresource (3.2.0.beta)
- activemodel (= 3.2.0.beta)
- activesupport (= 3.2.0.beta)
- activesupport (3.2.0.beta)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- rails (3.2.0.beta)
- actionmailer (= 3.2.0.beta)
- actionpack (= 3.2.0.beta)
- activerecord (= 3.2.0.beta)
- activeresource (= 3.2.0.beta)
- activesupport (= 3.2.0.beta)
- bundler (~> 1.0)
- railties (= 3.2.0.beta)
- railties (3.2.0.beta)
- actionpack (= 3.2.0.beta)
- activesupport (= 3.2.0.beta)
- rack-ssl (~> 1.3.2)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
+ activerecord (4.0.0.beta1)
+ activemodel (= 4.0.0.beta1)
+ activerecord-deprecated_finders (~> 0.0.3)
+ activesupport (= 4.0.0.beta1)
+ arel (~> 4.0.0.beta1)
+ activesupport (4.0.0.beta1)
+ i18n (~> 0.6, >= 0.6.4)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.33)
+ rails (4.0.0.beta1)
+ actionmailer (= 4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activerecord (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.0.beta1)
+ sprockets-rails (~> 2.0.0.rc3)
+ railties (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.17.0, < 2.0)
GEM
remote: http://rubygems.org/
specs:
- arel (2.2.1)
- bcrypt-ruby (2.1.4)
- builder (3.0.0)
- columnize (0.3.4)
- diff-lcs (1.1.2)
+ activerecord-deprecated_finders (0.0.3)
+ atomic (1.0.1)
+ builder (3.1.4)
+ columnize (0.3.6)
+ debugger (1.3.3)
+ columnize (>= 0.3.1)
+ debugger-linecache (~> 1.1.1)
+ debugger-ruby_core_source (~> 1.2.0)
+ debugger-linecache (1.1.2)
+ debugger-ruby_core_source (>= 1.1.1)
+ debugger-ruby_core_source (1.2.0)
+ diff-lcs (1.2.1)
erubis (2.7.0)
hike (1.2.1)
- i18n (0.6.0)
- jquery-rails (1.0.13)
- railties (~> 3.0)
- thor (~> 0.14)
- json (1.5.3)
- linecache (0.46)
- rbx-require-relative (> 0.0.4)
- mail (2.3.0)
+ i18n (0.6.4)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.7)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
- mysql2 (0.3.7)
- polyglot (0.3.2)
- rack (1.3.2)
- rack-cache (1.0.2)
- rack (>= 0.4)
- rack-mount (0.8.2)
- rack (>= 1.0.0)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
+ mime-types (1.21)
+ minitest (4.6.2)
+ multi_json (1.6.1)
+ mysql2 (0.3.11)
+ polyglot (0.3.3)
+ rack (1.5.2)
+ rack-test (0.6.2)
rack (>= 1.0)
- rake (0.9.2)
- rbx-require-relative (0.0.5)
- rdoc (3.9.3)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- rspec-rails (2.6.1)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.6.0)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- sprockets (2.0.0.beta.14)
+ rake (10.0.3)
+ rdoc (3.12.2)
+ json (~> 1.4)
+ rspec-core (2.13.0)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
+ rspec-rails (2.13.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ sprockets (2.9.0)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.10)
+ tilt (~> 1.1, != 1.3.0)
+ sprockets-rails (2.0.0.rc3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
+ thor (0.17.0)
+ thread_safe (0.1.0)
+ atomic
+ tilt (1.3.4)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.29)
+ tzinfo (0.3.36)
PLATFORMS
ruby
DEPENDENCIES
+ arel!
+ debugger
jquery-rails
json
mysql2
+ rack (~> 1.5.2)
rails!
rspec-rails (>= 2.0.0)
- ruby-debug
View
2  app/models/owner.rb
@@ -1,6 +1,6 @@
class Owner < ActiveRecord::Base
has_many :join_models, :dependent => :destroy, :include => :target
- has_many :targets, :through => :join_models, :conditions => {:active => true}
+ has_many :targets, -> { where active: true }, :through => :join_models
scope :for_targets, lambda { |target_name|
select("DISTINCT owners.*").
View
2  app/models/target.rb
@@ -1,4 +1,4 @@
class Target < ActiveRecord::Base
has_many :join_models
- default_scope :conditions => "active = 't'"
+ default_scope where active: true
end
View
3  config/environments/test.rb
@@ -11,9 +11,6 @@
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"
- # 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_controller.perform_caching = false
View
11 db/schema.rb
@@ -1,3 +1,4 @@
+# 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.
@@ -8,20 +9,20 @@
# 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.
+# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20110822164148) do
+ActiveRecord::Schema.define(version: 20110822164148) do
- create_table "join_models", :force => true do |t|
+ create_table "join_models", force: true do |t|
t.integer "owner_id"
t.integer "target_id"
end
- create_table "owners", :force => true do |t|
+ create_table "owners", force: true do |t|
t.string "name"
end
- create_table "targets", :force => true do |t|
+ create_table "targets", force: true do |t|
t.string "name"
t.boolean "active"
end
Please sign in to comment.
Something went wrong with that request. Please try again.