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, 8 insertions, 16 deletions

diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb
index 62432d5..0760d5e 100644
--- a/app/models/occurrence.rb
+++ b/app/models/occurrence.rb
@@ -11,25 +11,17 @@ class Occurrence < ActiveRecord::Base
   # Class Methods
   
   def self.find_in_range start_time, end_time
-    find(
-      :all,
-      :include => :node, 
-      :conditions => [
-        "start_time > ? AND end_time < ?", start_time, end_time 
-      ],
-      :order => "start_time"
-    )
+    includes(:node)
+      .where("start_time > ? AND end_time < ?", start_time, end_time)
+      .order("start_time")
   end
-  
+
   def self.find_next
-    find(
-      :all,
-      :limit => 1,
-      :include => :node,
-      :conditions => ["start_time > ?", Time.now]
-    )
+    includes(:node)
+      .where("start_time > ?", Time.now)
+      .limit(1)
   end
-  
+
   # Deletes all Occurrences which belong to the given event. Afterwards a few
   # variables are set to save repetitive queries. The occurrences of the given
   # event are then calculated and created.