upgrading to Rails 3.0.10 and fixing spec

macbury · Aug 31, 2011 · 68ca131 · 68ca131
1 parent 7551357
commit 68ca131
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 34 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rake", "0.8.7"
-gem "rails", "3.0.9"
+gem "rails", "3.0.10"
 gem "mysql2"
 gem "redcarpet"
 gem "coderay"
@@ -23,7 +22,6 @@ end
 group :test do
   gem "factory_girl_rails"
   gem "capybara"
-  # gem "capybara-webkit"
   gem "database_cleaner"
   gem "guard"
   gem "guard-rspec"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,32 +16,32 @@ GEM
   specs:
     aaronh-chronic (0.3.9)
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       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)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
     addressable (2.2.5)
     ancestry (1.2.3)
       activerecord (>= 2.2.2)
@@ -153,7 +153,7 @@ GEM
       oa-openid (= 0.2.2)
     paper_trail (2.2.5)
       rails (~> 3)
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.2)
     rack (1.2.3)
     rack-mount (0.6.14)
@@ -163,22 +163,22 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rdoc (3.8)
+    rake (0.9.2)
+    rdoc (3.9.4)
     redcarpet (1.17.2)
     rest-client (1.6.1)
       mime-types (>= 1.16)
@@ -217,7 +217,8 @@ GEM
       activerecord (>= 3.0.3)
       riddle (>= 1.2.1)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
     whenever (0.6.2)
@@ -248,8 +249,7 @@ DEPENDENCIES
   nifty-generators
   omniauth (>= 0.2.2)
   paper_trail
-  rails (= 3.0.9)
-  rake (= 0.8.7)
+  rails (= 3.0.10)
   redcarpet
   rspec-rails
   simplecov

diff --git a/app/models/episode.rb b/app/models/episode.rb
@@ -44,7 +44,7 @@ def self.search_published(query, tag_id = nil)
   end
 
   def self.primitive_search(query, join = "AND")
-    find(:all, :conditions => primitive_search_conditions(query, join))
+    where(primitive_search_conditions(query, join))
   end
 
   def similar_episodes

diff --git a/db/schema.rb b/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.