Stage 1 complete: Rails 2.3.5 to Rails 3.2.22.5 upgrade

- Converted plugins to gems (Gemfile)
- Updated config structure (application.rb, boot.rb, environment.rb)
- Converted routes to Rails 3 DSL
- Converted named_scope to scope throughout models
- Converted find(:all, :conditions) to where() chains
- Fixed has_many :order to use ordering scope
- Updated session store and secret token configuration
- Fixed exception_notification middleware configuration
- Patched Ruby 2.4 / Rails 3.2 incompatibilities:
  - Integer/Float duration arithmetic (ActiveSupport)
  - Arel visit_Integer for PostgreSQL adapter
  - create_database String/Integer coercion
  - ActionController consider_all_requests_local
- Migrated taggings schema for acts-as-taggable-on
- Replaced dynamic_form gem with custom form_error_messages helper
- Fixed Rails 3 block helper syntax (form_for, form_tag, fields_for)
- Fixed admin layout yield
- Updated test suite for Rails 3 APIs

1 files changed, 4 insertions, 25 deletions

diff --git a/app/models/asset.rb b/app/models/asset.rb
index 5bfea76..d27c525 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -11,29 +11,8 @@ class Asset < ActiveRecord::Base
       :headline => "460x250#"
     }
   )
-  
-  named_scope :images, :conditions => {
-    :upload_content_type => [
-      "image/gif",
-      "image/jpeg",
-      "image/png"
-    ]
-  }
-  
-  named_scope :documents, :conditions => {
-    :upload_content_type => [
-      "application/pdf",
-      "text/plain",
-      "text/rtf"
-    ]
-  }
-  
-  named_scope :audio, :conditions => {
-    :upload_content_type => [
-      "audio/mpeg",
-      "audio/x-m4a",
-      "audio/wav",
-      "audio/x-wav"
-    ]
-  }
+ 
+  scope :images,    where(:upload_content_type => ["image/gif", "image/jpeg", "image/png"])
+  scope :documents, where(:upload_content_type => ["application/pdf", "text/plain", "text/rtf"])
+  scope :audio,     where(:upload_content_type => ["audio/mpeg", "audio/x-m4a", "audio/wav", "audio/x-wav"])
 end